Imported Debian patch 2.10.1-1

591 files changed, 35631 insertions, 58245 deletions

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 9849adc..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,7 +0,0 @@
-* text=auto
-*.svg -text
-
-# Make git diff warn about trailing space and tabs in indentation:
-*.c   whitespace=space-before-tab,tab-in-indent,trailing-space
-*.cpp whitespace=space-before-tab,tab-in-indent,trailing-space
-*.h   whitespace=space-before-tab,tab-in-indent,trailing-space
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e4261d6..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-*~
-/.cdtproject
-/.cproject
-/.externalToolBuilders
-/.project
-/.settings
-/bibletime.kdevelop
-/bibletime.kdev4
-/BibleTime.kdevelop
-/bibletime.kdevelop.filelist
-/BibleTime.kdevelop.filelist
-/bibletime.kdevelop.pcs
-/BibleTime.kdevelop.pcs
-/bibletime.kdevses
-/BibleTime.kdevses
-/build
-/CMakeLists.txt.user
-/CMakeLists.txt.user.*
-/CMakeFiles
-/dirlist
-/.kdev4
-/log
-/mine
-/qtcreator-build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34c2018..50e7db0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,10 @@
 PROJECT(bibletime CXX C)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
+
+IF("${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+  MESSAGE(FATAL_ERROR "You probably didn't mean to run CMake from this directory. Now you have all messed up! You'd better delete CMakeFiles/ and CMakeCache.txt or things will break!")
+ENDIF()
+
 SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 
@@ -20,22 +25,45 @@ SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 # For post-full-release versions, no suffix is used.
 
 SET(BT_VERSION_MAJOR "2")
-SET(BT_VERSION_MINOR "9")
-SET(BT_VERSION_PATCH "2")
-#SET(BT_VERSION_BUILD "") # Temporarily uncomment this line for release procedures
+SET(BT_VERSION_MINOR "10")
+SET(BT_VERSION_PATCH "1")
+SET(BT_VERSION_BUILD "") # Temporarily uncomment this line for release procedures
 
 
 # Determine build, if needed:
-IF (NOT (DEFINED BT_VERSION_BUILD))
-    SET(Git_FIND_QUIETLY TRUE)
-    FIND_PACKAGE(Git)
-    IF (Git_FOUND)
-        Git_WC_INFO(${PROJECT_SOURCE_DIR} BT)
-        IF (DEFINED BT_WC_REVISION_HASH_SHORT)
-            SET(BT_VERSION_BUILD "+${BT_WC_REVISION_HASH_SHORT}")
-        ENDIF (DEFINED BT_WC_REVISION_HASH_SHORT)
-    ENDIF (Git_FOUND)
-ENDIF (NOT (DEFINED BT_VERSION_BUILD))
+IF(NOT (DEFINED BT_VERSION_BUILD))
+  FIND_PACKAGE(Git)
+  IF(NOT GIT_FOUND)
+    FIND_PROGRAM(GIT_EXECUTABLE NAMES git)
+    IF(GIT_EXECUTABLE)
+      SET(GIT_FOUND TRUE)
+    ENDIF()
+  ENDIF()
+  IF(GIT_FOUND)
+    FUNCTION(BtGitRevision out)
+      EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+                      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                      ERROR_QUIET
+                      RESULT_VARIABLE resVar
+                      OUTPUT_VARIABLE outVar
+                      OUTPUT_STRIP_TRAILING_WHITESPACE)
+      IF(${resVar} EQUAL 0)
+        STRING(TOLOWER "${outVar}" hashCandidate)
+        STRING(REGEX MATCH "^[0123456789abcdef]+$" hasHash "${hashCandidate}")
+        IF(hasHash)
+          STRING(LENGTH "${hashCandidate}" hashLength)
+          IF(hashLength EQUAL 40)
+            SET(${out} "${hashCandidate}" PARENT_SCOPE)
+          ENDIF()
+        ENDIF()
+      ENDIF()
+    ENDFUNCTION()
+    BtGitRevision(BibleTimeGitRevision)
+    IF(DEFINED BibleTimeGitRevision)
+      SET(BT_VERSION_BUILD "+${BibleTimeGitRevision}")
+    ENDIF()
+  ENDIF()
+ENDIF()
 
 SET(BT_VERSION_FULL "${BT_VERSION_MAJOR}.${BT_VERSION_MINOR}.${BT_VERSION_PATCH}${BT_VERSION_BUILD}")
 MESSAGE(STATUS "Setting up build environment for BibleTime version ${BT_VERSION_FULL}")
@@ -43,73 +71,65 @@ MESSAGE(STATUS "Setting up build environment for BibleTime version ${BT_VERSION_
 ADD_DEFINITIONS(-DBT_VERSION="${BT_VERSION_FULL}")
 
 # Define debug flags
-IF (NOT CMAKE_BUILD_TYPE STREQUAL "Release")
-    SET(CMAKE_BUILD_TYPE "Debug")
-    ADD_DEFINITIONS(-DBT_DEBUG)
-ELSE (NOT CMAKE_BUILD_TYPE STREQUAL "Release")
-    ADD_DEFINITIONS(-DBT_NO_DEBUG -DNDEBUG -DQT_NO_DEBUG)
-ENDIF (NOT CMAKE_BUILD_TYPE STREQUAL "Release")
-
-#Non-English locales to be processed and installed for UI, handbook and howto
-LIST(APPEND MESSAGE_LOCALE_LANGS ar da de en_GB es et fi fr hu it nl pt pt_BR ru sk zh_TW)
+IF(NOT (CMAKE_BUILD_TYPE STREQUAL "Release"))
+  SET(CMAKE_BUILD_TYPE "Debug")
+  ADD_DEFINITIONS("-DBT_DEBUG")
+ELSE()
+  ADD_DEFINITIONS("-DBT_NO_DEBUG" "-DNDEBUG" "-DQT_NO_DEBUG")
+ENDIF()
+
+#Non-English locales to be processed and installed for handbook and howto
 #WARNING: If you modify HANDBOOK_LOCALE_LANGS or HOWTO_LOCALE_LANGS,
 #also modify the po4a conf files in cmake/docs/ to make sure all languages are processed.
-LIST(APPEND HANDBOOK_LOCALE_LANGS ar cs de es hu it pt_BR)
+LIST(APPEND HANDBOOK_LOCALE_LANGS ar cs de es fi fr hu it nl pt_BR)
 LIST(APPEND HOWTO_LOCALE_LANGS ar bg cs da de es fi fr it hu ko nl pt_BR ru)
 
+# Automatically link Qt executables to qtmain target on Windows
+IF(MSVC)
+  cmake_policy(SET CMP0020 NEW)
+ENDIF()
+
+# SET INSTALLATION PATHS
+IF(APPLE)
+  SET(BT_DESTINATION "../MacOS")
+  SET(BT_SHARE_PATH "../share")
+ELSE()
+  SET(BT_DESTINATION "bin")
+  SET(BT_SHARE_PATH "share")
+ENDIF()
+
 IF(NOT BT_FORCE_USE_QT4)
-# Automatically use Qt5 if available
-FIND_PACKAGE(Qt5Core QUIET)
+  # Automatically use Qt5 if available
+  FIND_PACKAGE(Qt5Core QUIET)
 ENDIF()
 
 # Find required packages
-IF (Qt5Core_FOUND)
-    FIND_PACKAGE(Qt5LinguistTools REQUIRED)
-    FIND_PACKAGE(Qt5PrintSupport REQUIRED)
-    FIND_PACKAGE(Qt5WebKit REQUIRED)
-    FIND_PACKAGE(Qt5WebKitWidgets REQUIRED)
-    FIND_PACKAGE(Qt5Widgets REQUIRED)
-    FIND_PACKAGE(Qt5Xml REQUIRED)
-    MESSAGE( "-- Found Qt5")
-ELSE (Qt5Core_FOUND)
-    SET(QT_MIN_VERSION 4.5.0)
-    SET(QT_USE_QTXML 1)
-    SET(QT_USE_QTWEBKIT 1)
-    SET(QT_USE_QTMAIN 1)
-    FIND_PACKAGE(Qt4 REQUIRED)
-    MESSAGE( "-- Found Qt4")
-ENDIF (Qt5Core_FOUND)
-
-IF (QT_QTDBUS_FOUND AND NOT APPLE)
-    SET(QT_USE_QTDBUS 1)
-    MESSAGE(STATUS "Using DBUS")
-ELSE (QT_QTDBUS_FOUND AND NOT APPLE)
-    ADD_DEFINITIONS(-DNO_DBUS)
-    MESSAGE(STATUS "No DBUS found")
-ENDIF (QT_QTDBUS_FOUND AND NOT APPLE)
-# If cmake says that qdbusxml2cpp is missing, uncomment the following line
-#SET(QT_DBUSXML2CPP_EXECUTABLE "/usr/bin/qdbusxml2cpp") #TEMP HACK?
+IF(Qt5Core_FOUND)
+  FIND_PACKAGE(Qt5LinguistTools REQUIRED)
+  FIND_PACKAGE(Qt5Widgets REQUIRED)
+  FIND_PACKAGE(Qt5DBus QUIET)
+  IF(Qt5DBus_FOUND AND NOT APPLE)
+    set(BT_Use_DBus TRUE)
+  ELSE()
+    set(BT_Use_DBus FALSE)
+  ENDIF()
+  MESSAGE( "-- Found Qt " ${Qt5Core_VERSION})
+ELSE()
+  SET(QT_MIN_VERSION 4.5.0)
+  SET(QT_USE_QTXML 1)
+  SET(QT_USE_QTWEBKIT 1)
+  SET(QT_USE_QTMAIN 1)
+  FIND_PACKAGE(Qt4 REQUIRED)
+  IF(QT_QTDBUS_FOUND AND NOT APPLE)
+    set(BT_Use_DBus TRUE)
+  ELSE()
+    set(BT_Use_DBus FALSE)
+  ENDIF()
+  MESSAGE( "-- Found Qt " ${QTVERSION})
+ENDIF()
 
-#
-#custom includes
-#
 FIND_PACKAGE(CLucene REQUIRED)
-
-# optional: Try to detect CURL, ICU and ZLib and add it to the linker flags if found, maybe Sword needs it
-FIND_PACKAGE(CURL)
-FIND_PACKAGE(ICU)
-FIND_PACKAGE(ZLIB)
-
-FIND_PACKAGE(Sword REQUIRED)
-
-# directory layout settings up front, needed in various places
-SET(BT_DESTINATION "bin/")
-SET(BT_SHARE_PATH "share/")
-IF (APPLE)
-    SET(BT_DESTINATION "../MacOS/")
-    SET(BT_SHARE_PATH "../share/")
-    SET(CMAKE_CXX_COMPILER "/usr/bin/g++")
-ENDIF (APPLE)
+FIND_PACKAGE(Sword 1.7.0 REQUIRED)
 
 # Define $bibletime_SOURCES
 INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTSourceFileList.cmake")
@@ -117,225 +137,158 @@ INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTSourceFileList.cmake")
 #
 # The actual build options
 #
-IF (Qt5Core_FOUND)
-    INCLUDE_DIRECTORIES(
-        ${CMAKE_CURRENT_BINARY_DIR}        #for .h files generated from .ui
-        ${CMAKE_CURRENT_SOURCE_DIR}/src    # so that include paths like "frontend/..." work
-        ${CLUCENE_INCLUDE_DIR}            #CLucene headers
-        ${CLUCENE_LIBRARY_DIR}            #CLucene/clucene-config.h
-        ${SWORD_INCLUDE_DIR}
-        ${Qt5PrintSupport_INCLUDE_DIRS}
-        ${Qt5WebKitWidgets_INCLUDE_DIRS}
-        ${Qt5Widgets_INCLUDE_DIRS}
-        ${Qt5Xml_INCLUDE_DIRS}
-    )
-ELSE (Qt5Core_FOUND)
-    INCLUDE_DIRECTORIES(
-        ${CMAKE_CURRENT_BINARY_DIR}        #for .h files generated from .ui
-        ${CMAKE_CURRENT_SOURCE_DIR}/src    # so that include paths like "frontend/..." work
-        ${CLUCENE_INCLUDE_DIR}            #CLucene headers
-        ${CLUCENE_LIBRARY_DIR}            #CLucene/clucene-config.h
-        ${SWORD_INCLUDE_DIR}
-    )
-ENDIF (Qt5Core_FOUND)
-
-IF (Qt5Core_FOUND)
-    QT5_WRAP_UI(bibletime_UIS_H ${bibletime_UIS})
-    QT5_WRAP_CPP(bibletime_MOC_SOURCES ${bibletime_MOCABLE_HEADERS})
-ELSE (Qt5Core_FOUND)
-    QT4_WRAP_UI(bibletime_UIS_H ${bibletime_UIS})
-    QT4_WRAP_CPP(bibletime_MOC_SOURCES ${bibletime_MOCABLE_HEADERS})
-ENDIF (Qt5Core_FOUND)
-
-SOURCE_GROUP("QM Files" REGULAR_EXPRESSION ".*\\.qm")
+INCLUDE_DIRECTORIES(
+    ${CMAKE_CURRENT_BINARY_DIR}        #for .h files generated from .ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/src    # so that include paths like "frontend/..." work
+    ${CLucene_INCLUDE_DIR}            #CLucene headers
+    ${CLucene_LIBRARY_DIR}            #CLucene/clucene-config.h
+    ${Sword_INCLUDE_DIRS}
+)
 
 #This must come before the target definition!
-LINK_DIRECTORIES(
-    ${CLUCENE_LIBRARY_DIR}
-    ${SWORD_LIBRARY_DIR}
-)
+LINK_DIRECTORIES(${CLucene_LIBRARY_DIR})
 
-SET(EXECUTABLE_NAME "bibletime")
-IF (APPLE)
-    SET(EXECUTABLE_NAME "BibleTime")
-ENDIF (APPLE)
+IF(MSVC)
+  ADD_EXECUTABLE("bibletime" WIN32 ${common_bibletime_SOURCES})
+ELSE()
+  ADD_EXECUTABLE("bibletime" ${common_bibletime_SOURCES})
+ENDIF()
 
+IF(${BIBLETIME_FRONTEND} STREQUAL "MOBILE")
+  SET_TARGET_PROPERTIES("bibletime" PROPERTIES OUTPUT_NAME "btm")
+ELSEIF(APPLE)
+  SET_TARGET_PROPERTIES("bibletime" PROPERTIES OUTPUT_NAME "BibleTime")
+ELSE()
+  SET_TARGET_PROPERTIES("bibletime" PROPERTIES OUTPUT_NAME "bibletime")
+ENDIF()
 
 # Define rules to generate ${bibletime_UI_translations} files
 INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTUITranslation.cmake")
 
-SET(common_bibletime_SOURCES
-    ${bibletime_SOURCES}
-    ${bibletime_UIS_H}
-    ${bibletime_MOC_SOURCES}
-    ${bibletime_RC}
-    ${bibletime_UI_translations}
-)
+IF(Qt5Core_FOUND)
+  TARGET_LINK_LIBRARIES("bibletime"
+      ${CLucene_LIBRARY}
+      ${Sword_LDFLAGS}
+  )
+
+  IF(${BIBLETIME_FRONTEND} STREQUAL "MOBILE")
+    qt5_use_modules("bibletime" Widgets Qml Quick Network)
+  ELSE()
+    IF(BT_Use_DBus)
+      qt5_use_modules("bibletime" DBus Widgets WebKit WebKitWidgets Xml Network)
+    ELSE()
+      qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network)
+    ENDIF()
+  ENDIF()
+ELSE()
+  IF(BT_Use_DBus)
+    SET(QT_USE_QTDBUS 1) # Required by INCLUDE(${QT_USE_FILE}) below
+    MESSAGE(STATUS "Using DBUS")
+  ELSE()
+    ADD_DEFINITIONS("-DNO_DBUS")
+    MESSAGE(STATUS "No DBUS found")
+  ENDIF()
+  # If cmake says that qdbusxml2cpp is missing, uncomment the following line
+  #SET(QT_DBUSXML2CPP_EXECUTABLE "/usr/bin/qdbusxml2cpp") #TEMP HACK?
+  INCLUDE(${QT_USE_FILE})
+  TARGET_LINK_LIBRARIES("bibletime"
+      ${QT_LIBRARIES}
+      ${CLucene_LIBRARY}
+      ${Sword_LDFLAGS}
+  )
+ENDIF()
 
-# For the Windows Application Icon
-IF (MSVC)
-    SET(common_bibletime_SOURCES
-        ${common_bibletime_SOURCES}
-        "cmake/BTWinIcon.rc"
-    )
-
-    SOURCE_GROUP( "Icon Files"
-        FILES "cmake/BTWinIcon.rc" }
-    )
-    ADD_EXECUTABLE(${EXECUTABLE_NAME} WIN32 ${common_bibletime_SOURCES})
-ELSE (MSVC)
-    ADD_EXECUTABLE(${EXECUTABLE_NAME} ${common_bibletime_SOURCES})
-ENDIF (MSVC)
-
-#IF (CMAKE_BUILD_TYPE STREQUAL "Release")
-#    SET_TARGET_PROPERTIES(${EXECUTABLE_NAME}
-#        PROPERTIES
-#            COMPILE_FLAGS "${SWORD_CFLAGS}" #Enable exception handling
-#    )
-#ENDIF (CMAKE_BUILD_TYPE STREQUAL "Release")
-
-IF (Qt5Core_FOUND)
-    TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
-        ${Qt5Widgets_LIBRARIES}
-        ${Qt5Xml_LIBRARIES}
-        ${Qt5Core_LIBRARIES}
-        ${Qt5WebKitWidgets_LIBRARIES}
-        ${Qt5WebKit_LIBRARIES}
-        ${Qt5PrintSupport_LIBRARIES}
-        ${CLUCENE_LIBRARY}
-        ${CURL_LIBRARIES} # optional, empty if not found
-        ${ICU_LIBRARIES} # optional, empty if not found
-        ${ICU_I18N_LIBRARIES} # optional, empty if not found
-        ${ZLIB_LIBRARIES} # optional, empty if not found
-        ${SWORD_LIBRARY}
-    )
-    qt5_use_modules(${EXECUTABLE_NAME} Widgets WebKit Network)
-ELSE (Qt5Core_FOUND)
-    INCLUDE(${QT_USE_FILE})
-    TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
-        ${QT_LIBRARIES}
-        ${CLUCENE_LIBRARY}
-        ${CURL_LIBRARIES} # optional, empty if not found
-        ${ICU_LIBRARIES} # optional, empty if not found
-        ${ICU_I18N_LIBRARIES} # optional, empty if not found
-        ${ZLIB_LIBRARIES} # optional, empty if not found
-        ${SWORD_LIBRARY}
-    )
-ENDIF (Qt5Core_FOUND)
-
-IF (APPLE)
-     # enable support MacOS 10.5+
-    SET_TARGET_PROPERTIES(${EXECUTABLE_NAME}
-        PROPERTIES
-            COMPILE_FLAGS   "-mmacosx-version-min=10.5 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/"
-            LINK_FLAGS      "-mmacosx-version-min=10.5 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/ -F /Library/Frameworks/"
-    )
-ENDIF (APPLE)
-
-IF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    SET(CMAKE_INSTALL_PREFIX "install/") #install to ./build/install, allow override
-ENDIF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-
-IF (APPLE)
-    SET(CMAKE_INSTALL_PREFIX "install/BibleTime.app/Contents/Resources")
-ENDIF (APPLE)
-
-IF (MSVC)
-    SET(CMAKE_CXX_FLAGS_RELEASE "-DNO_DBUS -DSWUSINGDLL /MD  /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE ")
-    SET(CMAKE_CXX_FLAGS_DEBUG   "-DNO_DBUS -DSWUSINGDLL /MDd /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE /ZI")
-ELSE (MSVC)
-    SET(CMAKE_CXX_FLAGS_RELEASE "-Wall -O2 -fexceptions")
-    SET(CMAKE_CXX_FLAGS_DEBUG   "-Wall -Werror -O2 -ggdb -fexceptions")
-ENDIF (MSVC)
+SET(BibleTime_CFLAGS "-Wall")
+SET(BibleTime_LDFLAGS "")
+IF(MSVC)
+  SET(CMAKE_CXX_FLAGS_RELEASE "-DNO_DBUS -DSWUSINGDLL /MD  /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE /Zc:wchar_t")
+  SET(CMAKE_CXX_FLAGS_DEBUG   "-DNO_DBUS -DSWUSINGDLL /MDd /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE /Zc:wchar_t /Od")
+  SET(BibleTime_LDFLAGS "${BibleTime_LDFLAGS} /SUBSYSTEM:WINDOWS")
+ELSE()
+  SET(BibleTime_CFLAGS "${BibleTime_CFLAGS} -Wextra -fpie -fexceptions")
+  SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
+  SET(CMAKE_CXX_FLAGS_DEBUG "-ggdb")
+  IF(APPLE)
+    # enable support MacOS 10.5+
+    SET(T "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/")
+    SET(BibleTime_CFLAGS "${BibleTime_CFLAGS} -mmacosx-version-min=10.7 -stdlib=libc++ -isysroot ${T}")
+    SET(BibleTime_LDFLAGS "${BibleTime_LDFLAGS} -mmacosx-version-min=10.7 -stdlib=libc++ -isysroot ${T} -F /Library/Frameworks/")
+    UNSET(T)
+  ENDIF()
+ENDIF()
 
+SET_TARGET_PROPERTIES("bibletime" PROPERTIES
+                      COMPILE_FLAGS "${Sword_CFLAGS_OTHER} ${BibleTime_CFLAGS}"
+                      LINK_FLAGS "${BibleTime_LDFLAGS}")
 
 # Install files
 #
-
-INSTALL(TARGETS "${EXECUTABLE_NAME}"
-    DESTINATION "${BT_DESTINATION}"
-)
-
-# icons
+INSTALL(TARGETS "bibletime" DESTINATION "${BT_DESTINATION}")
 FILE(GLOB INSTALL_ICONS_LIST "${CMAKE_CURRENT_SOURCE_DIR}/pics/icons/*.svg")
 INSTALL(FILES ${INSTALL_ICONS_LIST}
-    DESTINATION "${BT_SHARE_PATH}bibletime/icons/"
-)
-# icons - png, needed for About Dialog
+        DESTINATION "${BT_SHARE_PATH}/bibletime/icons/")
 FILE(GLOB INSTALL_ICONS_LIST_PNG "${CMAKE_CURRENT_SOURCE_DIR}/pics/icons/bibletime.png")
 INSTALL(FILES ${INSTALL_ICONS_LIST_PNG}
-    DESTINATION "${BT_SHARE_PATH}bibletime/icons/"
-)
-# display templates
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/display-templates/
-        DESTINATION "${BT_SHARE_PATH}bibletime/display-templates/")
-# javascript
+        DESTINATION "${BT_SHARE_PATH}/bibletime/icons/")
+INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/display-templates/"
+        DESTINATION "${BT_SHARE_PATH}/bibletime/display-templates/")
 INSTALL(FILES "src/frontend/display/bthtml.js"
-    DESTINATION "${BT_SHARE_PATH}bibletime/javascript/"
-)
-# license.html
+        DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/")
 INSTALL(FILES "docs/license.html"
-    DESTINATION "${BT_SHARE_PATH}bibletime/license/"
-)
-# splash screen
-INSTALL(FILES "pics/startuplogo.png" "pics/startuplogo_christmas.png" "pics/startuplogo_easter.jpg"
-    DESTINATION "${BT_SHARE_PATH}bibletime/pics/"
-)
+        DESTINATION "${BT_SHARE_PATH}/bibletime/license/")
+INSTALL(FILES ${bibletime_QML_FILES} DESTINATION "${BT_SHARE_PATH}/qml/")
+INSTALL(FILES "pics/startuplogo.png" "pics/startuplogo_christmas.png"
+              "pics/startuplogo_easter.jpg"
+        DESTINATION "${BT_SHARE_PATH}/bibletime/pics/")
+
 #
 # Platform specific installation
 #
-# LINUX: application icon
+
+# Linux: application icon and desktop file:
 INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/pics/icons/bibletime.svg"
-    DESTINATION "${BT_SHARE_PATH}icons/"
-)
-# LINUX: desktop file
-CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/linux/bibletime.desktop.cmake" "${CMAKE_CURRENT_BINARY_DIR}/bibletime.desktop")
+        DESTINATION "${BT_SHARE_PATH}/icons/")
+CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/linux/bibletime.desktop.cmake"
+               "${CMAKE_CURRENT_BINARY_DIR}/bibletime.desktop" @ONLY)
 INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/bibletime.desktop"
-    DESTINATION "${BT_SHARE_PATH}applications/"
-)
-IF (MSVC)
-    # sword locale information
-    FILE(GLOB INSTALL_SWORD_LOCALE_LIST ${SWORD_INCLUDE_DIR}/../locales.d/*)
-    INSTALL(FILES ${INSTALL_SWORD_LOCALE_LIST}
-        DESTINATION "${BT_SHARE_PATH}sword/locales.d/"
-    )
-
-    # install pdb file for debugging purposes
-    IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
-        SET( bibletime_PDB ${bibletime_BINARY_DIR}/Debug/bibletime.pdb)
-        INSTALL (FILES "${bibletime_PDB}"
-            DESTINATION "${BT_DESTINATION}"
-        )
-    ENDIF (CMAKE_BUILD_TYPE STREQUAL "Debug")
-ENDIF (MSVC)
-
-IF (APPLE)
-    # sword locale information, needed for DMG image
-    FILE(GLOB INSTALL_SWORD_LOCALE_LIST ${SWORD_INCLUDE_DIR}/../../share/sword/locales.d/*)
-    INSTALL(FILES ${INSTALL_SWORD_LOCALE_LIST}
-        DESTINATION "${BT_SHARE_PATH}sword/locales.d/"
-    )
-ENDIF (APPLE)
+        DESTINATION "${BT_SHARE_PATH}/applications/")
 
 
+IF(MSVC)
+  # sword locale information
+  FILE(GLOB INSTALL_SWORD_LOCALE_LIST "${Sword_INCLUDE_DIRS}/../locales.d/*")
+  INSTALL(FILES ${INSTALL_SWORD_LOCALE_LIST}
+          DESTINATION "${BT_SHARE_PATH}/sword/locales.d/")
+
+  # install pdb file for debugging purposes
+  IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    SET(bibletime_PDB "${bibletime_BINARY_DIR}/Debug/bibletime.pdb")
+    INSTALL(FILES "${bibletime_PDB}" DESTINATION "${BT_DESTINATION}")
+  ENDIF()
+ENDIF()
+
+IF(APPLE)
+  # sword locale information, needed for DMG image
+  FILE(GLOB INSTALL_SWORD_LOCALE_LIST "${Sword_INCLUDE_DIRS}/../../share/sword/locales.d/*")
+  INSTALL(FILES ${INSTALL_SWORD_LOCALE_LIST}
+          DESTINATION "${BT_SHARE_PATH}/sword/locales.d/")
+ENDIF()
+
 INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTDocumentation.cmake")
-INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTDeveloper.cmake")
 
-IF (WIN32 AND NOT UNIX)
-    INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTBinaryPackageWindows.cmake")
-ENDIF (WIN32 AND NOT UNIX)
-IF (APPLE)
-    INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTBinaryPackageMacOS.cmake")
-ENDIF (APPLE)
+IF(WIN32 AND NOT UNIX)
+  INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTBinaryPackageWindows.cmake")
+ENDIF()
+IF(APPLE)
+  INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTBinaryPackageMacOS.cmake")
+ENDIF()
 
 ######################################################
 # "make uninstall" target; see http://www.cmake.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F
 #
-CONFIGURE_FILE(
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-    IMMEDIATE @ONLY
-)
+CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+               IMMEDIATE @ONLY)
 ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 ######################################################
 
diff --git a/ChangeLog b/ChangeLog
index df7c858..062e8b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,38 +1,75 @@
-2013-06-03 Jaak Ristioja <jaak@ristioja.ee>
-    * Released 2.9.2.
+2014-07-05 Jaak Ristioja <jaak@ristioja.ee>
+    * Released 2.10.1.
+
+2013-12-24 Jaak Ristioja <jaak@ristioja.ee>
+    * Released 2.10.0.
+
+2013-12-23 Jaak Ristioja <jaak@ristioja.ee>
+    * Fixed some bugs in the install progress dialog, removed support for
+      forced install thread termination which was error-prone.
+
+2013-12-22 Jaak Ristioja <jaak@ristioja.ee>
+    * Fixed some settings not being properly loaded on startup.
+
+2013-12-18 Jaak Ristioja <jaak@ristioja.ee>
+    * Released 2.10 RC 1.
+
+2013-12-11 Jaak Ristioja <jaak@ristioja.ee>
+    * Released 2.10 beta 1.
+
+2013-12-10 Jaak Ristioja <jaak@ristioja.ee>
+    * Bumped CMake version requirement to 2.8.9.
+    * Changed source code archive format from .tar.bz2 to .tar.xz.
+
+2013-07-04 Gary Holmlund <gary.holmlund@gmail.com>
+    * Fix bug 27, Control Panel version was wrong on Windows
 
 2013-05-19 Gary Holmlund <gary.holmlund@gmail.com>
     * Fix multi-arch path issue in FindCLucene.cmake
 
-2013-05-18 Gary Holmlund <gary.holmlund@gmail.com>
-    * Changes needed for Qt5
+2013-03-02 Jaak Ristioja <jaak@ristioja.ee>
+    * Fixed search analysis save dialog filters.
+    * Fixed search analysis save asking for overwrite confirmation twice.
+    * Optimized and enhanced search analysis to output proper XHTML.
+
+2013-01-19 Greg Hellings <greg.hellings@gmail.com>
+    * Added support for HTTP, HTTPS, SFTP transports in BibleTime
 
-2013-05-18 Gary Holmlund <gary.holmlund@gmail.com>
-    * Fix problem with text not displaying when using QtWebKit 2.3
+2013-01-15 Jaak Ristioja <jaak@ristioja.ee>
+    * Fixed widget ending up disabled after removing install source.
+
+2012-12-16 Gary Holmlund <gary.holmlund@gmail.com>
+    * More Qt5 updates needed by Qt5 rc2 version
+
+2012-11-03 Gary Holmlund <gary.holmlund@gmail.com>
+    * Add Find widget at bottom of MDI area
 
 2012-09-10 Gary Holmlund <gary.holmlund@gmail.com>
     * Fix bug 14 - Headers displayed as plain text in some modules
 
+2012-08-25 Gary Holmlund <gary.holmlund@gmail.com>
+    * Add support for Qt5
+
+2012-07-18 Gary Holmlund <gary.holmlund@gmail.com>
+    * Mag Window uses current module if no default cross reference is set
+
 2012-03-30 Gary Holmlund <gary.holmlund@gmail.com>
     * Fix crash when closing window with tab.
 
+2012-03-10 Jaak Ristioja <jaak@ristioja.ee>
+    * Implemented saving of font family and size in HTML commentary editor.
+    * Fixed a bug in the HTML commentary editor which resulted in text
+      formatting from the cursor to be applied to the whole selection.
+
 2012-02-25 Gary Holmlund <gary.holmlund@gmail.com>
     * Fix bug 3483206 where duplicate works menus appear on ubuntu with its Global Menus
 
-2011-12-28 Jaak Ristioja <jaak@ristioja.ee>
-    * Fixed settings dialog tab contents not being translated.
-
-2011-12-22 Jaak Ristioja <jaak@ristioja.ee>
-    * Released 2.9.1.
-
-2011-12-08 Jaak Ristioja <jaak@ristioja.ee>
-    * Updated Estonian translation.
-    * Released 2.9.0.
+2012-02-12 Gary Holmlund <gary.holmlund@gmail.com>
+    * Allow comboxboxes on config dialog desk page to resize.
+      Idea from Timothy Whitehead
 
 2011-12-02 Jaak Ristioja <jaak@ristioja.ee>
     * Added Portugese translation by Mário Castanheira.
-    * Updated Hungarian translation by Geza Novak.
-    * Updated Italian translation by Giovanni Tedaldi.
 
 2011-11-23 Jaak Ristioja <jaak@ristioja.ee>
     * Fixed a bug where the book names language was not correctly set.
@@ -42,13 +79,16 @@
     * Fixed the dialog buttons of the Tip of the Day dialog not being
       translated. Thanks to Novák Géza for reporting this.
 
-2011-11-20 Jaak Ristioja <jaak@ristioja.ee>
-    * Released 2.9 RC 2.
+2011-11-14 Jaak Ristioja <jaak@ristioja.ee>
+    * Completely substituted the old profile system with a BtConfig-based one.
 
 2011-11-12 Gary Holmlund <gary.holmlund@gmail.com>
     * Fix bug 3425828 where the Mag window does not work with
       new versions of Qt. (Qt 4.7.4 + QWebKit 2.2 or later)
 
+2011-11-08 Jaak Ristioja <jaak@ristioja.ee>
+    * Merged the the new configuration based on the work of Patrick Zimmermann.
+
 2011-11-07 Jaak Ristioja <jaak@ristioja.ee>
     * Released 2.9 RC 1.
 
diff --git a/README b/README
index 347d858..eb166e2 100644
--- a/README
+++ b/README
@@ -7,7 +7,7 @@ BibleTime is a Bible study application based on Qt.
 
 1.1 BUILD REQUIREMENTS
 	-QT 4.5+
-	-Sword 1.6.0+ (http://crosswire.org/sword)
+	-Sword 1.7.0+ (http://crosswire.org/sword)
 	-CLucene 0.9.16a+ (http://clucene.sf.net)
 	-cmake 2.6.0+ (http://cmake.org)
 
@@ -45,8 +45,8 @@ for building on *nix and Windows.
 
 2. FEEDBACK
 
-Please report any bugs your find to bt-devel@crosswire.org or
-use the links on our webpage at http://www.bibletime.info.
+Please report any bugs your find to http://bugs.bibletime.info/
+or see http://www.bibletime.info/ for additional information.
 
 3. DOCUMENTATION
 
diff --git a/archive.sh b/archive.sh
index 4d99a5d..00df98b 100755
--- a/archive.sh
+++ b/archive.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 FULLNAME="bibletime-$1"
 TARNAME="${FULLNAME}.tar"
-git archive --format=tar "--prefix=${FULLNAME}/" -o "$TARNAME" HEAD && bzip2 --best "$TARNAME" || exit
-TARBZ2NAME="${TARNAME}.bz2"
-BYTES=`stat '--format=%s' "$TARBZ2NAME"`
+git archive --format=tar "--prefix=${FULLNAME}/" -o "$TARNAME" HEAD && xz -9 "$TARNAME" || exit
+TARXZNAME="${TARNAME}.xz"
+BYTES=`stat '--format=%s' "$TARXZNAME"`
 echo 'Details:'
-echo "  Filename:  ${TARBZ2NAME}"
+echo "  Filename:  ${TARXZNAME}"
 echo "  File size: $BYTES bytes`echo $BYTES|awk '{s[2**30]="G";s[2**20]="M";hum[1024]="k";for(x=2**30;x>=1024;x/=1024){if($1>=x){printf " (%.2f %sB)\n",$1/x,s[x];break}}}'`"
-echo "  MD5SUM:    `md5sum \"${TARBZ2NAME}\" |cut -b -32`"
-echo "  SHA1SUM:   `sha1sum \"${TARBZ2NAME}\" |cut -b -40`"
-echo "  SHA256SUM: `sha256sum \"${TARBZ2NAME}\" |cut -b -64`"
+echo "  MD5SUM:    `md5sum \"${TARXZNAME}\" |cut -b -32`"
+echo "  SHA1SUM:   `sha1sum \"${TARXZNAME}\" |cut -b -40`"
+echo "  SHA256SUM: `sha256sum \"${TARXZNAME}\" |cut -b -64`"
diff --git a/cmake/BTBinaryPackageMacOS.cmake b/cmake/BTBinaryPackageMacOS.cmake
index abe359a..62a6f42 100644
--- a/cmake/BTBinaryPackageMacOS.cmake
+++ b/cmake/BTBinaryPackageMacOS.cmake
@@ -1,32 +1,60 @@
 IF(APPLE)
     # Qt Plugins
-    INSTALL(
-        DIRECTORY "${QT_PLUGINS_DIR}/iconengines" "${QT_PLUGINS_DIR}/imageformats"
-        DESTINATION "${BT_DESTINATION}/plugins"
-    )
+    IF(Qt5Core_FOUND)
+        GET_TARGET_PROPERTY(ICON_PLUGIN Qt5::QICOPlugin  LOCATION)
+        GET_TARGET_PROPERTY(GIF_PLUGIN  Qt5::QGifPlugin  LOCATION)
+        GET_TARGET_PROPERTY(JPG_PLUGIN  Qt5::QJpegPlugin LOCATION)
+        GET_TARGET_PROPERTY(SVG_PLUGIN  Qt5::QSvgPlugin  LOCATION)
+        GET_TARGET_PROPERTY(TIFF_PLUGIN Qt5::QTiffPlugin LOCATION)
+        GET_TARGET_PROPERTY(BMP_PLUGIN  Qt5::QWbmpPlugin LOCATION)
+        GET_TARGET_PROPERTY(MNG_PLUGIN  Qt5::QMngPlugin  LOCATION)
+        INSTALL(
+            FILES
+                "${ICON_PLUGIN}"
+                "${GIF_PLUGIN}"
+                "${JPG_PLUGIN}"
+                "${SVG_PLUGIN}"
+                "${TIFF_PLUGIN}"
+                "${BMP_PLUGIN}"
+                "${MNG_PLUGIN}"
+            DESTINATION "${BT_DESTINATION}/plugins"
+        )
+    ELSE(Qt5Core_FOUND)
+        INSTALL(
+            DIRECTORY "${QT_PLUGINS_DIR}/iconengines" "${QT_PLUGINS_DIR}/imageformats"
+            DESTINATION "${BT_DESTINATION}/plugins"
+        )
 
-    INSTALL(
-        DIRECTORY "${QT_LIBRARY_DIR}/QtGui.framework/Resources/qt_menu.nib"
-        DESTINATION "${BT_DESTINATION}/../Frameworks/QtGui.framework/Resources"
-    )
+        INSTALL(
+            DIRECTORY "${QT_LIBRARY_DIR}/QtGui.framework/Resources/qt_menu.nib"
+            DESTINATION "${BT_DESTINATION}/../Frameworks/QtGui.framework/Resources"
+        )
+    ENDIF(Qt5Core_FOUND)
 
     INSTALL(
         FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/macos/qt.conf"
         DESTINATION "${BT_SHARE_PATH}/../Resources"
     )
 
+    # Install the Sword library
+    INSTALL(
+        FILES "${Sword_LIBRARY_DIRS}/lib${Sword_LIBRARIES}-${Sword_VERSION}.dylib"
+        DESTINATION "${BT_DESTINATION}/"
+    )
+
     IF (CMAKE_BUILD_TYPE STREQUAL "Release")
 
         INSTALL(CODE "
             FILE(GLOB_RECURSE QTPLUGINS
               \"\${CMAKE_INSTALL_PREFIX}/${BT_DESTINATION}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
 
+            SET(BU_CHMOD_BUNDLE_ITEMS ON)   # Add write permissions for libs that need it like libssl
             INCLUDE(BundleUtilities)
 
             FIXUP_BUNDLE(
-                \"\${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_PREFIX}/${BT_DESTINATION}/BibleTime\"
+                \"\${CMAKE_INSTALL_PREFIX}/${BT_DESTINATION}/BibleTime\"
                 \"\${QTPLUGINS}\"
-                \"\${CMAKE_INSTALL_PREFIX}/${BT_DESTINATION}/plugins/imageformats;\${CMAKE_INSTALL_PREFIX}/${BT_DESTINATION}/plugins/iconengines\"
+                \"\"
             )
         ")
 
@@ -43,3 +71,4 @@ IF(APPLE)
 
     INCLUDE(CPack)
 ENDIF(APPLE)
+
diff --git a/cmake/BTBinaryPackageWindows.cmake b/cmake/BTBinaryPackageWindows.cmake
index 10bfa17..28b7a11 100644
--- a/cmake/BTBinaryPackageWindows.cmake
+++ b/cmake/BTBinaryPackageWindows.cmake
@@ -1,10 +1,14 @@
 IF(WIN32 AND NOT UNIX)
 
+    # Libs needed for packaging
+    FIND_PACKAGE(ZLIB REQUIRED)
+    FIND_PACKAGE(CURL REQUIRED)
+
     SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "BibleTime for Windows svn")
     SET(CPACK_PACKAGE_VENDOR "http://www.bibletime.info")
     SET(CPACK_PACKAGE_VERSION_MAJOR ${BT_VERSION_MAJOR})
     SET(CPACK_PACKAGE_VERSION_MINOR ${BT_VERSION_MINOR})
-    SET(CPACK_PACKAGE_VERSION_PATCH ${BT_REVISION_PATCH})
+    SET(CPACK_PACKAGE_VERSION_PATCH ${BT_VERSION_PATCH})
     SET(CPACK_PACKAGE_INSTALL_DIRECTORY "BibleTime")
 
     SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
@@ -13,8 +17,93 @@ IF(WIN32 AND NOT UNIX)
     # sure there is at least one set of four (4) backlasshes.
 
     # We need the libraries, and they're not pulled in automatically
-    INCLUDE(${QT_USE_FILE})
     SET(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
+
+IF (Qt5Core_FOUND)
+    SET(QT_BINARY_DIR "${Qt5Core_DIR}/../../../bin")
+    INSTALL(FILES
+        "${QT_BINARY_DIR}/icudt51d.dll"
+        "${QT_BINARY_DIR}/icuin51d.dll"
+        "${QT_BINARY_DIR}/icuuc51d.dll"
+        "${QT_BINARY_DIR}/libEGLd.dll"
+        "${QT_BINARY_DIR}/libGLESv2d.dll"
+        "${QT_BINARY_DIR}/Qt5Cored.dll"
+        "${QT_BINARY_DIR}/Qt5Guid.dll"
+        "${QT_BINARY_DIR}/Qt5Multimediad.dll"
+        "${QT_BINARY_DIR}/Qt5MultimediaWidgetsd.dll"
+        "${QT_BINARY_DIR}/Qt5Networkd.dll"
+        "${QT_BINARY_DIR}/Qt5OpenGLd.dll"
+        "${QT_BINARY_DIR}/Qt5Qmld.dll"
+        "${QT_BINARY_DIR}/Qt5Quickd.dll"
+        "${QT_BINARY_DIR}/Qt5Positioningd.dll"
+        "${QT_BINARY_DIR}/Qt5PrintSupportd.dll"
+        "${QT_BINARY_DIR}/Qt5Sensorsd.dll"
+        "${QT_BINARY_DIR}/Qt5Sqld.dll"
+        "${QT_BINARY_DIR}/Qt5Svgd.dll"
+        "${QT_BINARY_DIR}/Qt5WebKitd.dll"
+        "${QT_BINARY_DIR}/Qt5WebKitWidgetsd.dll"
+        "${QT_BINARY_DIR}/Qt5Widgetsd.dll"
+        "${QT_BINARY_DIR}/Qt5Xmld.dll"
+        "${QT_BINARY_DIR}/Qt5XmlPatternsd.dll"
+        DESTINATION "${BT_DESTINATION}"
+        CONFIGURATIONS "Debug"
+    )
+    INSTALL(FILES
+        "${QT_BINARY_DIR}/icudt51.dll"
+        "${QT_BINARY_DIR}/icuin51.dll"
+        "${QT_BINARY_DIR}/icuuc51.dll"
+        "${QT_BINARY_DIR}/libEGL.dll"
+        "${QT_BINARY_DIR}/libGLESv2.dll"
+        "${QT_BINARY_DIR}/Qt5Core.dll"
+        "${QT_BINARY_DIR}/Qt5Gui.dll"
+        "${QT_BINARY_DIR}/Qt5Multimedia.dll"
+        "${QT_BINARY_DIR}/Qt5MultimediaWidgets.dll"
+        "${QT_BINARY_DIR}/Qt5Network.dll"
+        "${QT_BINARY_DIR}/Qt5OpenGL.dll"
+        "${QT_BINARY_DIR}/Qt5Qml.dll"
+        "${QT_BINARY_DIR}/Qt5Quick.dll"
+        "${QT_BINARY_DIR}/Qt5Positioning.dll"
+        "${QT_BINARY_DIR}/Qt5PrintSupport.dll"
+        "${QT_BINARY_DIR}/Qt5Sensors.dll"
+        "${QT_BINARY_DIR}/Qt5Sql.dll"
+        "${QT_BINARY_DIR}/Qt5Svg.dll"
+        "${QT_BINARY_DIR}/Qt5WebKit.dll"
+        "${QT_BINARY_DIR}/Qt5WebKitWidgets.dll"
+        "${QT_BINARY_DIR}/Qt5Widgets.dll"
+        "${QT_BINARY_DIR}/Qt5Xml.dll"
+        "${QT_BINARY_DIR}/Qt5XmlPatterns.dll"
+        DESTINATION "${BT_DESTINATION}"
+        CONFIGURATIONS "Release"
+    )
+	INSTALL(FILES
+	    "cmake/platforms/windows/qt.conf"
+        DESTINATION "${BT_DESTINATION}"
+        CONFIGURATIONS "Release"
+    )
+    SET(QT_PLUGINS_DIR "${Qt5Core_DIR}/../../../plugins")
+    INSTALL(FILES
+        "${QT_PLUGINS_DIR}/iconengines/qsvgicon.dll"
+        DESTINATION "${BT_DESTINATION}/plugins/iconengines"
+        CONFIGURATIONS "Release"
+    )
+    INSTALL(FILES
+        "${QT_PLUGINS_DIR}/platforms/qminimal.dll"
+        "${QT_PLUGINS_DIR}/platforms/qoffscreen.dll"
+        "${QT_PLUGINS_DIR}/platforms/qwindows.dll"
+        DESTINATION "${BT_DESTINATION}/plugins/platforms"
+        CONFIGURATIONS "Release"
+    )
+    INSTALL(FILES
+        "${QT_PLUGINS_DIR}/imageformats/qgif.dll"
+        "${QT_PLUGINS_DIR}/imageformats/qico.dll"
+        "${QT_PLUGINS_DIR}/imageformats/qjpeg.dll"
+        "${QT_PLUGINS_DIR}/imageformats/qmng.dll"
+        "${QT_PLUGINS_DIR}/imageformats/qsvg.dll"
+        "${QT_PLUGINS_DIR}/imageformats/qtiff.dll"
+        DESTINATION "${BT_DESTINATION}/plugins/imageformats"
+        CONFIGURATIONS "Release"
+    )
+ELSE (Qt5Core_FOUND)
     SET(QT_BINARY_DIR "${QT_LIBRARY_DIR}/../bin")
     INSTALL(FILES
         "${QT_BINARY_DIR}/QtWebKitd4.dll"
@@ -42,7 +131,6 @@ IF(WIN32 AND NOT UNIX)
         DESTINATION "${BT_DESTINATION}"
         CONFIGURATIONS "Release"
     )
-
     # Qt Plugins
     INSTALL(FILES
         "${QT_PLUGINS_DIR}/iconengines/qsvgicon4.dll"
@@ -59,17 +147,27 @@ IF(WIN32 AND NOT UNIX)
         DESTINATION "${BT_DESTINATION}/plugins/imageformats"
         CONFIGURATIONS "Release"
     )
+ENDIF (Qt5Core_FOUND)
 
     # This adds in the required Windows system libraries
+    MESSAGE(STATUS  "INSTALL Microsoft Redist ${MSVC_REDIST}" )
     INSTALL(PROGRAMS ${MSVC_REDIST} DESTINATION bin)
     SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
-        ExecWait \\\"$INSTDIR\\\\bin\\\\vcredist_x86.exe  /q:a\\\"
+        ExecWait \\\"$INSTDIR\\\\bin\\\\vcredist_x86.exe  /q\\\"
         Delete   \\\"$INSTDIR\\\\bin\\\\vcredist_x86.exe\\\"
     ")
 
-    # add the libsword.dll
-    STRING(REPLACE ".lib" ".dll" SWORD_DLL "${SWORD_LIBRARY}")
-    INSTALL(FILES ${SWORD_DLL} DESTINATION ${BT_DESTINATION}) # This will also take effect in the regular install
+    MESSAGE(STATUS  "INSTALL CLucene_LIBRARY ${CLucene_LIBRARY}" )
+    STRING(REPLACE ".lib" ".dll" CLUCENE_DLL "${CLucene_LIBRARY}")
+    INSTALL(FILES ${CLUCENE_DLL} DESTINATION ${BT_DESTINATION})
+
+    MESSAGE(STATUS  "INSTALL CLucene_LIBRARY ${CLucene_SHARED_LIB}" )
+    STRING(REPLACE ".lib" ".dll" CLUCENE_SHARED_DLL "${CLucene_SHARED_LIB}")
+    INSTALL(FILES ${CLUCENE_SHARED_DLL} DESTINATION ${BT_DESTINATION})
+
+    MESSAGE(STATUS  "INSTALL CURL_LIBRARY ${CURL_LIBRARY}" )
+    STRING(REPLACE "_imp.lib" ".dll" CURL_DLL "${CURL_LIBRARY}")
+    INSTALL(FILES ${CURL_DLL} DESTINATION ${BT_DESTINATION})
 
     # Some options for the CPack system.  These should be pretty self-evident
     SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\pics\\\\icons\\\\bibletime.png")
diff --git a/cmake/BTDeveloper.cmake b/cmake/BTDeveloper.cmake
deleted file mode 100644
index 483dc2b..0000000
--- a/cmake/BTDeveloper.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-FILE(GLOB_RECURSE ORIG_SOURCE_FILES
-    RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/src/"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h"
-)
-FOREACH(FILE ${ORIG_SOURCE_FILES})
-    SET(REFORMAT_FILES "${REFORMAT_FILES} ${FILE}")
-ENDFOREACH(FILE ${ORIG_SOURCE_FILES})
-
-SET(ASTYLE_OPTIONS "--indent=spaces=4 --brackets=attach --indent-classes --indent-switches --brackets=break-closing --pad=oper --suffix=none --options=none")
-
-ADD_CUSTOM_TARGET("reformat_codebase"
-    COMMAND "sh" "-c" "astyle ${ASTYLE_OPTIONS}  ${REFORMAT_FILES}"
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/"
-    VERBATIM
-)
\ No newline at end of file
diff --git a/cmake/BTDocumentation.cmake b/cmake/BTDocumentation.cmake
index 49e5994..c696014 100644
--- a/cmake/BTDocumentation.cmake
+++ b/cmake/BTDocumentation.cmake
@@ -3,10 +3,10 @@ FILE(GLOB INSTALL_HANDBOOK_IMAGES "${CMAKE_CURRENT_SOURCE_DIR}/docs/handbook/en/
 FOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS} "en")
     FILE(GLOB INSTALL_HANDBOOK_HTML_FILES_${HANDBOOK_LOCALE_LANG} "${CMAKE_CURRENT_SOURCE_DIR}/docs/handbook/${HANDBOOK_LOCALE_LANG}/html/*.html")
     INSTALL(FILES ${INSTALL_HANDBOOK_HTML_FILES_${HANDBOOK_LOCALE_LANG}}
-        DESTINATION "${BT_SHARE_PATH}bibletime/docs/handbook/${HANDBOOK_LOCALE_LANG}/"
+        DESTINATION "${BT_SHARE_PATH}/bibletime/docs/handbook/${HANDBOOK_LOCALE_LANG}/"
     )
     INSTALL(FILES ${INSTALL_HANDBOOK_IMAGES}
-        DESTINATION "${BT_SHARE_PATH}bibletime/docs/handbook/${HANDBOOK_LOCALE_LANG}/"
+        DESTINATION "${BT_SHARE_PATH}/bibletime/docs/handbook/${HANDBOOK_LOCALE_LANG}/"
     )
 ENDFOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS} "en")
 
@@ -14,7 +14,7 @@ ENDFOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS} "en")
 FOREACH(HOWTO_LOCALE_LANG ${HOWTO_LOCALE_LANGS} "en")
     FILE(GLOB INSTALL_HOWTO_HTML_FILES_${HOWTO_LOCALE_LANG} "${CMAKE_CURRENT_SOURCE_DIR}/docs/howto/${HOWTO_LOCALE_LANG}/html/*.html")
     INSTALL(FILES ${INSTALL_HOWTO_HTML_FILES_${HOWTO_LOCALE_LANG}}
-        DESTINATION "${BT_SHARE_PATH}bibletime/docs/howto/${HOWTO_LOCALE_LANG}/"
+        DESTINATION "${BT_SHARE_PATH}/bibletime/docs/howto/${HOWTO_LOCALE_LANG}/"
     )
 ENDFOREACH(HOWTO_LOCALE_LANG ${HOWTO_LOCALE_LANGS} "en")
 
diff --git a/cmake/BTSourceFileList.cmake b/cmake/BTSourceFileList.cmake
index f5c4ab5..ed7273b 100644
--- a/cmake/BTSourceFileList.cmake
+++ b/cmake/BTSourceFileList.cmake
@@ -1,6 +1,3 @@
-SET(bibletime_UIS
-    src/frontend/display/bthtmlfindtext.ui
-)
 
 SET(bibletime_SRC
     # Toplevel files:
@@ -10,6 +7,7 @@ SET(bibletime_SRC
     src/bibletime_init.cpp
     src/bibletime_slots.cpp
     src/bibletimeapp.cpp
+    src/btglobal.cpp
     src/main.cpp
 )
 
@@ -20,6 +18,8 @@ SET(bibletime_SRC_BACKEND
     src/backend/btmoduletreeitem.cpp
     src/backend/cswordmodulesearch.cpp
     src/backend/btinstallbackend.cpp
+    src/backend/btinstallmgr.cpp
+    src/backend/btinstallthread.cpp
 )
 
 SOURCE_GROUP("src\\backend" FILES ${bibletime_SRC_BACKEND})
@@ -40,7 +40,8 @@ SOURCE_GROUP("src\\backend\\bookshelfmodel" FILES ${bibletime_SRC_BACKEND_BOOKSH
 
 SET(bibletime_SRC_BACKEND_CONFIG
     # Backend config:
-    src/backend/config/cbtconfig.cpp
+    src/backend/config/btconfig.cpp
+    src/backend/config/btconfigcore.cpp
 )
 
 SOURCE_GROUP("src\\backend\\config" FILES ${bibletime_SRC_BACKEND_CONFIG})
@@ -64,7 +65,7 @@ SET(bibletime_SRC_BACKEND_FILTERS
     src/backend/filters/teitohtml.cpp
     src/backend/filters/thmltohtml.cpp
     src/backend/filters/thmltoplain.cpp
-    src/backend/filters/osismorphsegmentation.cpp
+    src/backend/filters/btosismorphsegmentation.cpp
 )
 
 SOURCE_GROUP("src\\backend\\filters" FILES ${bibletime_SRC_BACKEND_FILTERS})
@@ -106,9 +107,9 @@ SOURCE_GROUP("src\\backend\\managers" FILES ${bibletime_SRC_BACKEND_MANAGERS})
 SET(bibletime_SRC_UTIL
     # Utilities:
     src/util/cresmgr.cpp
-    src/util/dialogutil.cpp
     src/util/directory.cpp
     src/util/btmodules.cpp
+    src/util/geticon.cpp
     src/util/tool.cpp
 )
 
@@ -131,6 +132,7 @@ SET(bibletime_SRC_FRONTEND
     src/frontend/cmdiarea.cpp
     src/frontend/cprinter.cpp
     src/frontend/crossrefrendering.cpp
+    src/frontend/messagedialog.cpp
 )
 
 SOURCE_GROUP("src\\frontend" FILES ${bibletime_SRC_FRONTEND})
@@ -138,7 +140,6 @@ SOURCE_GROUP("src\\frontend" FILES ${bibletime_SRC_FRONTEND})
 SET(bibletime_SRC_FRONTEND_BOOKSHELFMANAGER
     # Bookshelf manager frontend:
     src/frontend/bookshelfmanager/btconfigdialog.cpp
-    src/frontend/bookshelfmanager/btinstallmgr.cpp
     src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp
     src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp
 )
@@ -160,7 +161,6 @@ SET(bibletime_SRC_FRONTEND_BOOKSHELFMANAGER_INSTALLPAGE
     src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp
     src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp
     src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp
-    src/frontend/bookshelfmanager/installpage/btinstallthread.cpp
     src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp
     src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp
 )
@@ -216,6 +216,8 @@ SET(bibletime_SRC_FRONTEND_SETTINGSDIALOG
     # Settings dialog (configuration):
     src/frontend/settingsdialogs/btshortcutsdialog.cpp
     src/frontend/settingsdialogs/btshortcutseditor.cpp
+    src/frontend/settingsdialogs/bttextfilterstab.cpp
+    src/frontend/settingsdialogs/btstandardworkstab.cpp
     src/frontend/settingsdialogs/cacceleratorsettings.cpp
     src/frontend/settingsdialogs/cconfigurationdialog.cpp
     src/frontend/settingsdialogs/cdisplaysettings.cpp
@@ -228,15 +230,6 @@ SET(bibletime_SRC_FRONTEND_SETTINGSDIALOG
 
 SOURCE_GROUP("src\\frontend\\settingsdialog" FILES ${bibletime_SRC_FRONTEND_SETTINGSDIALOG})
 
-SET(bibletime_SRC_FRONTEND_PROFILE
-    # Profile manager frontend:
-    src/frontend/profile/cprofile.cpp
-    src/frontend/profile/cprofilemgr.cpp
-    src/frontend/profile/cprofilewindow.cpp
-)
-
-SOURCE_GROUP("src\\frontend\\profile" FILES ${bibletime_SRC_FRONTEND_PROFILE})
-
 SET(bibletime_SRC_FRONTEND_TIPDIALOG
     # Tip dialog:
     src/frontend/tips/bttipdialog.cpp
@@ -271,15 +264,14 @@ SOURCE_GROUP("src\\frontend\\keychooser\\versekeychooser" FILES ${bibletime_SRC_
 SET(bibletime_SRC_FRONTEND_DISPLAY
     # Behaviour for display areas:
     src/frontend/display/btcolorwidget.cpp
+    src/frontend/display/btfindwidget.cpp
     src/frontend/display/btfontsizewidget.cpp
-    src/frontend/display/bthtmlfindtext.cpp
     src/frontend/display/bthtmljsobject.cpp
     src/frontend/display/bthtmlreaddisplay.cpp
     src/frontend/display/cdisplay.cpp
     src/frontend/display/chtmlwritedisplay.cpp
     src/frontend/display/cplainwritedisplay.cpp
     src/frontend/display/creaddisplay.cpp
-    src/frontend/display/cwritedisplay.cpp
 )
 
 SOURCE_GROUP("src\\frontend\\display" FILES ${bibletime_SRC_FRONTEND_DISPLAY})
@@ -302,15 +294,12 @@ SET(bibletime_SRC_FRONTEND_DISPLAYWINDOW
     src/frontend/displaywindow/clexiconreadwindow.cpp
     src/frontend/displaywindow/cplainwritewindow.cpp
     src/frontend/displaywindow/creadwindow.cpp
-    src/frontend/displaywindow/cwritewindow.cpp
 )
 
 SOURCE_GROUP("src\\frontend\\displaywindow" FILES ${bibletime_SRC_FRONTEND_DISPLAYWINDOW})
 
 # Mocable headers:
-SET(bibletime_MOCABLE_HEADERS
-    src/bibletime.h
-    src/bibletime_dbus_adaptor.h
+SET(bibletime_COMMON_MOCABLE_HEADERS
     src/backend/bookshelfmodel/btbookshelffiltermodel.h
     src/backend/bookshelfmodel/btbookshelfmodel.h
     src/backend/bookshelfmodel/btbookshelftreemodel.h
@@ -321,10 +310,22 @@ SET(bibletime_MOCABLE_HEADERS
     src/backend/drivers/cswordlexiconmoduleinfo.h
     src/backend/drivers/cswordmoduleinfo.h
     src/backend/managers/cswordbackend.h
+    src/util/btsignal.h
+    src/backend/btinstallmgr.h
+    src/backend/btinstallthread.h
+)
+
+IF(BT_Use_DBus)
+    SET(bibletime_FRONTEND_DESKTOP_DBUS_MOCABLE_HEADERS src/bibletime_dbus_adaptor.h)
+ENDIF()
+
+SET(bibletime_FRONTEND_DESKTOP_MOCABLE_HEADERS
+    ${bibletime_FRONTEND_DESKTOP_DBUS_MOCABLE_HEADERS}
+    src/bibletime.h
+    src/bibletimeapp.h
     src/frontend/bookmarks/bteditbookmarkdialog.h
     src/frontend/bookmarks/cbookmarkindex.h
     src/frontend/bookshelfmanager/btconfigdialog.h
-    src/frontend/bookshelfmanager/btinstallmgr.h
     src/frontend/bookshelfmanager/btmodulemanagerdialog.h
     src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.h
     src/frontend/bookshelfmanager/indexpage/btindexpage.h
@@ -334,7 +335,6 @@ SET(bibletime_MOCABLE_HEADERS
     src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.h
     src/frontend/bookshelfmanager/installpage/btinstallpathdialog.h
     src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.h
-    src/frontend/bookshelfmanager/installpage/btinstallthread.h
     src/frontend/bookshelfmanager/installpage/btinstallpagemodel.h
     src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.h
     src/frontend/bookshelfmanager/removepage/btremovepage.h
@@ -354,8 +354,8 @@ SET(bibletime_MOCABLE_HEADERS
     src/frontend/cmdiarea.h
     src/frontend/cprinter.h
     src/frontend/display/btcolorwidget.h
+    src/frontend/display/btfindwidget.h
     src/frontend/display/btfontsizewidget.h
-    src/frontend/display/bthtmlfindtext.h
     src/frontend/display/bthtmljsobject.h
     src/frontend/display/bthtmlreaddisplay.h
     src/frontend/display/cdisplay.h
@@ -375,7 +375,6 @@ SET(bibletime_MOCABLE_HEADERS
     src/frontend/displaywindow/clexiconreadwindow.h
     src/frontend/displaywindow/cplainwritewindow.h
     src/frontend/displaywindow/creadwindow.h
-    src/frontend/displaywindow/cwritewindow.h
     src/frontend/keychooser/bthistory.h
     src/frontend/keychooser/cbookkeychooser.h
     src/frontend/keychooser/cbooktreechooser.h
@@ -401,6 +400,8 @@ SET(bibletime_MOCABLE_HEADERS
     src/frontend/searchdialog/csearchresultview.h
     src/frontend/settingsdialogs/btshortcutsdialog.h
     src/frontend/settingsdialogs/btshortcutseditor.h
+    src/frontend/settingsdialogs/bttextfilterstab.h
+    src/frontend/settingsdialogs/btstandardworkstab.h
     src/frontend/settingsdialogs/cacceleratorsettings.h
     src/frontend/settingsdialogs/cconfigurationdialog.h
     src/frontend/settingsdialogs/cdisplaysettings.h
@@ -410,11 +411,9 @@ SET(bibletime_MOCABLE_HEADERS
     src/frontend/settingsdialogs/clistwidget.h
     src/frontend/settingsdialogs/cswordsettings.h
     src/frontend/tips/bttipdialog.h
-    src/util/btsignal.h
 )
 
-SET(bibletime_SOURCES
-    ${bibletime_SRC}
+SET(bibletime_COMMON_SOURCES
     ${bibletime_SRC_BACKEND}
     ${bibletime_SRC_BACKEND_BOOKSHELFMODEL}
     ${bibletime_SRC_BACKEND_CONFIG}
@@ -423,7 +422,10 @@ SET(bibletime_SOURCES
     ${bibletime_SRC_BACKEND_KEYS}
     ${bibletime_SRC_BACKEND_RENDERING}
     ${bibletime_SRC_BACKEND_MANAGERS}
-    ${bibletime_SRC_UTIL}
+    ${bibletime_SRC_UTIL})
+
+SET(bibletime_FRONTEND_DESKTOP_SOURCES
+    ${bibletime_SRC}
     ${bibletime_SRC_FRONTEND}
     ${bibletime_SRC_FRONTEND_BOOKMARKS}
     ${bibletime_SRC_FRONTEND_BOOKSHELFMANAGER}
@@ -434,9 +436,170 @@ SET(bibletime_SOURCES
     ${bibletime_SRC_FRONTEND_SEARCHDIALOG_ANALYSIS}
     ${bibletime_SRC_FRONTEND_SETTINGSDIALOG}
     ${bibletime_SRC_FRONTEND_TIPDIALOG}
-    ${bibletime_SRC_FRONTEND_PROFILE}
     ${bibletime_SRC_FRONTEND_KEYCHOOSER}
     ${bibletime_SRC_FRONTEND_KEYCHOOSER_VERSEKEYCHOOSER}
     ${bibletime_SRC_FRONTEND_DISPLAY}
     ${bibletime_SRC_FRONTEND_DISPLAYWINDOW}
 )
+
+
+
+SET(bibletime_SRC_MOBILE_SOURCES
+    src/mobile/bibletime.cpp
+    src/mobile/bibletime.h
+    src/mobile/btmmain.cpp
+    src/mobile/bibletimeapp.cpp
+)
+
+SET(bibletime_SRC_MOBILE_MODEL_SOURCES
+    src/mobile/models/bibletextmodelbuilder.cpp
+    src/mobile/models/bibletextmodelbuilder.h
+    src/mobile/models/booktextmodelbuilder.cpp
+    src/mobile/models/booktextmodelbuilder.h
+    src/mobile/models/roleitemmodel.cpp
+    src/mobile/models/roleitemmodel.h
+)
+
+SET(bibletime_SRC_MOBILE_UTIL_SOURCES
+    src/mobile/util/findqmlobject.cpp
+    src/mobile/util/findqmlobject.h
+    src/mobile/util/messagedialog.cpp
+    src/mobile/util/messagedialog.h
+)
+
+SET(bibletime_SRC_MOBILE_UI_SOURCES
+    src/mobile/bookshelfmanager/installmanager.cpp
+    src/mobile/bookshelfmanager/installmanager.h
+    src/mobile/bookshelfmanager/installprogress.cpp
+    src/mobile/bookshelfmanager/installprogress.h
+    src/mobile/bookshelfmanager/installsourcesmanager.cpp
+    src/mobile/bookshelfmanager/installsourcesmanager.h
+    src/mobile/bookshelfmanager/installsources.cpp
+    src/mobile/bookshelfmanager/installsources.h
+    src/mobile/keychooser/bookkeychooser.cpp
+    src/mobile/keychooser/bookkeychooser.h
+    src/mobile/keychooser/versechooser.cpp
+    src/mobile/keychooser/versechooser.h
+    src/mobile/ui/btstyle.cpp
+    src/mobile/ui/btstyle.h
+    src/mobile/ui/btwindowinterface.cpp
+    src/mobile/ui/btwindowinterface.h
+    src/mobile/ui/modulechooser.cpp
+    src/mobile/ui/modulechooser.h
+    src/mobile/ui/moduleinterface.cpp
+    src/mobile/ui/moduleinterface.h
+    src/mobile/ui/qtquick2applicationviewer.cpp
+    src/mobile/ui/qtquick2applicationviewer.h
+    src/mobile/ui/gridchooser.cpp
+    src/mobile/ui/gridchooser.h
+    src/mobile/ui/viewmanager.cpp
+    src/mobile/ui/viewmanager.h
+)
+
+SET(bibletime_SRC_MOBILE_MOCABLE_HEADERS
+    src/mobile/bookshelfmanager/installmanager.h
+    src/mobile/bookshelfmanager/installprogress.h
+    src/mobile/bookshelfmanager/installsourcesmanager.h
+    src/mobile/bookshelfmanager/installsources.h
+    src/mobile/keychooser/bookkeychooser.h
+    src/mobile/keychooser/versechooser.h
+    src/mobile/bibletime.h
+    src/mobile/bibletimeapp.h
+    src/mobile/ui/btstyle.h
+    src/mobile/ui/btwindowinterface.h
+    src/mobile/ui/modulechooser.h
+    src/mobile/ui/moduleinterface.h
+    src/mobile/ui/qtquick2applicationviewer.h
+    src/mobile/ui/gridchooser.h
+    src/mobile/ui/viewmanager.h
+)
+
+SET(bibletime_MOBILE_QML_FILES
+    src/mobile/qml/ContextMenu.qml
+    src/mobile/qml/GridChooserButton.qml
+    src/mobile/qml/GridChooser.qml
+    src/mobile/qml/ImageButton.qml
+    src/mobile/qml/InstallManagerChooser.qml
+    src/mobile/qml/ListTextView.qml
+    src/mobile/qml/ListWorksView.qml
+    src/mobile/qml/main.qml
+    src/mobile/qml/MainToolbar.qml
+    src/mobile/qml/Menus.qml
+    src/mobile/qml/MenuButton.qml
+    src/mobile/qml/MenuView.qml
+    src/mobile/qml/ModuleChooser.qml
+    src/mobile/qml/Progress.qml
+    src/mobile/qml/Settings.qml
+    src/mobile/qml/FontSizeSlider.qml
+    src/mobile/qml/TreeChooser.qml
+    src/mobile/qml/Window.qml
+    src/mobile/qml/WindowManager.qml
+    src/mobile/qml/checkmark.svg
+    src/mobile/qml/leftarrow.svg
+    src/mobile/qml/rightarrow.svg
+)
+
+SET(bibletime_FRONTEND_MOBILE_SOURCES
+    ${bibletime_SRC_MOBILE_SOURCES}
+    ${bibletime_SRC_MOBILE_MOCABLE_HEADERS}
+    ${bibletime_SRC_MOBILE_MODEL_SOURCES}
+    ${bibletime_SRC_MOBILE_UI_SOURCES}
+    ${bibletime_SRC_MOBILE_UTIL_SOURCES}
+)
+
+SET(bibletime_FRONTEND_MOBILE_MOCABLE_HEADERS
+    ${bibletime_SRC_MOBILE_MOCABLE_HEADERS}
+)
+
+# Default to building a desktop frontend:
+IF(NOT (DEFINED BIBLETIME_FRONTEND))
+  SET(BIBLETIME_FRONTEND "DESKTOP")
+ENDIF(NOT (DEFINED BIBLETIME_FRONTEND))
+
+# Check for valid frontend:
+SET(bibletime_AVAILABLE_FRONTENDS DESKTOP MOBILE)
+#SET(bibletime_AVAILABLE_FRONTENDS DESKTOP QML_SYMBIAN)
+LIST(FIND bibletime_AVAILABLE_FRONTENDS ${BIBLETIME_FRONTEND} bibletime_FRONTEND_INDEX)
+IF(${bibletime_FRONTEND_INDEX} EQUAL -1)
+  MESSAGE(STATUS "Invalid frontend specified: ${BIBLETIME_FRONTEND}.")
+  MESSAGE(STATUS "Available frontends are:")
+  FOREACH(frontend ${bibletime_AVAILABLE_FRONTENDS})
+    MESSAGE(STATUS "    ${frontend}")
+  ENDFOREACH(frontend ${bibletime_AVAILABLE_FRONTENDS})
+  MESSAGE(FATAL_ERROR "Aborting processing because of invalid BIBLETIME_FRONTEND")
+ENDIF(${bibletime_FRONTEND_INDEX} EQUAL -1)
+MESSAGE(STATUS "Selected frontend: ${BIBLETIME_FRONTEND}")
+
+SET(bibletime_SOURCES
+    ${bibletime_COMMON_SOURCES}
+    ${bibletime_FRONTEND_${BIBLETIME_FRONTEND}_SOURCES})
+SET(bibletime_MOCABLE_HEADERS
+    ${bibletime_COMMON_MOCABLE_HEADERS}
+    ${bibletime_FRONTEND_${BIBLETIME_FRONTEND}_MOCABLE_HEADERS})
+SET(bibletime_QML_FILES
+    ${bibletime_${BIBLETIME_FRONTEND}_QML_FILES})
+
+IF(Qt5Core_FOUND)
+  QT5_WRAP_UI(bibletime_UIS_H ${bibletime_UIS})
+  QT5_WRAP_CPP(bibletime_MOC_SOURCES ${bibletime_MOCABLE_HEADERS})
+ELSE()
+  QT4_WRAP_UI(bibletime_UIS_H ${bibletime_UIS})
+  QT4_WRAP_CPP(bibletime_MOC_SOURCES ${bibletime_MOCABLE_HEADERS})
+ENDIF()
+
+SET(common_bibletime_SOURCES
+    ${bibletime_SOURCES}
+    ${bibletime_UIS_H}
+    ${bibletime_MOC_SOURCES}
+    ${bibletime_QML_FILES}
+    ${bibletime_RC}
+    ${bibletime_UI_translations}
+)
+
+# For the Windows Application Icon
+IF(MSVC)
+  LIST(APPEND common_bibletime_SOURCES "cmake/BTWinIcon.rc")
+  SOURCE_GROUP("Icon Files" FILES "cmake/BTWinIcon.rc")
+ENDIF()
+
+SOURCE_GROUP("QM Files" REGULAR_EXPRESSION ".*\\.qm")
diff --git a/cmake/BTUITranslation.cmake b/cmake/BTUITranslation.cmake
index cf6c6b7..2af0f61 100644
--- a/cmake/BTUITranslation.cmake
+++ b/cmake/BTUITranslation.cmake
@@ -17,33 +17,42 @@ ELSE (Qt5Core_FOUND)
     )
 ENDIF (Qt5Core_FOUND)
 
-FOREACH(MESSAGE_LOCALE_LANG ${MESSAGE_LOCALE_LANGS})
-    ADD_CUSTOM_COMMAND(OUTPUT "bibletime_ui_${MESSAGE_LOCALE_LANG}.qm"
-        PRE_BUILD
-        COMMAND ${QT_LRELEASE_EXECUTABLE} "bibletime_ui_${MESSAGE_LOCALE_LANG}.ts" -qm "${CMAKE_CURRENT_BINARY_DIR}/bibletime_ui_${MESSAGE_LOCALE_LANG}.qm"
-        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/"
-        COMMENT "Updating UI translation for ${MESSAGE_LOCALE_LANG}"
+SET(TS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages")
+FILE(GLOB TS_FILES "${TS_DIR}/bibletime_ui_*.ts")
+FOREACH(TSFILE_FULLPATH ${TS_FILES})
+    STRING(REGEX REPLACE "${TS_DIR}/bibletime_ui_(..(_..)?).ts" "\\1"
+           TS_LANG "${TSFILE_FULLPATH}")
+    SET(TS_LANGS ${TS_LANGS} ${TS_LANG})
+    SET(QMFILE "bibletime_ui_${TS_LANG}.qm")
+    ADD_CUSTOM_COMMAND(
+        TARGET "bibletime"
+        POST_BUILD
+        COMMAND ${QT_LRELEASE_EXECUTABLE} "${TSFILE_FULLPATH}" -qm "${QMFILE}"
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMENT "Updating UI translation for ${TS_LANG}"
         VERBATIM
     )
     SET(bibletime_UI_translations
         ${bibletime_UI_translations}
-        "bibletime_ui_${MESSAGE_LOCALE_LANG}.qm"
+        "${QMFILE}"
     )
-    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/bibletime_ui_${MESSAGE_LOCALE_LANG}.qm"
-        DESTINATION "${BT_SHARE_PATH}bibletime/locale/"
+    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${QMFILE}"
+        DESTINATION "${BT_SHARE_PATH}/bibletime/locale/"
     )
-ENDFOREACH(MESSAGE_LOCALE_LANG)
+ENDFOREACH(TSFILE_FULLPATH)
 
 
 # Update source catalog files (this is the basis for the translator's work)
 # Invoke this with "make messages"
 ADD_CUSTOM_TARGET("messages")
-FOREACH(MESSAGE_LOCALE_LANG ${MESSAGE_LOCALE_LANGS})
-    ADD_CUSTOM_TARGET("messages_${MESSAGE_LOCALE_LANG}"
-        COMMAND ${QT_LUPDATE_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/src" -ts "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/bibletime_ui_${MESSAGE_LOCALE_LANG}.ts")
-    ADD_DEPENDENCIES("messages" "messages_${MESSAGE_LOCALE_LANG}")
-ENDFOREACH(MESSAGE_LOCALE_LANG)
+FOREACH(TS_LANG ${TS_LANGS})
+    ADD_CUSTOM_TARGET("messages_${TS_LANG}"
+        COMMAND ${QT_LUPDATE_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/src" -ts "${TS_DIR}/bibletime_ui_${TS_LANG}.ts")
+    ADD_DEPENDENCIES("messages" "messages_${TS_LANG}")
+ENDFOREACH(TS_LANG)
+
+
 # Template file for translators
 ADD_CUSTOM_TARGET("messages_default"
-    COMMAND ${QT_LUPDATE_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/src" -ts "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/bibletime_ui.ts")
+    COMMAND ${QT_LUPDATE_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/src" -ts "${TS_DIR}/bibletime_ui.ts")
 ADD_DEPENDENCIES(messages "messages_default")
diff --git a/cmake/FindCLucene.cmake b/cmake/FindCLucene.cmake
index 173f69d..0930d95 100644
--- a/cmake/FindCLucene.cmake
+++ b/cmake/FindCLucene.cmake
@@ -4,135 +4,81 @@
 # ONE FIX: /usr/lib64 added to work on Fedora
 #
 
-
 #
 # This module looks for clucene (http://clucene.sf.net) support
 # It will define the following values
 #
-# CLUCENE_INCLUDE_DIR  = where CLucene/StdHeader.h can be found
-# CLUCENE_LIBRARY_DIR  = where CLucene/clucene-config.h can be found
-# CLUCENE_LIBRARY      = the library to link against CLucene
-# CLUCENE_VERSION      = The CLucene version string
+# CLucene_INCLUDE_DIR  = where CLucene/StdHeader.h can be found
+# CLucene_LIBRARY_DIR  = where CLucene/clucene-config.h can be found
+# CLucene_LIBRARY      = the library to link against CLucene
+# CLucene_VERSION      = The CLucene version string
 # CLucene_FOUND        = set to 1 if clucene is found
 #
 
-INCLUDE(CheckSymbolExists)
-INCLUDE(FindLibraryWithDebug)
-
-if(NOT CLUCENE_MIN_VERSION)
-    set(CLUCENE_MIN_VERSION "0.9.19")
-endif(NOT CLUCENE_MIN_VERSION)
-
-IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
-    INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
-ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
-
-IF(MSVC)
-    IF(CMAKE_BUILD_TYPE STREQUAL "Release")
-        SET(WIN_CLUCENE_SEARCH_PATH ../clucene-core/src/CLucene/Release)
-    ELSE(CMAKE_BUILD_TYPE STREQUAL "Release")
-        SET(WIN_CLUCENE_SEARCH_PATH ../clucene-core/src/CLucene/debug)
-    ENDIF(CMAKE_BUILD_TYPE STREQUAL "Release")
-    SET(WIN_CLUCENE_INCLUDE_PATH ../clucene-core/src)
-ELSE(MSVC)
-    SET(WIN_CLUCENE_SEARCH_PATH "")
-    SET(WIN_CLUCENE_INCLUDE_PATH "")
-ENDIF(MSVC)
+INCLUDE(KDE4FindLibraryWithDebug)
 
-SET(TRIAL_LIBRARY_PATHS
-    $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
-    ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
-    /usr/lib/i386-linux-gnu
-    /usr/lib/x86_64-linux-gnu
-    /usr/local/lib${LIB_SUFFIX}
-    /opt/local/lib${LIB_SUFFIX}
-    /usr/lib${LIB_SUFFIX}
-    /usr/lib64
-    /sw/lib${LIB_SUFFIX}
-    /usr/pkg/lib${LIB_SUFFIX}
-    ${WIN_CLUCENE_SEARCH_PATH}
-    )
-SET(TRIAL_INCLUDE_PATHS
-    $ENV{CLUCENE_HOME}/include
-    ${CMAKE_INSTALL_PREFIX}/include
-    /usr/local/include
-    /opt/local/include
-    /usr/include
-    /sw/include
-    /usr/pkg/include
-    ${WIN_CLUCENE_INCLUDE_PATH}
-    )
-FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY
-    NAMES clucene clucene-core
-    PATHS ${TRIAL_LIBRARY_PATHS})
-IF (CLUCENE_LIBRARY)
-    MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}")
-ENDIF (CLUCENE_LIBRARY)
-FIND_PATH(CLUCENE_INCLUDE_DIR
-    NAMES CLucene.h
-    PATHS ${TRIAL_INCLUDE_PATHS})
+IF(NOT CLucene_MIN_VERSION)
+  SET(CLucene_MIN_VERSION "0.9.19")
+ENDIF()
 
-IF (CLUCENE_INCLUDE_DIR)
-    MESSAGE(STATUS "Found CLucene include dir: ${CLUCENE_INCLUDE_DIR}")
-ENDIF (CLUCENE_INCLUDE_DIR)
+FIND_LIBRARY_WITH_DEBUG(CLucene_LIBRARY
+                        NAMES clucene clucene-core clucene-cored)
+IF(CLucene_LIBRARY)
+  MESSAGE(STATUS "Found CLucene library: ${CLucene_LIBRARY}")
+ENDIF()
+FIND_PATH(CLucene_INCLUDE_DIR NAMES CLucene.h)
 
-IF(WIN32)
-    SET(TRIAL_LIBRARY_PATHS ${CLUCENE_INCLUDE_DIR})
-ENDIF(WIN32)
+IF(CLucene_INCLUDE_DIR)
+  MESSAGE(STATUS "Found CLucene include dir: ${CLucene_INCLUDE_DIR}")
+ENDIF()
 
-SET(CLUCENE_GOOD_VERSION TRUE)
+SET(CLucene_GOOD_VERSION TRUE)
 
-FIND_PATH(CLUCENE_LIBRARY_DIR
-    NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
-IF (CLUCENE_LIBRARY_DIR)
-    MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
-    FILE(READ ${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT)
-    STRING(REGEX MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT})
-    IF (CLMATCH)
-        STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION ${CLMATCH})
-        IF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}")
-            MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
-            SET(CLUCENE_GOOD_VERSION FALSE)
-        ENDIF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}")
-        IF (CLUCENE_VERSION STREQUAL "0.9.17")
-            MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
-            SET(CLUCENE_GOOD_VERSION FALSE)
-        ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
-        IF (CLUCENE_VERSION VERSION_GREATER "2.0.0")
-	    ADD_DEFINITIONS(-DCLUCENE2)
-            FIND_LIBRARY_WITH_DEBUG(CLUCENE_SHARED_LIB
-                NAMES clucene-shared
-                PATHS ${TRIAL_LIBRARY_PATHS})
+# Work around clucene-config.h being installed in weird places on some distros:
+GET_FILENAME_COMPONENT(CLucene_LIBRARY_DIR_HINTS "${CLucene_LIBRARY}" PATH)
 
-            IF (CLUCENE_SHARED_LIB)
-                MESSAGE(STATUS "Found CLucene shared library: ${CLUCENE_SHARED_LIB}")
-		SET(CLUCENE_LIBRARY ${CLUCENE_LIBRARY} ${CLUCENE_SHARED_LIB})
-            ELSE (CLUCENE_SHARED_LIB)
-                MESSAGE(FATAL_ERROR "Unable to find CLucene shared library.")
-                SET(CLUCENE_GOOD_VERSION FALSE)
-            ENDIF(CLUCENE_SHARED_LIB)
-        ENDIF (CLUCENE_VERSION VERSION_GREATER "2.0.0")
-    ENDIF (CLMATCH)
-ELSE (CLUCENE_LIBRARY_DIR)
-    MESSAGE(STATUS "CLucene library dir not found.")
-ENDIF (CLUCENE_LIBRARY_DIR)
+FIND_PATH(CLucene_LIBRARY_DIR
+          NAMES "CLucene/clucene-config.h"
+          HINTS "${CLucene_LIBRARY_DIR_HINTS}")
+IF(CLucene_LIBRARY_DIR)
+  MESSAGE(STATUS "Found CLucene library dir: ${CLucene_LIBRARY_DIR}")
+  FILE(READ ${CLucene_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT)
+  STRING(REGEX MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT})
+  IF(CLMATCH)
+    STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLucene_VERSION ${CLMATCH})
+    IF(CLucene_VERSION VERSION_LESS "${CLucene_MIN_VERSION}")
+      MESSAGE(ERROR " CLucene version ${CLucene_VERSION} is less than the required minimum ${CLucene_MIN_VERSION}")
+      SET(CLucene_GOOD_VERSION FALSE)
+    ENDIF()
+    IF(CLucene_VERSION VERSION_GREATER "2.0.0")
+      ADD_DEFINITIONS(-DCLUCENE2)
+      FIND_LIBRARY_WITH_DEBUG(CLucene_SHARED_LIB
+                              NAMES clucene-shared clucene-sharedd)
+      IF(CLucene_SHARED_LIB)
+        MESSAGE(STATUS "Found CLucene shared library: ${CLucene_SHARED_LIB}")
+        SET(CLucene_LIBRARY ${CLucene_LIBRARY} ${CLucene_SHARED_LIB})
+      ELSE()
+        MESSAGE(FATAL_ERROR "Unable to find CLucene shared library.")
+        SET(CLucene_GOOD_VERSION FALSE)
+      ENDIF()
+    ENDIF()
+  ENDIF()
+ELSE()
+  MESSAGE(STATUS "CLucene library dir not found.")
+ENDIF()
 
-IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
-    SET(CLucene_FOUND TRUE)
-ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
+IF(CLucene_INCLUDE_DIR AND CLucene_LIBRARY AND CLucene_LIBRARY_DIR AND CLucene_GOOD_VERSION)
+  SET(CLucene_FOUND TRUE)
+ENDIF()
 
 IF(CLucene_FOUND)
-    IF(NOT CLucene_FIND_QUIETLY)
-        MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARY}")
-    ENDIF(NOT CLucene_FIND_QUIETLY)
-ELSE(CLucene_FOUND)
-    IF(CLucene_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "Could not find CLucene.")
-    ENDIF(CLucene_FIND_REQUIRED)
-ENDIF(CLucene_FOUND)
+  IF(NOT CLucene_FIND_QUIETLY)
+    MESSAGE(STATUS "Found CLucene: ${CLucene_LIBRARY}")
+  ENDIF()
+ELSE()
+  IF(CLucene_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find CLucene.")
+  ENDIF()
+ENDIF()
 
-MARK_AS_ADVANCED(
-    CLUCENE_INCLUDE_DIR
-    CLUCENE_LIBRARY_DIR
-    CLUCENE_LIBRARY
-    )
+MARK_AS_ADVANCED(CLucene_INCLUDE_DIR CLucene_LIBRARY_DIR CLucene_LIBRARY)
diff --git a/cmake/FindGit.cmake b/cmake/FindGit.cmake
deleted file mode 100644
index 1e2e96e..0000000
--- a/cmake/FindGit.cmake
+++ /dev/null
@@ -1,70 +0,0 @@
-# Original source:
-#   PISM: a Parallel Ice Sheet Model,
-#   http://www.pism-docs.org/
-#   http://svn.gna.org/viewcvs/*checkout*/pism/trunk/CMake/FindGit.cmake?rev=569
-#
-# Licence:
-#   GPL-2,
-#   http://svn.gna.org/viewcvs/*checkout*/pism/trunk/COPYING?rev=569
-
-SET(Git_FOUND FALSE)
-
-FIND_PROGRAM(Git_EXECUTABLE git DOC "git command line client")
-MARK_AS_ADVANCED(Git_EXECUTABLE)
-
-IF(Git_EXECUTABLE)
-  SET(Git_FOUND TRUE)
-  MACRO(Git_WC_INFO dir prefix)
-    EXECUTE_PROCESS(COMMAND ${Git_EXECUTABLE} rev-list -n 1 HEAD
-       WORKING_DIRECTORY ${dir}
-       RESULT_VARIABLE Git_result
-       OUTPUT_VARIABLE ${prefix}_WC_REVISION_HASH
-       OUTPUT_STRIP_TRAILING_WHITESPACE
-       ERROR_QUIET)
-    IF(NOT ((${Git_result} EQUAL 0) AND (NOT ${${prefix}_WC_REVISION_HASH} MATCHES "^$")))
-      # MESSAGE(STATUS "Unable to find a git setup.")
-      UNSET(${prefix}_WC_REVISION_HASH)
-    ELSE(NOT ((${Git_result} EQUAL 0) AND (NOT ${${prefix}_WC_REVISION_HASH} MATCHES "^$")))
-      EXECUTE_PROCESS(COMMAND ${Git_EXECUTABLE} rev-list -n 1 --abbrev-commit HEAD
-        WORKING_DIRECTORY ${dir}
-        RESULT_VARIABLE Git_result
-        OUTPUT_VARIABLE ${prefix}_WC_REVISION_HASH_SHORT
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        ERROR_QUIET)
-      # MESSAGE(STATUS "Found git HEAD: ${${prefix}_WC_REVISION_HASH_SHORT}")
-      EXECUTE_PROCESS(COMMAND ${Git_EXECUTABLE} rev-list --grep=git-svn-id: -n 1 HEAD
-         WORKING_DIRECTORY ${dir}
-         RESULT_VARIABLE Git_result2
-         OUTPUT_VARIABLE ${prefix}_WC_SVN_REVISION_HASH
-         OUTPUT_STRIP_TRAILING_WHITESPACE)
-      IF(NOT ((${Git_result2} EQUAL 0) AND (NOT ${${prefix}_WC_SVN_REVISION_HASH} MATCHES "^$")))
-        # MESSAGE(STATUS "Unable to find a git-svn setup.")
-        UNSET(${prefix}_WC_SVN_REVISION_HASH)
-      ELSE(NOT ((${Git_result2} EQUAL 0) AND (NOT ${${prefix}_WC_SVN_REVISION_HASH} MATCHES "^$")))
-        # MESSAGE(STATUS "Latest commit also in SVN is ${${prefix}_WC_REVISION_HASH}")
-        EXECUTE_PROCESS(COMMAND ${Git_EXECUTABLE} svn find-rev ${${prefix}_WC_SVN_REVISION_HASH}
-           WORKING_DIRECTORY ${dir}
-           RESULT_VARIABLE Git_result3
-           OUTPUT_VARIABLE ${prefix}_WC_SVN_REVISION
-           OUTPUT_STRIP_TRAILING_WHITESPACE)
-        IF((${Git_result3} EQUAL 0) AND (NOT ${${prefix}_WC_SVN_REVISION} MATCHES "^$"))
-          # MESSAGE(STATUS " which is in SVN as revision ${${prefix}_WC_SVN_REVISION}")
-        ELSE((${Git_result3} EQUAL 0) AND (NOT ${${prefix}_WC_SVN_REVISION} MATCHES "^$"))
-          # MESSAGE(WARNING "Unable to determine the SVN revision number!")
-          UNSET(${prefix}_WC_SVN_REVISION)
-        ENDIF((${Git_result3} EQUAL 0) AND (NOT ${${prefix}_WC_SVN_REVISION} MATCHES "^$"))
-      ENDIF(NOT ((${Git_result2} EQUAL 0) AND (NOT ${${prefix}_WC_SVN_REVISION_HASH} MATCHES "^$")))
-    ENDIF(NOT ((${Git_result} EQUAL 0) AND (NOT ${${prefix}_WC_REVISION_HASH} MATCHES "^$")))
-  ENDMACRO(Git_WC_INFO)
-ENDIF(Git_EXECUTABLE)
-
-IF(NOT Git_FOUND)
-  IF(NOT Git_FIND_QUIETLY)
-    MESSAGE(STATUS "Git was not found")
-  ELSE(NOT Git_FIND_QUIETLY)
-    if(Git_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Git was not found")
-    ENDIF(Git_FIND_REQUIRED)
-  ENDIF(NOT Git_FIND_QUIETLY)
-ENDIF(NOT Git_FOUND)
-
diff --git a/cmake/FindICU.cmake b/cmake/FindICU.cmake
deleted file mode 100644
index 9dff9f3..0000000
--- a/cmake/FindICU.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-# Finds the International Components for Unicode (ICU) Library
-#
-#  ICU_FOUND          - True if ICU found.
-#  ICU_I18N_FOUND     - True if ICU's internationalization library found.
-#  ICU_INCLUDE_DIRS   - Directory to include to get ICU headers
-#                       Note: always include ICU headers as, e.g., 
-#                       unicode/utypes.h
-#  ICU_LIBRARIES      - Libraries to link against for the common ICU
-#  ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation
-#                       (note: in addition to ICU_LIBRARIES)
-
-# Look for the header file.
-find_path(
-  ICU_INCLUDE_DIR 
-  NAMES unicode/utypes.h
-  DOC "Include directory for the ICU library")
-mark_as_advanced(ICU_INCLUDE_DIR)
-
-# Look for the library.
-find_library(
-  ICU_LIBRARY
-  NAMES icuuc cygicuuc cygicuuc32
-  DOC "Libraries to link against for the common parts of ICU")
-mark_as_advanced(ICU_LIBRARY)
-
-# Copy the results to the output variables.
-if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
-  set(ICU_FOUND 1)
-  set(ICU_LIBRARIES ${ICU_LIBRARY})
-  set(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR})
-
-  # Look for the ICU internationalization libraries
-  find_library(
-    ICU_I18N_LIBRARY
-    NAMES icuin icui18n cygicuin cygicuin32
-    DOC "Libraries to link against for ICU internationalization")
-  mark_as_advanced(ICU_I18N_LIBRARY)
-  if (ICU_I18N_LIBRARY)
-    set(ICU_I18N_FOUND 1)
-    set(ICU_I18N_LIBRARIES ${ICU_I18N_LIBRARY})
-  else (ICU_I18N_LIBRARY)
-    set(ICU_I18N_FOUND 0)
-    set(ICU_I18N_LIBRARIES)
-  endif (ICU_I18N_LIBRARY)
-else(ICU_INCLUDE_DIR AND ICU_LIBRARY)
-  set(ICU_FOUND 0)
-  set(ICU_I18N_FOUND 0)
-  set(ICU_LIBRARIES)
-  set(ICU_I18N_LIBRARIES)
-  set(ICU_INCLUDE_DIRS)
-endif(ICU_INCLUDE_DIR AND ICU_LIBRARY)
diff --git a/cmake/FindSword.cmake b/cmake/FindSword.cmake
index 17fbae2..1458765 100644
--- a/cmake/FindSword.cmake
+++ b/cmake/FindSword.cmake
@@ -1,145 +1,134 @@
-SET (REQUIRED_SWORD_VERSION 1.6.0)
-
-# This module looks for installed sword
 #
-# It will define the following values
-# SWORD_INCLUDE_DIR
-# SWORD_LIBRARY
-# SWORD_LIBRARY_DIR
-
-IF(MSVC)
-    SET(SWORD_WIN32_LIBRARY_PATH ../sword/lib/vcppmake/vc8/ICUDebug)
-    SET(SWORD_WIN32_INCLUDE_PATH ../sword/include)
-ENDIF(MSVC)
-
-SET(TRIAL_LIBRARY_PATHS
-    $ENV{SWORD_HOME}/lib${LIB_SUFFIX}
-    ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
-    /usr/local/lib${LIB_SUFFIX}
-    /opt/local/lib${LIB_SUFFIX}
-    /usr/lib${LIB_SUFFIX}
-    /usr/lib64
-    /usr/pkg/lib${LIB_SUFFIX}
-    ${SWORD_WIN32_LIBRARY_PATH}
-)
-SET(TRIAL_INCLUDE_PATHS
-    $ENV{SWORD_HOME}/include/sword
-    $ENV{SWORD_HOME}/include
-    ${CMAKE_INSTALL_PREFIX}/include/sword
-    ${CMAKE_INSTALL_PREFIX}/include
-    /usr/local/include/sword
-    /usr/local/include
-    /opt/local/include/sword
-    /opt/local/include
-    /usr/include/sword
-    /usr/include
-    /sw/include/sword
-    /sw/include
-    /usr/pkg/include/sword
-    /usr/pkg/include
-    ${SWORD_WIN32_INCLUDE_PATH}
-)
-
-IF(MSVC)
-    FIND_LIBRARY(SWORD_LIBRARY NAMES libsword PATHS ${TRIAL_LIBRARY_PATHS})
-ELSE(MSVC)
-    FIND_LIBRARY(SWORD_LIBRARY sword NAMES libsword PATHS ${TRIAL_LIBRARY_PATHS})
-ENDIF(MSVC)
-
-IF (SWORD_LIBRARY)
-    MESSAGE(STATUS "Found Sword library: ${SWORD_LIBRARY}")
-#    SET(SWORD_LIBRARY "sword")
-ELSE (SWORD_LIBRARY)
-    MESSAGE(FATAL_ERROR "Could not find the Sword library.")
-ENDIF (SWORD_LIBRARY)
-
-FIND_PATH(SWORD_LIBRARY_DIR    NAMES libsword.a libsword.la libsword.so libsword.lib PATHS ${TRIAL_LIBRARY_PATHS} ENV CMAKE_LIBRARY_PATH)
-IF (SWORD_LIBRARY_DIR)
-    MESSAGE(STATUS "Found Sword library dir: ${SWORD_LIBRARY_DIR}")
-ELSE (SWORD_LIBRARY_DIR)
-    MESSAGE(FATAL_ERROR "Could not find the Sword library dir.")
-ENDIF (SWORD_LIBRARY_DIR)
-
-FIND_PATH(SWORD_INCLUDE_DIR    NAMES swmgr.h PATHS ${TRIAL_INCLUDE_PATHS})
-IF (SWORD_INCLUDE_DIR)
-    MESSAGE(STATUS "Found Sword include dir: ${SWORD_INCLUDE_DIR}")
-ELSE (SWORD_INCLUDE_DIR)
-    MESSAGE(FATAL_ERROR "Sword include dir could not be found.")
-ENDIF (SWORD_INCLUDE_DIR)
-
+# In the name of the Father, and of the Son, and of the Holy Spirit.
+#
+# This file is part of BibleTime's source code, http://www.bibletime.info/.
 #
-# Check for minimum Sword version
+# Copyright 1999-2014 by the BibleTime developers.
+# The BibleTime source code is licensed under the GNU General Public License version 2.0.
 #
-MACRO(CHECK_SWORD_VERSION VERSION)
-    IF(MSVC)
-        SET(CHECK_SWORD_VERSION_DEFINES "/DSWUSINGDLL")
-    ENDIF(MSVC)
-    TRY_RUN(SWVERSIONTEST_RUN_RESULT SWVERSIONTEST_COMPILE_RESULT
-        ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/sword_version_compare.cpp
-        CMAKE_FLAGS
-            "-DINCLUDE_DIRECTORIES:STRING=${SWORD_INCLUDE_DIR}"
-            "-DLINK_DIRECTORIES:STRING=${SWORD_LIBRARY_DIR}"
-            "-DLINK_LIBRARIES:STRING=${SWORD_LIBRARY}"
-            ${SWORD_LIBRARY}
-        COMPILE_DEFINITIONS
-            ${CHECK_SWORD_VERSION_DEFINES}
-        COMPILE_OUTPUT_VARIABLE SWVERSIONTEST_COMPILE_OUTPUT
-        RUN_OUTPUT_VARIABLE SWVERSIONTEST_RUN_OUTPUT
-        ARGS ${VERSION}
-    )
-    IF(NOT SWVERSIONTEST_COMPILE_RESULT)
-        MESSAGE(FATAL_ERROR "Sword version check program could NOT be compiled: ${SWVERSIONTEST_COMPILE_OUTPUT}")
-    ENDIF(NOT SWVERSIONTEST_COMPILE_RESULT)
-ENDMACRO(CHECK_SWORD_VERSION VERSION)
 
-MESSAGE(STATUS "Checking for required Sword version ${REQUIRED_SWORD_VERSION}...")
-CHECK_SWORD_VERSION(${REQUIRED_SWORD_VERSION})
+# This module looks for the Sword library by the Crosswire Bible Society
+#
+# It might define the following values similarly to pkg_search_module()
+# Sword_FOUND
+# Sword_LIBRARIES
+# Sword_LIBRARY_DIRS
+# Sword_LDFLAGS
+# Sword_LDFLAGS_OTHER
+# Sword_INCLUDE_DIRS
+# Sword_CFLAGS
+# Sword_CFLAGS_OTHER
+# Sword_VERSION
 
-IF(SWVERSIONTEST_RUN_RESULT EQUAL 0)
-    MESSAGE(STATUS "Installed Sword version is ok. Check program said: ${SWVERSIONTEST_RUN_OUTPUT}")
-ELSE(SWVERSIONTEST_RUN_RESULT EQUAL 0)
-    MESSAGE(FATAL_ERROR "Installed Sword version is NOT ok! Check program said: ${SWVERSIONTEST_RUN_OUTPUT}")
-ENDIF(SWVERSIONTEST_RUN_RESULT EQUAL 0)
+MACRO(FindSword_unset_all)
+  UNSET(Sword_FOUND)
+  UNSET(Sword_LIBRARIES)
+  UNSET(Sword_LIBRARY_DIRS)
+  UNSET(Sword_LDFLAGS)
+  UNSET(Sword_LDFLAGS_OTHER)
+  UNSET(Sword_INCLUDE_DIRS)
+  UNSET(Sword_CFLAGS)
+  UNSET(Sword_CFLAGS_OTHER)
+  UNSET(Sword_VERSION)
+ENDMACRO()
+FindSword_unset_all()
 
-#
-# Sword linker flag detection
-#
-MACRO(CHECK_SWORD_LINK_LIBRARIES FLAGS)
-    IF(MSVC)
-        SET(CHECK_SWORD_CXX_FLAGS "/Zc:wchar_t- /MDd")
-        SET(CHECK_SWORD_LINK_DEFINES "/DSWUSINGDLL")
-    ELSE(MSVC)
-        SET(CHECK_SWORD_CXX_FLAGS "")
-        SET(CHECK_SWORD_LINK_DEFINES "")
-    ENDIF(MSVC)
-    TRY_COMPILE(SWLINKER_CHECK_COMPILE_RESULT
-    ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/sword_linker_check.cpp
-    CMAKE_FLAGS
-        "-DINCLUDE_DIRECTORIES:STRING=${SWORD_INCLUDE_DIR}"
-        "-DLINK_DIRECTORIES:STRING=${SWORD_LIBRARY_DIR};${CLUCENE_LIBRARY_DIR}"
-        "-DLINK_LIBRARIES:STRING=${FLAGS}"
-        "-DCMAKE_CXX_FLAGS_DEBUG:STRING=${CHECK_SWORD_CXX_FLAGS}"
-    COMPILE_DEFINITIONS
-        ${CHECK_SWORD_LINK_DEFINES}
-    OUTPUT_VARIABLE SWLINKER_CHECK_COMPILE_OUTPUT
-)
-ENDMACRO(CHECK_SWORD_LINK_LIBRARIES FLAGS)
+INCLUDE(FindPkgConfig)
+
+IF(PKG_CONFIG_FOUND)
+  # Workaround PKG_CONFIG_PATH set to include CMAKE_PREFIX_PATH paths:
+  IF(WIN32)
+    SET(FindSword_s ";")
+  ELSE()
+    SET(FindSword_s ":")
+  ENDIF()
+  FOREACH(d IN LISTS CMAKE_PREFIX_PATH)
+    SET(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}${FindSword_s}${d}/lib/pkgconfig${FindSword_s}${d}/share/pkgconfig${FindSword_s}${d}/lib32/pkgconfig${FindSword_s}${d}/lib64/pkgconfig")
+  ENDFOREACH()
+  UNSET(FindSword_s)
+
+  IF(Sword_FIND_VERSION_EXACT)
+    SET(FindSword_Version_Comp "=")
+  ELSE()
+    SET(FindSword_Version_Comp ">=")
+  ENDIF()
+  pkg_search_module(Sword QUIET
+      "sword${FindSword_Version_Comp}${Sword_FIND_VERSION}"
+      "sword-${Sword_FIND_VERSION_MAJOR}${FindSword_Version_Comp}${Sword_FIND_VERSION}"
+      "sword-${Sword_FIND_VERSION_MAJOR}.${Sword_FIND_VERSION_MINOR}${FindSword_Version_Comp}${Sword_FIND_VERSION}"
+      "sword${Sword_FIND_VERSION_MAJOR}${FindSword_Version_Comp}${Sword_FIND_VERSION}"
+      "sword${Sword_FIND_VERSION_MAJOR}.${Sword_FIND_VERSION_MINOR}${FindSword_Version_Comp}${Sword_FIND_VERSION}")
+  UNSET(FindSword_Version_Comp)
+ENDIF()
 
-#CURL_LIBRARIES and ICU_LIBRARIES are optional, empty if not found
-CHECK_SWORD_LINK_LIBRARIES("${CLUCENE_LIBRARY};${SWORD_LIBRARY};${CURL_LIBRARIES};${ICU_LIBRARIES};${ICU_I18N_LIBRARIES};${ZLIB_LIBRARIES}")
+# If pkg-config fails we try this:
+IF(NOT Sword_FOUND)
+  IF(NOT Sword_FIND_QUIETLY)
+    MESSAGE(WARNING "Falling back to manual Sword detection...")
+  ENDIF()
+  FIND_LIBRARY(FindSword_LIBS NAMES sword libsword)
+  IF(FindSword_LIBS)
+    FIND_PATH(FindSword_INCS NAMES "sword/swmgr.h")
+    IF(FindSword_INCS)
+      SET(FindSword_INCS "${FindSword_INCS}/sword")
+      TRY_RUN(RUN_RESULT COMPILE_RESULT
+              "${CMAKE_CURRENT_BINARY_DIR}"
+              "${CMAKE_CURRENT_SOURCE_DIR}/cmake/sword_version_print.cpp"
+              CMAKE_FLAGS
+                "-DINCLUDE_DIRECTORIES:STRING=${FindSword_INCS}"
+              COMPILE_OUTPUT_VARIABLE COMPILE_OUTPUT
+              RUN_OUTPUT_VARIABLE RUN_OUTPUT)
+      IF(NOT COMPILE_RESULT)
+        IF(NOT Sword_FIND_QUIETLY)
+          MESSAGE(WARNING "Failed to compile Sword version check: ${COMPILE_OUTPUT}")
+        ENDIF()
+      ELSEIF(RUN_RESULT)
+        IF(NOT Sword_FIND_QUIETLY)
+          MESSAGE(WARNING "Failed to run Sword version check: ${COMPILE_OUTPUT}")
+        ENDIF()
+      ELSE()
+        SET(Sword_FOUND TRUE)
+        SET(Sword_VERSION "${RUN_OUTPUT}")
+        GET_FILENAME_COMPONENT(Sword_LIBRARY_DIRS "${FindSword_LIBS}" PATH)
+        SET(Sword_LIBRARIES "sword")
+        SET(Sword_LDFLAGS "-L${Sword_LIBRARY_DIRS};-l${Sword_LIBRARIES}")
+        SET(Sword_INCLUDE_DIRS "${FindSword_INCS}")
+        SET(Sword_CFLAGS "-I${Sword_INCLUDE_DIRS}")
+      ENDIF()
+    ENDIF()
+    UNSET(FindSword_INCS)
+  ENDIF()
+  UNSET(FindSword_LIBS)
+ENDIF()
 
-IF(SWLINKER_CHECK_COMPILE_RESULT)
-    MESSAGE(STATUS "Sword linker check compiled ok.")
-    # SWORD_LIBRARY can stay unchanged
-ELSE(SWLINKER_CHECK_COMPILE_RESULT)
-    MESSAGE(STATUS "Sword linker check could NOT be compiled. It seems that you need additional libraries for the linker.")
-    MESSAGE(STATUS "Here is the detailed output of the compilation and linking process:")
-    MESSAGE(FATAL_ERROR "${SWLINKER_CHECK_COMPILE_OUTPUT}")
-ENDIF(SWLINKER_CHECK_COMPILE_RESULT)
+IF(Sword_FOUND)
+  SET(FindSword_Sword_FOUND "YES")
+ENDIF()
 
+INCLUDE(FindPackageHandleStandardArgs)
+IF(CMAKE_VERSION VERSION_LESS 2.8.11)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sword
+                                    REQUIRED_VARS FindSword_Sword_FOUND
+                                    VERSION_VAR Sword_VERSION)
+  IF(SWORD_FOUND)
+    SET(Sword_FOUND TRUE)
+  ENDIF()
+  UNSET(SWORD_FOUND)
+ELSE()
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sword
+                                    FOUND_VAR Sword_FOUND
+                                    REQUIRED_VARS FindSword_Sword_FOUND
+                                    VERSION_VAR Sword_VERSION)
+ENDIF()
+UNSET(FindSword_Sword_FOUND)
 
-MARK_AS_ADVANCED(
-    SWORD_INCLUDE_DIR
-    SWORD_LIBRARY
-    SWORD_LIBRARY_DIR
-)
+IF(Sword_FOUND AND NOT Sword_FIND_QUIETLY)
+  MESSAGE(STATUS "Sword ${Sword_VERSION} details:")
+  MESSAGE(STATUS "    CFLAGS: ${Sword_CFLAGS}")
+  MESSAGE(STATUS "      INCLUDE_DIRS: ${Sword_INCLUDE_DIRS}")
+  MESSAGE(STATUS "      CFLAGS_OTHER: ${Sword_CFLAGS_OTHER}")
+  MESSAGE(STATUS "    LDFLAGS: ${Sword_LDFLAGS}")
+  MESSAGE(STATUS "      LIBRARIES: ${Sword_LIBRARIES}")
+  MESSAGE(STATUS "      LIBRARY_DIRS: ${Sword_LIBRARY_DIRS}")
+  MESSAGE(STATUS "      LDFLAGS_OTHER: ${Sword_LDFLAGS_OTHER}")
+ENDIF()
diff --git a/cmake/FindLibraryWithDebug.cmake b/cmake/KDE4FindLibraryWithDebug.cmake
index 0844a1e..0844a1e 100644
--- a/cmake/FindLibraryWithDebug.cmake
+++ b/cmake/KDE4FindLibraryWithDebug.cmake
diff --git a/cmake/platforms/linux/bibletime.desktop.cmake b/cmake/platforms/linux/bibletime.desktop.cmake
index e97d80b..f3c0849 100644
--- a/cmake/platforms/linux/bibletime.desktop.cmake
+++ b/cmake/platforms/linux/bibletime.desktop.cmake
@@ -11,14 +11,14 @@ Comment[it]=Un semplice strumento per studiare la Bibbia
 Exec=bibletime
 Icon=bibletime
 MimeType=
-Name=BibleTime ${BT_VERSION}
-Name[C]=BibleTime ${BT_VERSION}
-Name[cs]=BibleTime ${BT_VERSION}
-Name[da]=Bibletime ${BT_VERSION}
-Name[de]=BibleTime ${BT_VERSION}
-Name[et]=BibleTime ${BT_VERSION}
-Name[fr]=BibleTime ${BT_VERSION}
-Name[it]=BibleTime ${BT_VERSION}
+Name=BibleTime @BT_VERSION@
+Name[C]=BibleTime @BT_VERSION@
+Name[cs]=BibleTime @BT_VERSION@
+Name[da]=Bibletime @BT_VERSION@
+Name[de]=BibleTime @BT_VERSION@
+Name[et]=BibleTime @BT_VERSION@
+Name[fr]=BibleTime @BT_VERSION@
+Name[it]=BibleTime @BT_VERSION@
 GenericName=Bible Study Tool
 Terminal=false
 Type=Application
diff --git a/cmake/platforms/macos/Info.plist b/cmake/platforms/macos/Info.plist
index 5d69434..1417798 100644
--- a/cmake/platforms/macos/Info.plist
+++ b/cmake/platforms/macos/Info.plist
@@ -4,7 +4,23 @@
 <dict>
 	<key>CFBundleIconFile</key>
 	<string>BibleTime.icns</string>
+
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
+
+    <key>CFBundleName</key>
+    <string>BibleTime</string>
+
+    <key>CFBundleDisplayName</key>
+    <string>BibleTime</string>
+
+    <key>CFBundleIdentifier</key>
+    <string>info.bibletime.BibleTime</string>
+
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+
+    <key>MDItemKeywords</key>
+    <string>BibleTime Bible bible time study</string>
 </dict>
 </plist>
diff --git a/cmake/platforms/macos/bt_start.sh b/cmake/platforms/macos/bt_start.sh
deleted file mode 100644
index ad3128a..0000000
--- a/cmake/platforms/macos/bt_start.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-# Author: Gregory Hellings
-# Copyright: BibleTime development team
-# Initial creation date: 23 April 2009
-# This is a Mac-only shell script that makes it possible for us to avoid having to run
-#   lots of annoying commands on the Qt frameworks for the Mac build of BibleTime.
-#   It is inspired and draws heavily from th example at http://www.cmake.org/Wiki/CMake:CPackPackageGenerators
-
-BT_BUNDLE="`echo "$0" | sed -e 's/\/Contents\/MacOS\/BibleTime//'`"
-
-echo "running $0"
-echo "BT_BUNDLE: $BT_BUNDLE"
-
-export DYLD_LIBRARY_PATH=$BT_BUNDLE/Contents/Resources/Library
-export DYLD_FRAMEWORK_PATH=$BT_BUNDLE/Contents/Resources/Library/Frameworks
-export PATH=$BT_BUNDLE/Contents/Resources/bin:$PATH
-export QT_PLUGIN_PATH=$BT_BUNDLE/Contents/plugins
-
-cd $BT_BUNDLE/Contents/Resources/bin
-# Run BibleTime
-exec "BibleTime"
diff --git a/cmake/platforms/windows/qt.conf b/cmake/platforms/windows/qt.conf
new file mode 100644
index 0000000..dfc4208
--- /dev/null
+++ b/cmake/platforms/windows/qt.conf
@@ -0,0 +1,2 @@
+[Paths]
+Plugins=plugins
diff --git a/cmake/platforms/windows/rawfiles.cpp b/cmake/platforms/windows/rawfiles.cpp
index 3901c22..25bbcac 100644
--- a/cmake/platforms/windows/rawfiles.cpp
+++ b/cmake/platforms/windows/rawfiles.cpp
@@ -1,13 +1,13 @@
 /******************************************************************************
  *  rawfiles.cpp - code for class 'RawFiles'- a module that produces HTML HREFs
- *			pointing to actual text desired.  Uses standard
- *			files:	ot and nt using indexs ??.bks ??.cps ??.vss
+ *            pointing to actual text desired.  Uses standard
+ *            files:    ot and nt using indexs ??.bks ??.cps ??.vss
  *
  *
  * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
- *	CrossWire Bible Society
- *	P. O. Box 2528
- *	Tempe, AZ  85280-2528
+ *    CrossWire Bible Society
+ *    P. O. Box 2528
+ *    Tempe, AZ  85280-2528
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -35,9 +35,9 @@ SWORD_NAMESPACE_START
  /******************************************************************************
  * RawFiles Constructor - Initializes data for instance of RawFiles
  *
- * ENT:	iname - Internal name for module
- *	idesc - Name to display to user for module
- *	idisp	 - Display object to use for displaying
+ * ENT:    iname - Internal name for module
+ *         idesc - Name to display to user for module
+ *         idisp - Display object to use for displaying
  */
 
 RawFiles::RawFiles(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang) : RawVerse(ipath, FileMgr::RDWR), SWCom(iname, idesc, idisp, enc, dir, mark, ilang)
@@ -58,169 +58,169 @@ RawFiles::~RawFiles()
 * @return yes or no
 */
 bool RawFiles::isWritable() {
-	return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR));
+    return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR));
 }
 
 
 /******************************************************************************
- * RawFiles::getRawEntry	- Retrieve the unprocessed entry contents at
- *					the current key position of this module
+ * RawFiles::getRawEntry    - Retrieve the unprocessed entry contents at
+ *                            the current key position of this module
  *
  * RET: entry contents
  */
 
 SWBuf &RawFiles::getRawEntryBuf() {
-	FileDesc *datafile;
-	long  start = 0;
-	unsigned short size = 0;
-	VerseKey *key = &getVerseKey();
-
-	findOffset(key->Testament(), key->TestamentIndex(), &start, &size);
-
-	entryBuf = "";
-	if (size) {
-		SWBuf tmpbuf = path;
-		tmpbuf += '/';
-		readText(key->Testament(), start, size, entryBuf);
-		tmpbuf += entryBuf;
-		entryBuf = "";
-		datafile = FileMgr::getSystemFileMgr()->open(tmpbuf.c_str(), FileMgr::RDONLY);
-		if (datafile->getFd() > 0) {
-			size = datafile->seek(0, SEEK_END);
-			char *tmpBuf = new char [ size + 1 ];
-			memset(tmpBuf, 0, size + 1);
-			datafile->seek(0, SEEK_SET);
-			datafile->read(tmpBuf, size);
-			entryBuf = tmpBuf;
-			delete [] tmpBuf;
-//			preptext(entrybuf);
-		}
-		FileMgr::getSystemFileMgr()->close(datafile);
-	}
-	return entryBuf;
+    FileDesc *datafile;
+    long  start = 0;
+    unsigned short size = 0;
+    VerseKey *key = &getVerseKey();
+
+    findOffset(key->Testament(), key->TestamentIndex(), &start, &size);
+
+    entryBuf = "";
+    if (size) {
+        SWBuf tmpbuf = path;
+        tmpbuf += '/';
+        readText(key->Testament(), start, size, entryBuf);
+        tmpbuf += entryBuf;
+        entryBuf = "";
+        datafile = FileMgr::getSystemFileMgr()->open(tmpbuf.c_str(), FileMgr::RDONLY);
+        if (datafile->getFd() > 0) {
+            size = datafile->seek(0, SEEK_END);
+            char *tmpBuf = new char [ size + 1 ];
+            memset(tmpBuf, 0, size + 1);
+            datafile->seek(0, SEEK_SET);
+            datafile->read(tmpBuf, size);
+            entryBuf = tmpBuf;
+            delete [] tmpBuf;
+//            preptext(entrybuf);
+        }
+        FileMgr::getSystemFileMgr()->close(datafile);
+    }
+    return entryBuf;
 }
 
 
 /******************************************************************************
  * RawFiles::setEntry(char *)- Update the module's current key entry with
- *				provided text
+ *                             provided text
  */
 
 void RawFiles::setEntry(const char *inbuf, long len) {
-	FileDesc *datafile;
-	long  start;
-	unsigned short size;
-	VerseKey *key = &getVerseKey();
-
-	len = (len<0)?strlen(inbuf):len;
-
-	findOffset(key->Testament(), key->TestamentIndex(), &start, &size);
-
-	if (size) {
-		SWBuf tmpbuf;
-		entryBuf = path;
-		entryBuf += '/';
-		readText(key->Testament(), start, size, tmpbuf);
-		entryBuf += tmpbuf;
-	}
-	else {
-		SWBuf tmpbuf;
-		entryBuf = path;
-		entryBuf += '/';
-		tmpbuf = getNextFilename();
-		doSetText(key->Testament(), key->TestamentIndex(), tmpbuf);
-		entryBuf += tmpbuf;
-	}
-	datafile = FileMgr::getSystemFileMgr()->open(entryBuf, FileMgr::CREAT|FileMgr::WRONLY|FileMgr::TRUNC);
-	if (datafile->getFd() > 0) {
-		datafile->write(inbuf, len);
-	}
-	FileMgr::getSystemFileMgr()->close(datafile);
+    FileDesc *datafile;
+    long  start;
+    unsigned short size;
+    VerseKey *key = &getVerseKey();
+
+    len = (len<0)?strlen(inbuf):len;
+
+    findOffset(key->Testament(), key->TestamentIndex(), &start, &size);
+
+    if (size) {
+        SWBuf tmpbuf;
+        entryBuf = path;
+        entryBuf += '/';
+        readText(key->Testament(), start, size, tmpbuf);
+        entryBuf += tmpbuf;
+    }
+    else {
+        SWBuf tmpbuf;
+        entryBuf = path;
+        entryBuf += '/';
+        tmpbuf = getNextFilename();
+        doSetText(key->Testament(), key->TestamentIndex(), tmpbuf);
+        entryBuf += tmpbuf;
+    }
+    datafile = FileMgr::getSystemFileMgr()->open(entryBuf, FileMgr::CREAT|FileMgr::WRONLY|FileMgr::TRUNC);
+    if (datafile->getFd() > 0) {
+        datafile->write(inbuf, len);
+    }
+    FileMgr::getSystemFileMgr()->close(datafile);
 }
 
 
 /******************************************************************************
  * RawFiles::linkEntry(SWKey *)- Link the modules current key entry with
- *				another module entry
+ *                               another module entry
  *
  * RET: *this
  */
 
 void RawFiles::linkEntry(const SWKey *inkey) {
 
-	long  start;
-	unsigned short size;
-	const VerseKey *key = &getVerseKey();
+    long  start;
+    unsigned short size;
+    const VerseKey *key = &getVerseKey();
 
-	findOffset(key->Testament(), key->TestamentIndex(), &start, &size);
+    findOffset(key->Testament(), key->TestamentIndex(), &start, &size);
 
-	if (size) {
-		SWBuf tmpbuf;
-		readText(key->Testament(), start, size + 2, tmpbuf);
+    if (size) {
+        SWBuf tmpbuf;
+        readText(key->Testament(), start, size + 2, tmpbuf);
 
-		key = &getVerseKey(inkey);
-		doSetText(key->Testament(), key->TestamentIndex(), tmpbuf.c_str());
-	}
+        key = &getVerseKey(inkey);
+        doSetText(key->Testament(), key->TestamentIndex(), tmpbuf.c_str());
+    }
 }
 
 
 /******************************************************************************
- * RawFiles::deleteEntry	- deletes this entry
+ * RawFiles::deleteEntry    - deletes this entry
  *
  * RET: *this
  */
 
 void RawFiles::deleteEntry() {
-	VerseKey *key = &getVerseKey();
-	doSetText(key->Testament(), key->TestamentIndex(), "");
+    VerseKey *key = &getVerseKey();
+    doSetText(key->Testament(), key->TestamentIndex(), "");
 }
 
 
 /******************************************************************************
  * RawFiles::getNextfilename - generates a valid filename in which to store
- *				an entry
+ *                             an entry
  *
  * RET: filename
  */
 
 const char *RawFiles::getNextFilename() {
-	static SWBuf incfile;
-	__u32 number = 0;
-	FileDesc *datafile;
-
-	incfile.setFormatted("%s/incfile", path);
-	datafile = FileMgr::getSystemFileMgr()->open(incfile, FileMgr::RDONLY);
-	if (datafile->getFd() != -1) {
-		if (datafile->read(&number, 4) != 4) number = 0;
-		number = swordtoarch32(number);
-	}
-	number++;
-	FileMgr::getSystemFileMgr()->close(datafile);
-	
-	datafile = FileMgr::getSystemFileMgr()->open(incfile, FileMgr::CREAT|FileMgr::WRONLY|FileMgr::TRUNC);
-	incfile.setFormatted("%.7d", number-1);
-
-	number = archtosword32(number);
-	datafile->write(&number, 4);
-
-	FileMgr::getSystemFileMgr()->close(datafile);
-	return incfile;
+    static SWBuf incfile;
+    __u32 number = 0;
+    FileDesc *datafile;
+
+    incfile.setFormatted("%s/incfile", path);
+    datafile = FileMgr::getSystemFileMgr()->open(incfile, FileMgr::RDONLY);
+    if (datafile->getFd() != -1) {
+        if (datafile->read(&number, 4) != 4) number = 0;
+        number = swordtoarch32(number);
+    }
+    number++;
+    FileMgr::getSystemFileMgr()->close(datafile);
+
+    datafile = FileMgr::getSystemFileMgr()->open(incfile, FileMgr::CREAT|FileMgr::WRONLY|FileMgr::TRUNC);
+    incfile.setFormatted("%.7d", number-1);
+
+    number = archtosword32(number);
+    datafile->write(&number, 4);
+
+    FileMgr::getSystemFileMgr()->close(datafile);
+    return incfile;
 }
 
 
 char RawFiles::createModule(const char *path) {
-	char *incfile = new char [ strlen (path) + 16 ];
+    char *incfile = new char [ strlen (path) + 16 ];
 
-	__u32 zero = 0;
-	zero = archtosword32(zero);
+    __u32 zero = 0;
+    zero = archtosword32(zero);
 
-	FileDesc *datafile;
+    FileDesc *datafile;
 
-	sprintf(incfile, "%s/incfile", path);
-	datafile = FileMgr::getSystemFileMgr()->open(incfile, FileMgr::CREAT|FileMgr::WRONLY|FileMgr::TRUNC);
-	delete [] incfile;
-	datafile->write(&zero, 4);
-	FileMgr::getSystemFileMgr()->close(datafile);
+    sprintf(incfile, "%s/incfile", path);
+    datafile = FileMgr::getSystemFileMgr()->open(incfile, FileMgr::CREAT|FileMgr::WRONLY|FileMgr::TRUNC);
+    delete [] incfile;
+    datafile->write(&zero, 4);
+    FileMgr::getSystemFileMgr()->close(datafile);
 
     return RawVerse::createModule (path);
 }
diff --git a/cmake/platforms/windows/rawfiles.h b/cmake/platforms/windows/rawfiles.h
index 014f40d..4903788 100644
--- a/cmake/platforms/windows/rawfiles.h
+++ b/cmake/platforms/windows/rawfiles.h
@@ -1,14 +1,14 @@
 /******************************************************************************
  *  rawfiles.h - code for class 'RawFiles'- a module that produces HTML HREFs
- *			pointing to actual text desired.  Uses standard
- *			files:	ot and nt using indexs ??.bks ??.cps ??.vss
+ *            pointing to actual text desired.  Uses standard
+ *            files:    ot and nt using indexs ??.bks ??.cps ??.vss
  *
  * $Id: rawfiles.h 2599 2011-02-12 05:11:09Z scribe $
  *
  * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
- *	CrossWire Bible Society
- *	P. O. Box 2528
- *	Tempe, AZ  85280-2528
+ *    CrossWire Bible Society
+ *    P. O. Box 2528
+ *    Tempe, AZ  85280-2528
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -33,52 +33,52 @@ SWORD_NAMESPACE_START
 
 class SWDLLEXPORT RawFiles : public RawVerse, public SWCom {
 
-	const char *getNextFilename();
+    const char *getNextFilename();
 
 public:
 
 
-	RawFiles(const char *ipath, const char *iname = 0, const char *idesc = 0,
-			SWDisplay *idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
-			SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN,
-			const char *ilang = 0);
-	virtual ~RawFiles();
-	virtual SWBuf &getRawEntryBuf();
-
-	// write interface ----------------------------
-	/** Is the module writable? :)
-	* @return yes or no
-	*/
-	virtual bool isWritable();
-
-	/** Creates a new module
-	* @param path The first parameter is path of the new module
-	* @return error
-	*/
-	static char createModule(const char *);
-
-	/** Modify the current module entry text
-	* - only if module @ref isWritable
-	* @return *this
-	*/
-	virtual void setEntry(const char *inbuf, long len = -1);	// Modify current module entry
-
-	/** Link the current module entry to another module entry
-	* - only if module @ref isWritable
-	* @return *this
-	*/
-	virtual void linkEntry(const SWKey *linkKey);	// Link current module entry to other module entry
-
-	/** Delete current module entry - only if module @ref isWritable
-	*
-	*/
-	virtual void deleteEntry();
-	// end write interface ------------------------
-
-
-	// OPERATORS -----------------------------------------------------------------
-	
-	SWMODULE_OPERATORS
+    RawFiles(const char *ipath, const char *iname = 0, const char *idesc = 0,
+            SWDisplay *idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
+            SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN,
+            const char *ilang = 0);
+    virtual ~RawFiles();
+    virtual SWBuf &getRawEntryBuf();
+
+    // write interface ----------------------------
+    /** Is the module writable? :)
+    * @return yes or no
+    */
+    virtual bool isWritable();
+
+    /** Creates a new module
+    * @param path The first parameter is path of the new module
+    * @return error
+    */
+    static char createModule(const char *);
+
+    /** Modify the current module entry text
+    * - only if module @ref isWritable
+    * @return *this
+    */
+    virtual void setEntry(const char *inbuf, long len = -1);    // Modify current module entry
+
+    /** Link the current module entry to another module entry
+    * - only if module @ref isWritable
+    * @return *this
+    */
+    virtual void linkEntry(const SWKey *linkKey);    // Link current module entry to other module entry
+
+    /** Delete current module entry - only if module @ref isWritable
+    *
+    */
+    virtual void deleteEntry();
+    // end write interface ------------------------
+
+
+    // OPERATORS -----------------------------------------------------------------
+
+    SWMODULE_OPERATORS
 
 };
 
diff --git a/cmake/sword_linker_check.cpp b/cmake/sword_linker_check.cpp
deleted file mode 100644
index 97d33b8..0000000
--- a/cmake/sword_linker_check.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2008 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-/*
- * Use some important Sword classes to see if the linker flags work correctly
- */
-
-#include <iostream>
-
-#include <swmgr.h>
-#include <installmgr.h>
-#include <ftptrans.h>
-
-int main(int argc, char* argv[])
-{
-    sword::SWMgr mgr;
-    sword::InstallMgr imgr;
-    sword::FTPTransport trans("example.com");
-
-    return 0;
-}
diff --git a/cmake/sword_version_compare.cpp b/cmake/sword_version_print.cpp
index 1da9594..f9cc8e6 100644
--- a/cmake/sword_version_compare.cpp
+++ b/cmake/sword_version_print.cpp
@@ -12,12 +12,13 @@
  */
 
 #include <iostream>
-
 #include <swversion.h>
 
-int main(int argc, char* argv[])
-{
-    sword::SWVersion testversion(argv[1]);
-    std::cout << "Your installed Sword version is: " << sword::SWVersion::currentVersion.getText();
-    return (sword::SWVersion::currentVersion >= testversion) ? 0 : 1;
+#ifndef SWORD_VERSION_STR
+#error SWORD_VERSION_STR not defined!
+#endif
+
+int main() {
+    std::cout << (SWORD_VERSION_STR);
+    return 0;
 }
diff --git a/debian/changelog b/debian/changelog
index 098a9e2..593fb3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bibletime (2.10.1-1) unstable; urgency=medium
+
+  * New Upstream Release
+
+ -- David Sanders <david@sandersweb.net> Thu, 09 Oct 2014 12:41:00 +0400
+
 bibletime (2.9.2-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index cb63a9d..3e8444f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: bibletime
 Section: kde
 Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7.0.50~),
- libsword-dev (>= 1.5.11), libclucene-dev, poxml, libboost-dev, cmake,
+ libsword-dev (>= 1.7.3), libclucene-dev, poxml, libboost-dev, cmake,
  pkg-config, zlib1g-dev, libcurl4-gnutls-dev, libqtwebkit-dev | libqt4-dev (<= 4:4.7.0~beta1)
 Priority: optional
 Maintainer: CrossWire Packages <pkg-crosswire-devel@lists.alioth.debian.org>
@@ -27,6 +27,7 @@ Description: bible study tool for Qt
 
 Package: bibletime-data
 Architecture: all
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: bibletime
 Conflicts: bibletime-i18n
diff --git a/debian/patches/find-clucene-config.h.diff b/debian/patches/find-clucene-config.h.diff
deleted file mode 100644
index 870e12b..0000000
--- a/debian/patches/find-clucene-config.h.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: find clucene-config.h in clucene 2.x' multiarch dir
-Author: Rene Engelhard <rene@debian.org>
-
---- a/cmake/FindCLucene.cmake
-+++ b/cmake/FindCLucene.cmake
-@@ -58,6 +58,7 @@
-     /usr/local/include
-     /opt/local/include
-     /usr/include
-+    /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
-     /sw/include
-     /usr/pkg/include
-     ${WIN_CLUCENE_INCLUDE_PATH}
diff --git a/debian/patches/gcc4.7-ftbfs.patch b/debian/patches/gcc4.7-ftbfs.patch
deleted file mode 100644
index f6d1c63..0000000
--- a/debian/patches/gcc4.7-ftbfs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Work-around FTBFS with gcc4.7 by disabling -Werror
-Author: Dmitrijs Ledkovs <xnox@debian.org>
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -245,7 +245,7 @@
-     SET(CMAKE_CXX_FLAGS_DEBUG   "-DNO_DBUS -DSWUSINGDLL /MDd /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE /ZI")
- ELSE (MSVC)
-     SET(CMAKE_CXX_FLAGS_RELEASE "-Wall -O2 -fexceptions")
--    SET(CMAKE_CXX_FLAGS_DEBUG   "-Wall -Werror -O2 -ggdb -fexceptions")
-+    SET(CMAKE_CXX_FLAGS_DEBUG   "-Wall -O2 -ggdb -fexceptions")
- ENDIF (MSVC)
- 
- 
diff --git a/debian/patches/libsword-1.7.patch b/debian/patches/libsword-1.7.patch
deleted file mode 100644
index a392615..0000000
--- a/debian/patches/libsword-1.7.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Plamen Aleksandrov <plamen@aomeda.com>
-Subject: patch for bibletime 2.9
-Date: Wed, 18 Jun 2014 16:23:33 +0300
-
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=748685
-
-This patch fixes the compilation of bibletime 2.9 with libsword 1.7.
-
-diff -urN a/cmake/sword_linker_check.cpp b/cmake/sword_linker_check.cpp
---- a/cmake/sword_linker_check.cpp	2013-06-03 18:08:52.000000000 +0000
-+++ b/cmake/sword_linker_check.cpp	2014-06-16 12:49:05.979470653 +0000
-@@ -15,13 +15,13 @@
- 
- #include <swmgr.h>
- #include <installmgr.h>
--#include <ftptrans.h>
-+#include <curlftpt.h>
- 
- int main(int argc, char* argv[])
- {
-     sword::SWMgr mgr;
-     sword::InstallMgr imgr;
--    sword::FTPTransport trans("example.com");
-+    sword::CURLFTPTransport CURLFTPTransport("example.com");
- 
-     return 0;
- }
-diff -urN a/src/backend/rendering/centrydisplay.h b/src/backend/rendering/centrydisplay.h
---- a/src/backend/rendering/centrydisplay.h	2013-06-03 18:08:52.000000000 +0000
-+++ b/src/backend/rendering/centrydisplay.h	2014-06-16 14:28:00.972395181 +0000
-@@ -35,6 +35,7 @@
-                                    const DisplayOptions &displayOptions,
-                                    const FilterOptions &filterOptions);
- 
-+	virtual char display(sword::SWModule& mod) { (void)mod; return 'c';}
- }; /* class CEntryDisplay */
- 
- } /* namespace Rendering */
-diff -urN a/src/bibletime.cpp b/src/bibletime.cpp
---- a/src/bibletime.cpp	2013-06-03 18:08:52.000000000 +0000
-+++ b/src/bibletime.cpp	2014-06-17 09:06:12.656074834 +0000
-@@ -285,7 +285,7 @@
-             const int maxIndex = 31100;
-             int newIndex = rand() % maxIndex;
-             vk.setPosition(sword::TOP);
--            vk.Index(newIndex);
-+            vk.setIndex(newIndex);
-             createReadDisplayWindow(bible, vk.key());
-         } else {
-             createReadDisplayWindow(bible, bibleKey);
-diff -urN a/src/frontend/bookshelfmanager/btinstallmgr.cpp b/src/frontend/bookshelfmanager/btinstallmgr.cpp
---- a/src/frontend/bookshelfmanager/btinstallmgr.cpp	2013-06-03 18:08:52.000000000 +0000
-+++ b/src/frontend/bookshelfmanager/btinstallmgr.cpp	2014-06-17 09:55:32.442530952 +0000
-@@ -18,7 +18,7 @@
- 
- // Sword includes:
- #include <installmgr.h>
--#include <ftptrans.h>
-+#include <curlftpt.h>
- 
- 
- using namespace sword;
-diff -urN a/src/frontend/bookshelfmanager/btinstallmgr.h b/src/frontend/bookshelfmanager/btinstallmgr.h
---- a/src/frontend/bookshelfmanager/btinstallmgr.h	2013-06-03 18:08:52.000000000 +0000
-+++ b/src/frontend/bookshelfmanager/btinstallmgr.h	2014-06-17 09:53:52.314448110 +0000
-@@ -18,7 +18,7 @@
- 
- // Sword includes:
- #include <installmgr.h>
--#include <ftptrans.h>
-+#include <curlftpt.h>
- 
- 
- /**
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ac6ab7a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-gcc4.7-ftbfs.patch
-find-clucene-config.h.diff
-libsword-1.7.patch
diff --git a/debian/rules b/debian/rules
index 2fa5a43..7b6d42a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,4 @@
 #!/usr/bin/make -f
-ppa:=$(shell sed -n "1s/.*~.*/yes/p" debian/changelog)
 
 %:
-	dh $@ --with quilt -Scmake --parallel
-override_dh_clean:
-	echo $(if $(ppa),"1.0","3.0 (quilt)") > debian/source/format
-	dh_clean
+	dh $@ -Scmake --parallel
diff --git a/debian/watch b/debian/watch
index 086223e..ac6c748 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 
-http://sf.net/bibletime/bibletime-([\d\.]+).tar.[bg]z2?
+http://sf.net/bibletime/bibletime-([\d\.]+).tar.xz?
diff --git a/docs/development/ksgmltools-bug-read-me.txt b/docs/development/ksgmltools-bug-read-me.txt
index 5a40a7f..fe8063d 100644
--- a/docs/development/ksgmltools-bug-read-me.txt
+++ b/docs/development/ksgmltools-bug-read-me.txt
@@ -11,7 +11,7 @@ Edited the file  /usr/share/apps/ksgmltools2/customization/entities/general.enti
 also known as "-//KDE//ENTITIES DocBook XML General Entity Declarations V1.0//EN"
 
 to read
-<!ENTITY XML		'<trademark class="registered">XML</trademark>'>
+<!ENTITY XML        '<trademark class="registered">XML</trademark>'>
 
 Also did this with all trademark tags that had no class.  Class is required for this tag, see
 
diff --git a/docs/development/packaging-howto.txt b/docs/development/packaging-howto.txt
index bce35fa..d12c9d0 100644
--- a/docs/development/packaging-howto.txt
+++ b/docs/development/packaging-howto.txt
@@ -3,52 +3,52 @@ This is a small explanation how to create packages of BibleTime
 
 -Source packages of BibleTime:
 ------------------------------
-	Builidng source packages is only required after a new release and not necessary for users.
-	To build source packages like bibletime-1.5.tar.bz2 execute these commands and procedures:
-	
-	1. Change in configure.in.in the version number to the right one. 
-		Check README.in and INSTALL.in if the requirements and their version numbers changed.	
-	
-	2. "./autogen.sh && ./configure && make distclean && rm
+    Builidng source packages is only required after a new release and not necessary for users.
+    To build source packages like bibletime-1.5.tar.bz2 execute these commands and procedures:
+
+    1. Change in configure.in.in the version number to the right one.
+        Check README.in and INSTALL.in if the requirements and their version numbers changed.
+
+    2. "./autogen.sh && ./configure && make distclean && rm
 bibletime-*.tar*" to cleanup the source directory
-	
-	3. "make dist" to create the package bibletime-1.5.tar.bz2
-	
-	4. Test the package. Execute "tar -xjf bibletime-1.5.tar.bz2"
+
+    3. "make dist" to create the package bibletime-1.5.tar.bz2
+
+    4. Test the package. Execute "tar -xjf bibletime-1.5.tar.bz2"
 somewhere, then "cd bibletime-1.5" and then "./configure && make && make
 install". Start BibleTime to test if the installation was successful and if all
 icons etc. are present.
-	
-	4. Upload the bibletime-1.5.tar.bz2 file.
+
+    4. Upload the bibletime-1.5.tar.bz2 file.
 
 
 -Binary RPM of BibleTime
 ------------------------
-	1. Locate where your RPM base directory is. On SuSE this is
+    1. Locate where your RPM base directory is. On SuSE this is
 /usr/src/packages. We continue with this dir.
-	
-	2. "cp bibletime-1.5.tar.bz2 /usr/src/packages/SOURCES/"
-	
-	3. "cp bibletime/bibletime.spec /usr/src/packages/SPECS/"
-	
-	4. "cd /usr/src/packages/"
-	
-	5. "rpm -ba SPECS/bibletime.spec". If this works you're on the good
+
+    2. "cp bibletime-1.5.tar.bz2 /usr/src/packages/SOURCES/"
+
+    3. "cp bibletime/bibletime.spec /usr/src/packages/SPECS/"
+
+    4. "cd /usr/src/packages/"
+
+    5. "rpm -ba SPECS/bibletime.spec". If this works you're on the good
 side, otherwise it's not so good ;) Before you exec the rpm command make
 sure you have a standard configuration, for example special graphic card
 drivers will lead to wrong dependencies (e.g. NVidia drivers). Deinstall
 them first if there are some, then build and then reinstall them.
-	Also make sure you installed the x11-devel, qt3-devel and kdelibs-devel packages.
-	
-	6. Test the binary RPM. The binary package is normally located in
+    Also make sure you installed the x11-devel, qt3-devel and kdelibs-devel packages.
+
+    6. Test the binary RPM. The binary package is normally located in
 /usr/src/packages/RPMS/<arch>/, source RPMs are in /usr/src/packages/SRPMS/.
 Often <arch> is "i586". Try to install the binary package by "rpm -U
 bibletime-1.5-1.rpm" and check dependencies by executing "rpm -q --requires
 bibletime".
-	
-	7. Rename the RPM to have the right name, including the distribution
+
+    7. Rename the RPM to have the right name, including the distribution
 it was built on, e.g. "bibletime-1.5-1.i586.rpm" should be renamed to
 "bibletime-1.5-suse9.2-1.i586.rpm" so users know what distribution this package was built for.
-	
-	8. Release the binary and source package. The source package should
+
+    8. Release the binary and source package. The source package should
 have it's original name because it's distribution independant.
diff --git a/docs/development/trinitarian.formula.sh b/docs/development/trinitarian.formula.sh
new file mode 100755
index 0000000..8128d65
--- /dev/null
+++ b/docs/development/trinitarian.formula.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+#########
+#
+# In the name of the Father, and of the Son, and of the Holy Spirit.
+#
+# This file is part of BibleTime'\''s source code, http://www.bibletime.info/.
+#
+# Copyright 1999-2014 by the BibleTime developers.
+# The BibleTime source code is licensed under the GNU General Public License version 2.0.
+#
+##########
+if man -Pcat sed | grep -q .-in-place ; then
+	d=src
+	while [ ! -d "$d" ]; do
+		echo "$d"
+		if [ $(echo "$d" | wc -c) -gt 9 ] ; then
+			echo 'Having difficulty finding your src directory.'
+			exit
+		fi
+		d="../$d"
+	done
+	echo "$d"
+	find "$d" -type f -iname '*.h' | while read h ; do
+		if grep -qi copyright $h ; then
+			sed --in-place --regexp-extended '{
+			N
+			N
+			N
+			N
+			s_(/\*+\n\*\s*\n)(\*\s+[abefhilmopr-tBT\ ]+.[b-fhil-pr-uw,:/\ \.]+\n\*\s*\n\*\s+Copyright)_\1* In the name of the Father, and of the Son, and of the Holy Spirit.\n*\n\2_
+			}' $h
+		else
+			echo '/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime'\''s source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/' > "$h.withcc"
+			cat "$h" >> "$h.withcc"
+			mv "$h.withcc" "$h"
+		fi
+	done
+else
+	echo 'You do not appear to have a version of sed appropriate for this script.'
+fi
+
diff --git a/docs/handbook/ar/docbook/index.docbook b/docs/handbook/ar/docbook/index.docbook
index 46280ac..10b9719 100644
--- a/docs/handbook/ar/docbook/index.docbook
+++ b/docs/handbook/ar/docbook/index.docbook
@@ -42,23 +42,24 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder>
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder>
 </copyright>
 
   <legalnotice>
     <para>يوزع دليل إستخدام بيبل تايم مع برنامج دراسة الكتاب المقدس بيبل تايم.</para>
   </legalnotice>
 
-  <date>January 2012</date>
+  <date>January 2014</date>
 
-  <releaseinfo>2.9.2</releaseinfo>
+  <releaseinfo>2.10.1</releaseinfo>
 
   <abstract>
-    <para>بيبل تايم هو برنامج مجاني تماماً لدراسة الكتاب المقدس. واجهة البرنامج مبنية
-بإطار عمل كيوت، والذي يتيح للبرنامج العمل على عدة أنظمة تشغيل تتضمن لينكس،
-ويندوز، �ري بي إس دي و ماك أو إس إكس. البرنامج يستخدم مكتبة برمجة سورد ليعمل
-مجاناً مع أكثر من 200 ترجمة للكتاب المقدس، ت�اسير، قواميس وكتب مقدمة من
-جمعية الكتاب المقدس كروس وير.</para>
+    <para>&bibletime; is a completely free Bible study program. The program's user
+interface is built with &qt; framework, which makes it run on several
+operating systems including Linux, Windows, FreeBSD and Mac OS X. The
+software uses the &sword; programming library to work with over 200 free
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the &cbs;.</para>
   </abstract>
 
   <keywordset>
diff --git a/docs/handbook/ar/html/index.html b/docs/handbook/ar/html/index.html
index 0cf4b87..ee78341 100644
--- a/docs/handbook/ar/html/index.html
+++ b/docs/handbook/ar/html/index.html
@@ -1,8 +1,9 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>&#1583;&#1604;&#1610;&#1604; &#1573;&#1587;&#1578;&#1582;&#1583;&#1575;&#1605; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="&#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605; &#1607;&#1608; &#1576;&#1585;&#1606;&#1575;&#1605;&#1580; &#1605;&#1580;&#1575;&#1606;&#1610; &#1578;&#1605;&#1575;&#1605;&#1575;&#1611; &#1604;&#1583;&#1585;&#1575;&#1587;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;. &#1608;&#1575;&#1580;&#1607;&#1577; &#1575;&#1604;&#1576;&#1585;&#1606;&#1575;&#1605;&#1580; &#1605;&#1576;&#1606;&#1610;&#1577; &#1576;&#1573;&#1591;&#1575;&#1585; &#1593;&#1605;&#1604; &#1603;&#1610;&#1608;&#1578;&#1548; &#1608;&#1575;&#1604;&#1584;&#1610; &#1610;&#1578;&#1610;&#1581; &#1604;&#1604;&#1576;&#1585;&#1606;&#1575;&#1605;&#1580; &#1575;&#1604;&#1593;&#1605;&#1604; &#1593;&#1604;&#1609; &#1593;&#1583;&#1577; &#1571;&#1606;&#1592;&#1605;&#1577; &#1578;&#1588;&#1594;&#1610;&#1604; &#1578;&#1578;&#1590;&#1605;&#1606; &#1604;&#1610;&#1606;&#1603;&#1587;&#1548; &#1608;&#1610;&#1606;&#1583;&#1608;&#1586;&#1548; &#1601;&#1585;&#1610; &#1576;&#1610; &#1573;&#1587; &#1583;&#1610; &#1608; &#1605;&#1575;&#1603; &#1571;&#1608; &#1573;&#1587; &#1573;&#1603;&#1587;. &#1575;&#1604;&#1576;&#1585;&#1606;&#1575;&#1605;&#1580; &#1610;&#1587;&#1578;&#1582;&#1583;&#1605; &#1605;&#1603;&#1578;&#1576;&#1577; &#1576;&#1585;&#1605;&#1580;&#1577; &#1587;&#1608;&#1585;&#1583; &#1604;&#1610;&#1593;&#1605;&#1604; &#1605;&#1580;&#1575;&#1606;&#1575;&#1611; &#1605;&#1593; &#1571;&#1603;&#1579;&#1585; &#1605;&#1606; 200 &#1578;&#1585;&#1580;&#1605;&#1577; &#1604;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;&#1548; &#1578;&#1601;&#1575;&#1587;&#1610;&#1585;&#1548; &#1602;&#1608;&#1575;&#1605;&#1610;&#1587; &#1608;&#1603;&#1578;&#1576; &#1605;&#1602;&#1583;&#1605;&#1577; &#1605;&#1606; &#1580;&#1605;&#1593;&#1610;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587; &#1603;&#1585;&#1608;&#1587; &#1608;&#1610;&#1585;."><meta name="keywords" content="&#1603;&#1610;&#1608;&#1578; 4, &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;, &#1587;&#1608;&#1585;&#1583;, &#1603;&#1585;&#1608;&#1587; &#1608;&#1610;&#1585;, &#1606;&#1575;&#1601;&#1584;&#1577; &#1575;&#1604;&#1605;&#1587;&#1575;&#1593;&#1583;&#1577;"><link rel="home" href="index.html" title="&#1583;&#1604;&#1610;&#1604; &#1573;&#1587;&#1578;&#1582;&#1583;&#1575;&#1605; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;"><link rel="next" href="hdbk-intro.html" title="&#1601;&#1589;&#1604; 1. &#1605;&#1602;&#1583;&#1605;&#1577;"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF" dir="rtl"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">&#1583;&#1604;&#1610;&#1604; &#1573;&#1587;&#1578;&#1582;&#1583;&#1575;&#1605; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</th></tr><tr><td width="20%" align="right"> </td><th width="60%" align="center"> </th><td width="20%" align="left"> <a accesskey="n" href="hdbk-intro.html">&#1575;&#1604;&#1578;&#1575;&#1604;&#1610;</a></td></tr></table><hr></div><div class="book" title="&#1583;&#1604;&#1610;&#1604; &#1573;&#1587;&#1578;&#1582;&#1583;&#1575;&#1605; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467296"></a>&#1583;&#1604;&#1610;&#1604; &#1573;&#1587;&#1578;&#1582;&#1583;&#1575;&#1605; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.9.2</p></div><div><p class="copyright">&#1581;&#1602;&#1608;&#1602; &#1575;&#1604;&#1606;&#1588;&#1585; © 1999-2013 The <span class="application">&#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</span> Team</p></div><div><div class="legalnotice" title="&#1605;&#1604;&#1575;&#1581;&#1592;&#1577; &#1602;&#1575;&#1606;&#1608;&#1606;&#1610;&#1577;"><a name="idp26712032"></a><p>&#1610;&#1608;&#1586;&#1593; &#1583;&#1604;&#1610;&#1604; &#1573;&#1587;&#1578;&#1582;&#1583;&#1575;&#1605; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605; &#1605;&#1593; &#1576;&#1585;&#1606;&#1575;&#1605;&#1580; &#1583;&#1585;&#1575;&#1587;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;.</p></div></div><div><div class="abstract" title="&#1582;&#1604;&#1575;&#1589;&#1577;"><p class="title"><b>&#1582;&#1604;&#1575;&#1589;&#1577;</b></p><p>&#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605; &#1607;&#1608; &#1576;&#1585;&#1606;&#1575;&#1605;&#1580; &#1605;&#1580;&#1575;&#1606;&#1610; &#1578;&#1605;&#1575;&#1605;&#1575;&#1611; &#1604;&#1583;&#1585;&#1575;&#1587;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;. &#1608;&#1575;&#1580;&#1607;&#1577; &#1575;&#1604;&#1576;&#1585;&#1606;&#1575;&#1605;&#1580; &#1605;&#1576;&#1606;&#1610;&#1577;
-&#1576;&#1573;&#1591;&#1575;&#1585; &#1593;&#1605;&#1604; &#1603;&#1610;&#1608;&#1578;&#1548; &#1608;&#1575;&#1604;&#1584;&#1610; &#1610;&#1578;&#1610;&#1581; &#1604;&#1604;&#1576;&#1585;&#1606;&#1575;&#1605;&#1580; &#1575;&#1604;&#1593;&#1605;&#1604; &#1593;&#1604;&#1609; &#1593;&#1583;&#1577; &#1571;&#1606;&#1592;&#1605;&#1577; &#1578;&#1588;&#1594;&#1610;&#1604; &#1578;&#1578;&#1590;&#1605;&#1606; &#1604;&#1610;&#1606;&#1603;&#1587;&#1548;
-&#1608;&#1610;&#1606;&#1583;&#1608;&#1586;&#1548; &#1601;&#1585;&#1610; &#1576;&#1610; &#1573;&#1587; &#1583;&#1610; &#1608; &#1605;&#1575;&#1603; &#1571;&#1608; &#1573;&#1587; &#1573;&#1603;&#1587;. &#1575;&#1604;&#1576;&#1585;&#1606;&#1575;&#1605;&#1580; &#1610;&#1587;&#1578;&#1582;&#1583;&#1605; &#1605;&#1603;&#1578;&#1576;&#1577; &#1576;&#1585;&#1605;&#1580;&#1577; &#1587;&#1608;&#1585;&#1583; &#1604;&#1610;&#1593;&#1605;&#1604;
-&#1605;&#1580;&#1575;&#1606;&#1575;&#1611; &#1605;&#1593; &#1571;&#1603;&#1579;&#1585; &#1605;&#1606; 200 &#1578;&#1585;&#1580;&#1605;&#1577; &#1604;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;&#1548; &#1578;&#1601;&#1575;&#1587;&#1610;&#1585;&#1548; &#1602;&#1608;&#1575;&#1605;&#1610;&#1587; &#1608;&#1603;&#1578;&#1576; &#1605;&#1602;&#1583;&#1605;&#1577; &#1605;&#1606;
-&#1580;&#1605;&#1593;&#1610;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587; &#1603;&#1585;&#1608;&#1587; &#1608;&#1610;&#1585;.</p></div></div></div><hr></div><div class="toc"><p><b>&#1602;&#1575;&#1574;&#1605;&#1577; &#1575;&#1604;&#1605;&#1581;&#1578;&#1608;&#1610;&#1575;&#1578;</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. &#1605;&#1602;&#1583;&#1605;&#1577;</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">&#1593;&#1606; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">&#1575;&#1604;&#1603;&#1578;&#1576; &#1575;&#1604;&#1605;&#1578;&#1575;&#1581;&#1577;</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">&#1575;&#1604;&#1583;&#1575;&#1601;&#1593;</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. &#1578;&#1588;&#1594;&#1610;&#1604; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">&#1603;&#1610;&#1601;&#1610;&#1577; &#1578;&#1588;&#1594;&#1610;&#1604; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting">&#1578;&#1588;&#1594;&#1610;&#1604; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">&#1578;&#1582;&#1589;&#1610;&#1589; &#1576;&#1583;&#1575;&#1610;&#1577; &#1575;&#1604;&#1576;&#1585;&#1606;&#1575;&#1605;&#1580;</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">&#1578;&#1588;&#1594;&#1610;&#1604; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605; &#1604;&#1604;&#1605;&#1585;&#1577; &#1575;&#1604;&#1571;&#1608;&#1604;&#1609;</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. &#1578;&#1588;&#1594;&#1610;&#1604; &#1575;&#1604;&#1576;&#1585;&#1606;&#1575;&#1605;&#1580;</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">&#1606;&#1592;&#1585;&#1577; &#1593;&#1575;&#1605;&#1577; &#1593;&#1604;&#1609; &#1575;&#1604;&#1576;&#1585;&#1606;&#1575;&#1605;&#1580;</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">&#1571;&#1580;&#1586;&#1575;&#1569; &#1605;&#1606; &#1606;&#1575;&#1601;&#1584;&#1577; &#1578;&#1591;&#1576;&#1610;&#1602; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">&#1585;&#1601; &#1575;&#1604;&#1603;&#1578;&#1576;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">&#1575;&#1604;&#1605;&#1603;&#1576;&#1585; (&#1575;&#1604;&#1593;&#1583;&#1587;&#1577; &#1575;&#1604;&#1605;&#1603;&#1576;&#1585;&#1577;)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">&#1575;&#1604;&#1605;&#1603;&#1578;&#1576;</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">&#1575;&#1604;&#1576;&#1581;&#1579; &#1601;&#1610; &#1575;&#1604;&#1603;&#1578;&#1576;</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">&#1576;&#1581;&#1579; &#1575;&#1604;&#1606;&#1589; &#1601;&#1610; &#1606;&#1575;&#1601;&#1584;&#1577; &#1602;&#1585;&#1575;&#1569;&#1577; &#1605;&#1601;&#1578;&#1608;&#1581;&#1577;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">&#1575;&#1604;&#1608;&#1589;&#1608;&#1604; &#1604;&#1606;&#1575;&#1601;&#1584;&#1577; &#1575;&#1604;&#1576;&#1581;&#1579;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">&#1590;&#1576;&#1591; &#1573;&#1593;&#1583;&#1575;&#1583;&#1575;&#1578; &#1575;&#1604;&#1576;&#1581;&#1579;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">&#1606;&#1578;&#1575;&#1574;&#1580; &#1575;&#1604;&#1576;&#1581;&#1579;</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html"><span class="guimenuitem">&#1605;&#1583;&#1610;&#1585; &#1585;&#1601; &#1575;&#1604;&#1603;&#1578;&#1576; </span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">&#1573;&#1593;&#1583;&#1575;&#1583; &#1605;&#1587;&#1575;&#1585;&#1575;&#1578; &#1585;&#1601; &#1575;&#1604;&#1603;&#1578;&#1576;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">&#1578;&#1579;&#1576;&#1610;&#1578;/&#1578;&#1581;&#1583;&#1610;&#1579; &#1575;&#1604;&#1603;&#1578;&#1576;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">&#1581;&#1584;&#1601; &#1575;&#1604;&#1603;&#1578;&#1576;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">&#1601;&#1607;&#1575;&#1585;&#1587; &#1575;&#1604;&#1576;&#1581;&#1579;</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">&#1575;&#1604;&#1578;&#1589;&#1583;&#1610;&#1585; &#1608; &#1575;&#1604;&#1591;&#1576;&#1575;&#1593;&#1577;</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. &#1590;&#1576;&#1591; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">&#1606;&#1575;&#1601;&#1584;&#1577; &#1590;&#1576;&#1591; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605; </a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>&#1583;&#1604;&#1610;&#1604; &#1573;&#1587;&#1578;&#1582;&#1583;&#1575;&#1605; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="&#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605; is a completely free Bible study program. The program's user interface is built with &#1603;&#1610;&#1608;&#1578; framework, which makes it run on several operating systems including Linux, Windows, FreeBSD and Mac OS X. The software uses the &#1587;&#1608;&#1585;&#1583; programming library to work with over 200 free Bible texts, commentaries, dictionaries and books in over 50 languages provided by the &#1580;&#1605;&#1593;&#1610;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587; &#1603;&#1585;&#1608;&#1587; &#1608;&#1610;&#1585; ."><meta name="keywords" content="&#1603;&#1610;&#1608;&#1578; 4, &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;, &#1587;&#1608;&#1585;&#1583;, &#1603;&#1585;&#1608;&#1587; &#1608;&#1610;&#1585;, &#1606;&#1575;&#1601;&#1584;&#1577; &#1575;&#1604;&#1605;&#1587;&#1575;&#1593;&#1583;&#1577;"><link rel="home" href="index.html" title="&#1583;&#1604;&#1610;&#1604; &#1573;&#1587;&#1578;&#1582;&#1583;&#1575;&#1605; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;"><link rel="next" href="hdbk-intro.html" title="&#1601;&#1589;&#1604; 1. &#1605;&#1602;&#1583;&#1605;&#1577;"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF" dir="rtl"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">&#1583;&#1604;&#1610;&#1604; &#1573;&#1587;&#1578;&#1582;&#1583;&#1575;&#1605; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</th></tr><tr><td width="20%" align="right"> </td><th width="60%" align="center"> </th><td width="20%" align="left"> <a accesskey="n" href="hdbk-intro.html">&#1575;&#1604;&#1578;&#1575;&#1604;&#1610;</a></td></tr></table><hr></div><div class="book" title="&#1583;&#1604;&#1610;&#1604; &#1573;&#1587;&#1578;&#1582;&#1583;&#1575;&#1605; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;"><div class="titlepage"><div><div><h1 class="title"><a name="idp28247820"></a>&#1583;&#1604;&#1610;&#1604; &#1573;&#1587;&#1578;&#1582;&#1583;&#1575;&#1605; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.10.1</p></div><div><p class="copyright">&#1581;&#1602;&#1608;&#1602; &#1575;&#1604;&#1606;&#1588;&#1585; © 1999-2014 The <span class="application">&#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</span> Team</p></div><div><div class="legalnotice" title="&#1605;&#1604;&#1575;&#1581;&#1592;&#1577; &#1602;&#1575;&#1606;&#1608;&#1606;&#1610;&#1577;"><a name="idp29314572"></a><p>&#1610;&#1608;&#1586;&#1593; &#1583;&#1604;&#1610;&#1604; &#1573;&#1587;&#1578;&#1582;&#1583;&#1575;&#1605; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605; &#1605;&#1593; &#1576;&#1585;&#1606;&#1575;&#1605;&#1580; &#1583;&#1585;&#1575;&#1587;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;.</p></div></div><div><div class="abstract" title="&#1582;&#1604;&#1575;&#1589;&#1577;"><p class="title"><b>&#1582;&#1604;&#1575;&#1589;&#1577;</b></p><p><span class="application">&#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</span> is a completely free Bible study program. The program's user
+interface is built with <span class="application">&#1603;&#1610;&#1608;&#1578;</span> framework, which makes it run on several
+operating systems including Linux, Windows, FreeBSD and Mac OS X. The
+software uses the <span class="application">&#1587;&#1608;&#1585;&#1583;</span> programming library to work with over 200 free
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the <span class="application">&#1580;&#1605;&#1593;&#1610;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587; &#1603;&#1585;&#1608;&#1587; &#1608;&#1610;&#1585; </span>.</p></div></div></div><hr></div><div class="toc"><p><b>&#1602;&#1575;&#1574;&#1605;&#1577; &#1575;&#1604;&#1605;&#1581;&#1578;&#1608;&#1610;&#1575;&#1578;</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. &#1605;&#1602;&#1583;&#1605;&#1577;</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">&#1593;&#1606; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">&#1575;&#1604;&#1603;&#1578;&#1576; &#1575;&#1604;&#1605;&#1578;&#1575;&#1581;&#1577;</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">&#1575;&#1604;&#1583;&#1575;&#1601;&#1593;</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. &#1578;&#1588;&#1594;&#1610;&#1604; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">&#1603;&#1610;&#1601;&#1610;&#1577; &#1578;&#1588;&#1594;&#1610;&#1604; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting">&#1578;&#1588;&#1594;&#1610;&#1604; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">&#1578;&#1582;&#1589;&#1610;&#1589; &#1576;&#1583;&#1575;&#1610;&#1577; &#1575;&#1604;&#1576;&#1585;&#1606;&#1575;&#1605;&#1580;</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">&#1578;&#1588;&#1594;&#1610;&#1604; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605; &#1604;&#1604;&#1605;&#1585;&#1577; &#1575;&#1604;&#1571;&#1608;&#1604;&#1609;</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. &#1578;&#1588;&#1594;&#1610;&#1604; &#1575;&#1604;&#1576;&#1585;&#1606;&#1575;&#1605;&#1580;</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">&#1606;&#1592;&#1585;&#1577; &#1593;&#1575;&#1605;&#1577; &#1593;&#1604;&#1609; &#1575;&#1604;&#1576;&#1585;&#1606;&#1575;&#1605;&#1580;</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">&#1571;&#1580;&#1586;&#1575;&#1569; &#1605;&#1606; &#1606;&#1575;&#1601;&#1584;&#1577; &#1578;&#1591;&#1576;&#1610;&#1602; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">&#1585;&#1601; &#1575;&#1604;&#1603;&#1578;&#1576;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">&#1575;&#1604;&#1605;&#1603;&#1576;&#1585; (&#1575;&#1604;&#1593;&#1583;&#1587;&#1577; &#1575;&#1604;&#1605;&#1603;&#1576;&#1585;&#1577;)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">&#1575;&#1604;&#1605;&#1603;&#1578;&#1576;</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">&#1575;&#1604;&#1576;&#1581;&#1579; &#1601;&#1610; &#1575;&#1604;&#1603;&#1578;&#1576;</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">&#1576;&#1581;&#1579; &#1575;&#1604;&#1606;&#1589; &#1601;&#1610; &#1606;&#1575;&#1601;&#1584;&#1577; &#1602;&#1585;&#1575;&#1569;&#1577; &#1605;&#1601;&#1578;&#1608;&#1581;&#1577;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">&#1575;&#1604;&#1608;&#1589;&#1608;&#1604; &#1604;&#1606;&#1575;&#1601;&#1584;&#1577; &#1575;&#1604;&#1576;&#1581;&#1579;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">&#1590;&#1576;&#1591; &#1573;&#1593;&#1583;&#1575;&#1583;&#1575;&#1578; &#1575;&#1604;&#1576;&#1581;&#1579;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">&#1606;&#1578;&#1575;&#1574;&#1580; &#1575;&#1604;&#1576;&#1581;&#1579;</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html"><span class="guimenuitem">&#1605;&#1583;&#1610;&#1585; &#1585;&#1601; &#1575;&#1604;&#1603;&#1578;&#1576; </span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">&#1573;&#1593;&#1583;&#1575;&#1583; &#1605;&#1587;&#1575;&#1585;&#1575;&#1578; &#1585;&#1601; &#1575;&#1604;&#1603;&#1578;&#1576;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">&#1578;&#1579;&#1576;&#1610;&#1578;/&#1578;&#1581;&#1583;&#1610;&#1579; &#1575;&#1604;&#1603;&#1578;&#1576;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">&#1581;&#1584;&#1601; &#1575;&#1604;&#1603;&#1578;&#1576;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">&#1601;&#1607;&#1575;&#1585;&#1587; &#1575;&#1604;&#1576;&#1581;&#1579;</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">&#1575;&#1604;&#1578;&#1589;&#1583;&#1610;&#1585; &#1608; &#1575;&#1604;&#1591;&#1576;&#1575;&#1593;&#1577;</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. &#1590;&#1576;&#1591; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">&#1606;&#1575;&#1601;&#1584;&#1577; &#1590;&#1576;&#1591; &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605; </a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
         <span class="guimenu">&#1593;&#1585;&#1590;</span>
       </a></span></dt><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-desk">
         <span class="guimenu">&#1575;&#1604;&#1605;&#1603;&#1578;&#1576;</span>
diff --git a/docs/handbook/cs/docbook/index.docbook b/docs/handbook/cs/docbook/index.docbook
index 529e296..eb7c85f 100644
--- a/docs/handbook/cs/docbook/index.docbook
+++ b/docs/handbook/cs/docbook/index.docbook
@@ -42,23 +42,24 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder>
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder>
 </copyright>
 
   <legalnotice>
     <para>The &bibletime; Handbook is distributed with the &bibletime; study program.</para>
   </legalnotice>
 
-  <date>January 2012</date>
+  <date>January 2014</date>
 
-  <releaseinfo>2.9.2</releaseinfo>
+  <releaseinfo>2.10.1</releaseinfo>
 
   <abstract>
     <para>&bibletime; is a completely free Bible study program. The program's user
 interface is built with &qt; framework, which makes it run on several
 operating systems including Linux, Windows, FreeBSD and Mac OS X. The
 software uses the &sword; programming library to work with over 200 free
-Bible texts, commentaries, dictionaries and books provided by the &cbs;.</para>
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the &cbs;.</para>
   </abstract>
 
   <keywordset>
diff --git a/docs/handbook/cs/html/index.html b/docs/handbook/cs/html/index.html
index c8c7770..6526969 100644
--- a/docs/handbook/cs/html/index.html
+++ b/docs/handbook/cs/html/index.html
@@ -1,8 +1,9 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>P&#345;íru&#269;ka BibleTime</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime is a completely free Bible study program. The program's user interface is built with Qt framework, which makes it run on several operating systems including Linux, Windows, FreeBSD and Mac OS X. The software uses the SWORD programming library to work with over 200 free Bible texts, commentaries, dictionaries and books provided by the Crosswire Bible Society."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Help dialog"><link rel="home" href="index.html" title="P&#345;íru&#269;ka BibleTime"><link rel="next" href="hdbk-intro.html" title="Kapitola 1. Úvod"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">P&#345;íru&#269;ka <span class="application">BibleTime</span></th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Dal&#353;í</a></td></tr></table><hr></div><div class="book" title="P&#345;íru&#269;ka BibleTime"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467424"></a>P&#345;íru&#269;ka <span class="application">BibleTime</span></h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.9.2</p></div><div><p class="copyright">Copyright © 1999-2013 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Právní dolo&#382;ka"><a name="idp26708192"></a><p>The <span class="application">BibleTime</span> Handbook is distributed with the <span class="application">BibleTime</span> study program.</p></div></div><div><div class="abstract" title="Abstrakt"><p class="title"><b>Abstrakt</b></p><p><span class="application">BibleTime</span> is a completely free Bible study program. The program's user
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>P&#345;íru&#269;ka BibleTime</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime is a completely free Bible study program. The program's user interface is built with Qt framework, which makes it run on several operating systems including Linux, Windows, FreeBSD and Mac OS X. The software uses the SWORD programming library to work with over 200 free Bible texts, commentaries, dictionaries and books in over 50 languages provided by the Crosswire Bible Society."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Help dialog"><link rel="home" href="index.html" title="P&#345;íru&#269;ka BibleTime"><link rel="next" href="hdbk-intro.html" title="Kapitola 1. Úvod"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">P&#345;íru&#269;ka <span class="application">BibleTime</span></th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Dal&#353;í</a></td></tr></table><hr></div><div class="book" title="P&#345;íru&#269;ka BibleTime"><div class="titlepage"><div><div><h1 class="title"><a name="idp28252108"></a>P&#345;íru&#269;ka <span class="application">BibleTime</span></h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.10.1</p></div><div><p class="copyright">Copyright © 1999-2014 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Právní dolo&#382;ka"><a name="idp29314828"></a><p>The <span class="application">BibleTime</span> Handbook is distributed with the <span class="application">BibleTime</span> study program.</p></div></div><div><div class="abstract" title="Abstrakt"><p class="title"><b>Abstrakt</b></p><p><span class="application">BibleTime</span> is a completely free Bible study program. The program's user
 interface is built with <span class="application">Qt</span> framework, which makes it run on several
 operating systems including Linux, Windows, FreeBSD and Mac OS X. The
 software uses the <span class="application">SWORD</span> programming library to work with over 200 free
-Bible texts, commentaries, dictionaries and books provided by the <span class="application">Crosswire Bible Society</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Obsah</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Úvod</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">O <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Dostupná díla</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivace</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. Spu&#353;t&#283;ní <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Jak spustit <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting">Spu&#353;t&#283;ní <span class="application">BibleTime</span></a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Nastavení spu&#353;t&#283;ní</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Starting <span class="application">BibleTime</span> for the first time</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Operace programu</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Náhled programu</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">&#268;ásti okna aplikace <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">Knihovna</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">&#268;asopis</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">Plocha</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Vyhledávání v dílech</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Vyhledávání textu v aktivním okn&#283;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">P&#345;ístup k dialogu vyhledávání</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Nastavení vyhledávání</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Výsledky hledání</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html"><span class="guimenuitem">Správa knih</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Nastavení cesty ke knihám</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Instalace/aktualizace d&#283;l</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Odebrání d&#283;l</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Vyhledávací indexy</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Export a tisk</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. Nastavení <span class="application">BibleTime</span> </a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Dialog Nastavení <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the <span class="application">Crosswire Bible Society</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Obsah</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Úvod</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">O <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Dostupná díla</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivace</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. Spu&#353;t&#283;ní <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Jak spustit <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting">Spu&#353;t&#283;ní <span class="application">BibleTime</span></a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Nastavení spu&#353;t&#283;ní</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Starting <span class="application">BibleTime</span> for the first time</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Operace programu</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Náhled programu</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">&#268;ásti okna aplikace <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">Knihovna</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">&#268;asopis</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">Plocha</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Vyhledávání v dílech</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Vyhledávání textu v aktivním okn&#283;</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">P&#345;ístup k dialogu vyhledávání</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Nastavení vyhledávání</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Výsledky hledání</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html"><span class="guimenuitem">Správa knih</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Nastavení cesty ke knihám</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Instalace/aktualizace d&#283;l</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Odebrání d&#283;l</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Vyhledávací indexy</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Export a tisk</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. Nastavení <span class="application">BibleTime</span> </a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Dialog Nastavení <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
         <span class="guimenu">Display</span>
       </a></span></dt><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-desk">
         <span class="guimenu">Desk</span>
diff --git a/docs/handbook/cs/pdf/handbook.pdf b/docs/handbook/cs/pdf/handbook.pdf
index 617c8e4..59d4bc6 100644
--- a/docs/handbook/cs/pdf/handbook.pdf
+++ b/docs/handbook/cs/pdf/handbook.pdf
diff --git a/docs/handbook/de/docbook/index.docbook b/docs/handbook/de/docbook/index.docbook
index 4a8d93e..4a02d62 100644
--- a/docs/handbook/de/docbook/index.docbook
+++ b/docs/handbook/de/docbook/index.docbook
@@ -42,7 +42,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder>
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder>
 </copyright>
 
   <legalnotice>
@@ -50,17 +50,17 @@
 ausgeliefert.</para>
   </legalnotice>
 
-  <date>Januar 2012</date>
+  <date>January 2014</date>
 
-  <releaseinfo>2.9.2</releaseinfo>
+  <releaseinfo>2.10.1</releaseinfo>
 
   <abstract>
-    <para>&bibletime; ist ein absolut freies Bibelarbeits-Programm. Seine
-Benutzeroberfläche ist mit dem &qt;-Rahmenwerk erstellt, das es auf mehreren
-Betriebssystemen lauffähig macht, darunter Linux, Windows, FreeBSD und Mac
-OS X. Die Software nutzt die &sword;-Programmierbibliothek, um mit über 200
-freien Bibeltexten, Kommentaren, Wörterbüchern und Büchern zu laufen, die
-von der &cbs; zur Verfügung gestellt werden.</para>
+    <para>&bibletime; is a completely free Bible study program. The program's user
+interface is built with &qt; framework, which makes it run on several
+operating systems including Linux, Windows, FreeBSD and Mac OS X. The
+software uses the &sword; programming library to work with over 200 free
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the &cbs;.</para>
   </abstract>
 
   <keywordset>
diff --git a/docs/handbook/de/html/index.html b/docs/handbook/de/html/index.html
index f4fb464..7f2ca11 100644
--- a/docs/handbook/de/html/index.html
+++ b/docs/handbook/de/html/index.html
@@ -1,10 +1,10 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Das BibleTime-Handbuch</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime ist ein absolut freies Bibelarbeits-Programm. Seine Benutzeroberfläche ist mit dem Qt-Rahmenwerk erstellt, das es auf mehreren Betriebssystemen lauffähig macht, darunter Linux, Windows, FreeBSD und Mac OS X. Die Software nutzt die SWORD-Programmierbibliothek, um mit über 200 freien Bibeltexten, Kommentaren, Wörterbüchern und Büchern zu laufen, die von der Crosswire Bible Society zur Verfügung gestellt werden."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Hilfe-Dialog"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="next" href="hdbk-intro.html" title="Kapitel 1. Einleitung"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Das <span class="application">BibleTime</span>-Handbuch</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Weiter</a></td></tr></table><hr></div><div class="book" title="Das BibleTime-Handbuch"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467424"></a>Das <span class="application">BibleTime</span>-Handbuch</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.9.2</p></div><div><p class="copyright">Copyright © 1999-2013 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Rechtlicher Hinweis"><a name="idp26712352"></a><p>Das <span class="application">BibleTime</span>-Handbuch wird zusammen mit der <span class="application">BibleTime</span>-Studienhilfe
-ausgeliefert.</p></div></div><div><div class="abstract" title="Zusammenfassung"><p class="title"><b>Zusammenfassung</b></p><p><span class="application">BibleTime</span> ist ein absolut freies Bibelarbeits-Programm. Seine
-Benutzeroberfläche ist mit dem <span class="application">Qt</span>-Rahmenwerk erstellt, das es auf mehreren
-Betriebssystemen lauffähig macht, darunter Linux, Windows, FreeBSD und Mac
-OS X. Die Software nutzt die <span class="application">SWORD</span>-Programmierbibliothek, um mit über 200
-freien Bibeltexten, Kommentaren, Wörterbüchern und Büchern zu laufen, die
-von der <span class="application">Crosswire Bible Society</span> zur Verfügung gestellt werden.</p></div></div></div><hr></div><div class="toc"><p><b>Inhaltsverzeichnis</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Einleitung</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">Über <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Vorhandene Werke</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivation</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2.  <span class="application">BibleTime</span> starten</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Wie <span class="application">BibleTime</span> zu starten ist</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting"> <span class="application">BibleTime</span> starten</a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Konfiguration des Startverhaltens</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html"><span class="application">BibleTime</span> erstmalig starten</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Programmbedienung</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Programmüberblick</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">Elemente des <span class="application">BibleTime</span> Fensters</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">Das Bücherregal</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">Die Lupe</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">Die Arbeitsfläche</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">In Werken suchen</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Nach Text in einem geöffneten Lesefenster suchen</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Auf den Suchdialog zugreifen</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Such-Konfiguration</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Suchergebnisse</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">Der <span class="guimenuitem">Bücherregal Verwalter</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Bücherregal-Pfade einrichten</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Werke installieren/updaten</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Werk(e) entfernen</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Suchindizes</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Exortieren und Drucken</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. <span class="application">BibleTime</span> konfigurieren</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Dialog <span class="application">BibleTime</span> konfigurieren</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Das BibleTime-Handbuch</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime is a completely free Bible study program. The program's user interface is built with Qt framework, which makes it run on several operating systems including Linux, Windows, FreeBSD and Mac OS X. The software uses the SWORD programming library to work with over 200 free Bible texts, commentaries, dictionaries and books in over 50 languages provided by the Crosswire Bible Society."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Hilfe-Dialog"><link rel="home" href="index.html" title="Das BibleTime-Handbuch"><link rel="next" href="hdbk-intro.html" title="Kapitel 1. Einleitung"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Das <span class="application">BibleTime</span>-Handbuch</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Weiter</a></td></tr></table><hr></div><div class="book" title="Das BibleTime-Handbuch"><div class="titlepage"><div><div><h1 class="title"><a name="idp28248012"></a>Das <span class="application">BibleTime</span>-Handbuch</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.10.1</p></div><div><p class="copyright">Copyright © 1999-2014 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Rechtlicher Hinweis"><a name="idp29314892"></a><p>Das <span class="application">BibleTime</span>-Handbuch wird zusammen mit der <span class="application">BibleTime</span>-Studienhilfe
+ausgeliefert.</p></div></div><div><div class="abstract" title="Zusammenfassung"><p class="title"><b>Zusammenfassung</b></p><p><span class="application">BibleTime</span> is a completely free Bible study program. The program's user
+interface is built with <span class="application">Qt</span> framework, which makes it run on several
+operating systems including Linux, Windows, FreeBSD and Mac OS X. The
+software uses the <span class="application">SWORD</span> programming library to work with over 200 free
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the <span class="application">Crosswire Bible Society</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Inhaltsverzeichnis</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Einleitung</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">Über <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Vorhandene Werke</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivation</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2.  <span class="application">BibleTime</span> starten</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Wie <span class="application">BibleTime</span> zu starten ist</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting"> <span class="application">BibleTime</span> starten</a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Konfiguration des Startverhaltens</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html"><span class="application">BibleTime</span> erstmalig starten</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Programmbedienung</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Programmüberblick</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">Elemente des <span class="application">BibleTime</span> Fensters</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">Das Bücherregal</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">Die Lupe</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">Die Arbeitsfläche</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">In Werken suchen</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Nach Text in einem geöffneten Lesefenster suchen</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Auf den Suchdialog zugreifen</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Such-Konfiguration</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Suchergebnisse</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">Der <span class="guimenuitem">Bücherregal Verwalter</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Bücherregal-Pfade einrichten</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Werke installieren/updaten</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Werk(e) entfernen</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Suchindizes</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Exortieren und Drucken</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. <span class="application">BibleTime</span> konfigurieren</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Dialog <span class="application">BibleTime</span> konfigurieren</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
         <span class="guimenu">Anzeige</span>
       </a></span></dt><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-desk">
         <span class="guimenu">Arbeitsfläche</span>
diff --git a/docs/handbook/de/pdf/handbook.pdf b/docs/handbook/de/pdf/handbook.pdf
index 0a59f06..985dcea 100644
--- a/docs/handbook/de/pdf/handbook.pdf
+++ b/docs/handbook/de/pdf/handbook.pdf
diff --git a/docs/handbook/en/docbook/index.docbook b/docs/handbook/en/docbook/index.docbook
index f06dc52..67b1c1e 100644
--- a/docs/handbook/en/docbook/index.docbook
+++ b/docs/handbook/en/docbook/index.docbook
@@ -42,7 +42,7 @@
   </authorgroup>
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
   <copyright>
-    <year>1999-2013</year>
+    <year>1999-2014</year>
     <holder>The &bibletime; Team</holder>
   </copyright>
 
@@ -51,9 +51,9 @@
       &bibletime; study program.</para>
   </legalnotice>
 
-  <date>January 2012</date>
+  <date>January 2014</date>
 
-  <releaseinfo>2.9.2</releaseinfo>
+  <releaseinfo>2.10.1</releaseinfo>
 
   <abstract>
     <para>&bibletime; is a completely free Bible study program. The
@@ -61,7 +61,7 @@
       it run on several operating systems including Linux, Windows,
       FreeBSD and Mac OS X. The software uses the &sword; programming
       library to work with over 200 free Bible texts, commentaries,
-      dictionaries and books provided by the &cbs;.</para>
+      dictionaries and books in over 50 languages provided by the &cbs;.</para>
   </abstract>
 
   <keywordset>
diff --git a/docs/handbook/en/html/i_back.png b/docs/handbook/en/html/i_back.png
index 4bcc584..9ad47bf 100644
--- a/docs/handbook/en/html/i_back.png
+++ b/docs/handbook/en/html/i_back.png
diff --git a/docs/handbook/en/html/i_bible.png b/docs/handbook/en/html/i_bible.png
index a5a1b40..ab38153 100644
--- a/docs/handbook/en/html/i_bible.png
+++ b/docs/handbook/en/html/i_bible.png
diff --git a/docs/handbook/en/html/i_bible_add.png b/docs/handbook/en/html/i_bible_add.png
index 0f2f7db..9e4ee86 100644
--- a/docs/handbook/en/html/i_bible_add.png
+++ b/docs/handbook/en/html/i_bible_add.png
diff --git a/docs/handbook/en/html/i_bibletime.png b/docs/handbook/en/html/i_bibletime.png
index 944cbb2..bf192b6 100644
--- a/docs/handbook/en/html/i_bibletime.png
+++ b/docs/handbook/en/html/i_bibletime.png
diff --git a/docs/handbook/en/html/i_book.png b/docs/handbook/en/html/i_book.png
index 793cb17..1ae9920 100644
--- a/docs/handbook/en/html/i_book.png
+++ b/docs/handbook/en/html/i_book.png
diff --git a/docs/handbook/en/html/i_book_add.png b/docs/handbook/en/html/i_book_add.png
index 77b10dc..f4374c9 100644
--- a/docs/handbook/en/html/i_book_add.png
+++ b/docs/handbook/en/html/i_book_add.png
diff --git a/docs/handbook/en/html/i_bookmark.png b/docs/handbook/en/html/i_bookmark.png
index cd1bea8..546aca0 100644
--- a/docs/handbook/en/html/i_bookmark.png
+++ b/docs/handbook/en/html/i_bookmark.png
diff --git a/docs/handbook/en/html/i_books.png b/docs/handbook/en/html/i_books.png
index 4a61d41..8633588 100644
--- a/docs/handbook/en/html/i_books.png
+++ b/docs/handbook/en/html/i_books.png
diff --git a/docs/handbook/en/html/i_cascade.png b/docs/handbook/en/html/i_cascade.png
index ae3a1b1..664e68a 100644
--- a/docs/handbook/en/html/i_cascade.png
+++ b/docs/handbook/en/html/i_cascade.png
diff --git a/docs/handbook/en/html/i_checkbox.png b/docs/handbook/en/html/i_checkbox.png
index 72ad383..034d1c9 100644
--- a/docs/handbook/en/html/i_checkbox.png
+++ b/docs/handbook/en/html/i_checkbox.png
diff --git a/docs/handbook/en/html/i_commentary.png b/docs/handbook/en/html/i_commentary.png
index e6ca28b..673c882 100644
--- a/docs/handbook/en/html/i_commentary.png
+++ b/docs/handbook/en/html/i_commentary.png
diff --git a/docs/handbook/en/html/i_commentary_add.png b/docs/handbook/en/html/i_commentary_add.png
index 33030ad..7ab0d56 100644
--- a/docs/handbook/en/html/i_commentary_add.png
+++ b/docs/handbook/en/html/i_commentary_add.png
diff --git a/docs/handbook/en/html/i_configure.png b/docs/handbook/en/html/i_configure.png
index 48a1267..1d4ccf8 100644
--- a/docs/handbook/en/html/i_configure.png
+++ b/docs/handbook/en/html/i_configure.png
diff --git a/docs/handbook/en/html/i_configuresword.png b/docs/handbook/en/html/i_configuresword.png
index 850bc63..563c107 100644
--- a/docs/handbook/en/html/i_configuresword.png
+++ b/docs/handbook/en/html/i_configuresword.png
diff --git a/docs/handbook/en/html/i_contents2.png b/docs/handbook/en/html/i_contents2.png
index a639120..f0ab6d0 100644
--- a/docs/handbook/en/html/i_contents2.png
+++ b/docs/handbook/en/html/i_contents2.png
diff --git a/docs/handbook/en/html/i_displayconfig.png b/docs/handbook/en/html/i_displayconfig.png
index 7486926..6e404b6 100644
--- a/docs/handbook/en/html/i_displayconfig.png
+++ b/docs/handbook/en/html/i_displayconfig.png
diff --git a/docs/handbook/en/html/i_document_magnifier.png b/docs/handbook/en/html/i_document_magnifier.png
index 2cf2116..ef557c7 100644
--- a/docs/handbook/en/html/i_document_magnifier.png
+++ b/docs/handbook/en/html/i_document_magnifier.png
diff --git a/docs/handbook/en/html/i_exit.png b/docs/handbook/en/html/i_exit.png
index ee8d937..42287fa 100644
--- a/docs/handbook/en/html/i_exit.png
+++ b/docs/handbook/en/html/i_exit.png
diff --git a/docs/handbook/en/html/i_fileclose.png b/docs/handbook/en/html/i_fileclose.png
index 2ecbfb3..b581902 100644
--- a/docs/handbook/en/html/i_fileclose.png
+++ b/docs/handbook/en/html/i_fileclose.png
diff --git a/docs/handbook/en/html/i_find.png b/docs/handbook/en/html/i_find.png
index 38df97a..55ad019 100644
--- a/docs/handbook/en/html/i_find.png
+++ b/docs/handbook/en/html/i_find.png
diff --git a/docs/handbook/en/html/i_forward.png b/docs/handbook/en/html/i_forward.png
index dbaa939..c483281 100644
--- a/docs/handbook/en/html/i_forward.png
+++ b/docs/handbook/en/html/i_forward.png
diff --git a/docs/handbook/en/html/i_lexicon.png b/docs/handbook/en/html/i_lexicon.png
index dfb911a..55ce153 100644
--- a/docs/handbook/en/html/i_lexicon.png
+++ b/docs/handbook/en/html/i_lexicon.png
diff --git a/docs/handbook/en/html/i_lexicon_add.png b/docs/handbook/en/html/i_lexicon_add.png
index 3523e74..7feb268 100644
--- a/docs/handbook/en/html/i_lexicon_add.png
+++ b/docs/handbook/en/html/i_lexicon_add.png
diff --git a/docs/handbook/en/html/i_light_bulb.png b/docs/handbook/en/html/i_light_bulb.png
index cd82d15..bf5c769 100644
--- a/docs/handbook/en/html/i_light_bulb.png
+++ b/docs/handbook/en/html/i_light_bulb.png
diff --git a/docs/handbook/en/html/i_sync.png b/docs/handbook/en/html/i_sync.png
index 734fe4d..e032716 100644
--- a/docs/handbook/en/html/i_sync.png
+++ b/docs/handbook/en/html/i_sync.png
diff --git a/docs/handbook/en/html/i_tile.png b/docs/handbook/en/html/i_tile.png
index b6890eb..375d367 100644
--- a/docs/handbook/en/html/i_tile.png
+++ b/docs/handbook/en/html/i_tile.png
diff --git a/docs/handbook/en/html/i_tile_horiz.png b/docs/handbook/en/html/i_tile_horiz.png
index 4f9845f..2b65027 100644
--- a/docs/handbook/en/html/i_tile_horiz.png
+++ b/docs/handbook/en/html/i_tile_horiz.png
diff --git a/docs/handbook/en/html/i_tile_vert.png b/docs/handbook/en/html/i_tile_vert.png
index 892d57a..3560865 100644
--- a/docs/handbook/en/html/i_tile_vert.png
+++ b/docs/handbook/en/html/i_tile_vert.png
diff --git a/docs/handbook/en/html/i_view_index.png b/docs/handbook/en/html/i_view_index.png
index bb29508..99e5a7d 100644
--- a/docs/handbook/en/html/i_view_index.png
+++ b/docs/handbook/en/html/i_view_index.png
diff --git a/docs/handbook/en/html/i_window_fullscreen.png b/docs/handbook/en/html/i_window_fullscreen.png
index c1aee15..284accb 100644
--- a/docs/handbook/en/html/i_window_fullscreen.png
+++ b/docs/handbook/en/html/i_window_fullscreen.png
diff --git a/docs/handbook/en/html/index.html b/docs/handbook/en/html/index.html
index 287b040..dcd2dcf 100644
--- a/docs/handbook/en/html/index.html
+++ b/docs/handbook/en/html/index.html
@@ -1,10 +1,10 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The BibleTime Handbook</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime is a completely free Bible study program. The program's user interface is built with Qt framework, which makes it run on several operating systems including Linux, Windows, FreeBSD and Mac OS X. The software uses the SWORD programming library to work with over 200 free Bible texts, commentaries, dictionaries and books provided by the Crosswire Bible Society."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Help dialog"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="next" href="hdbk-intro.html" title="Chapter 1. Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The <span class="application">BibleTime</span> Handbook</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Next</a></td></tr></table><hr></div><div class="book" title="The BibleTime Handbook"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467424"></a>The <span class="application">BibleTime</span> Handbook</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.9.2</p></div><div><p class="copyright">Copyright © 1999-2013 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Legal Notice"><a name="idp26712352"></a><p>The <span class="application">BibleTime</span> Handbook is distributed with the
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The BibleTime Handbook</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime is a completely free Bible study program. The program's user interface is built with Qt framework, which makes it run on several operating systems including Linux, Windows, FreeBSD and Mac OS X. The software uses the SWORD programming library to work with over 200 free Bible texts, commentaries, dictionaries and books in over 50 languages provided by the Crosswire Bible Society."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Help dialog"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="next" href="hdbk-intro.html" title="Chapter 1. Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The <span class="application">BibleTime</span> Handbook</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Next</a></td></tr></table><hr></div><div class="book" title="The BibleTime Handbook"><div class="titlepage"><div><div><h1 class="title"><a name="idp28248012"></a>The <span class="application">BibleTime</span> Handbook</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.10.1</p></div><div><p class="copyright">Copyright © 1999-2014 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Legal Notice"><a name="idp29314892"></a><p>The <span class="application">BibleTime</span> Handbook is distributed with the
       <span class="application">BibleTime</span> study program.</p></div></div><div><div class="abstract" title="Abstract"><p class="title"><b>Abstract</b></p><p><span class="application">BibleTime</span> is a completely free Bible study program. The
       program's user interface is built with <span class="application">Qt</span> framework, which makes
       it run on several operating systems including Linux, Windows,
       FreeBSD and Mac OS X. The software uses the <span class="application">SWORD</span> programming
       library to work with over 200 free Bible texts, commentaries,
-      dictionaries and books provided by the <span class="application">Crosswire Bible Society</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Introduction</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">About <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Available works</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivation</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. Starting <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">How to start <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting">Starting <span class="application">BibleTime</span></a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Startup customization</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Starting <span class="application">BibleTime</span> for the first time</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Program operation</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Program overview</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">Parts of the <span class="application">BibleTime</span> application window</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">The Bookshelf</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">The Mag(nifying glass)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">The Desk</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Searching in works</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Searching text in an open read window</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Accessing the search dialog</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Search configuration</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Search results</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">The <span class="guimenuitem">Bookshelf Manager</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Bookshelf path(s) setup</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Install/update work(s)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Remove work(s)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Search Indexes</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Exporting and Printing</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. Configuring <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Configure <span class="application">BibleTime</span>  Dialog</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
+      dictionaries and books in over 50 languages provided by the <span class="application">Crosswire Bible Society</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Introduction</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">About <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Available works</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivation</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. Starting <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">How to start <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting">Starting <span class="application">BibleTime</span></a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Startup customization</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Starting <span class="application">BibleTime</span> for the first time</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Program operation</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Program overview</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">Parts of the <span class="application">BibleTime</span> application window</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">The Bookshelf</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">The Mag(nifying glass)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">The Desk</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Searching in works</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Searching text in an open read window</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Accessing the search dialog</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Search configuration</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Search results</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">The <span class="guimenuitem">Bookshelf Manager</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Bookshelf path(s) setup</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Install/update work(s)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Remove work(s)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Search Indexes</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Exporting and Printing</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. Configuring <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Configure <span class="application">BibleTime</span>  Dialog</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
         <span class="guimenu">Display</span>
       </a></span></dt><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-desk">
         <span class="guimenu">Desk</span>
diff --git a/docs/handbook/en/html/ss_configfonts.png b/docs/handbook/en/html/ss_configfonts.png
index fac7598..df3a834 100644
--- a/docs/handbook/en/html/ss_configfonts.png
+++ b/docs/handbook/en/html/ss_configfonts.png
diff --git a/docs/handbook/en/html/ss_mainterms.png b/docs/handbook/en/html/ss_mainterms.png
index d81d71b..cc4d222 100644
--- a/docs/handbook/en/html/ss_mainterms.png
+++ b/docs/handbook/en/html/ss_mainterms.png
diff --git a/docs/handbook/en/html/ss_searchanal.png b/docs/handbook/en/html/ss_searchanal.png
index 812a392..8812a91 100644
--- a/docs/handbook/en/html/ss_searchanal.png
+++ b/docs/handbook/en/html/ss_searchanal.png
diff --git a/docs/handbook/en/html/ss_searchopts.png b/docs/handbook/en/html/ss_searchopts.png
index df4b01e..264bf75 100644
--- a/docs/handbook/en/html/ss_searchopts.png
+++ b/docs/handbook/en/html/ss_searchopts.png
diff --git a/docs/handbook/en/html/ss_shortcuts.png b/docs/handbook/en/html/ss_shortcuts.png
index 2b9dfa2..489b919 100644
--- a/docs/handbook/en/html/ss_shortcuts.png
+++ b/docs/handbook/en/html/ss_shortcuts.png
diff --git a/docs/handbook/en/pdf/handbook.pdf b/docs/handbook/en/pdf/handbook.pdf
index a9a7e39..ee5a198 100644
--- a/docs/handbook/en/pdf/handbook.pdf
+++ b/docs/handbook/en/pdf/handbook.pdf
diff --git a/docs/handbook/es/docbook/index.docbook b/docs/handbook/es/docbook/index.docbook
index cccc93d..b284908 100644
--- a/docs/handbook/es/docbook/index.docbook
+++ b/docs/handbook/es/docbook/index.docbook
@@ -42,7 +42,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder>
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder>
 </copyright>
 
   <legalnotice>
@@ -50,17 +50,17 @@
 &bibletime;.</para>
   </legalnotice>
 
-  <date>January 2012</date>
+  <date>January 2014</date>
 
-  <releaseinfo>2.9.2</releaseinfo>
+  <releaseinfo>2.10.1</releaseinfo>
 
   <abstract>
-    <para>&bibletime; es un programa de estudio bíblico completamente libre. La
-interfaz del programa está construida con el framework de &qt;, que hace que
-corra en múltiples sistemas operativos incluyendo Linux, Windows, FreeBSD y
-Mac OS X. El software usa la librería de programación de &sword; con más de
-200 textos libres, Biblias, comentarios, diccionarios y libros provistos por
-la &cbs;.</para>
+    <para>&bibletime; is a completely free Bible study program. The program's user
+interface is built with &qt; framework, which makes it run on several
+operating systems including Linux, Windows, FreeBSD and Mac OS X. The
+software uses the &sword; programming library to work with over 200 free
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the &cbs;.</para>
   </abstract>
 
   <keywordset>
diff --git a/docs/handbook/es/html/index.html b/docs/handbook/es/html/index.html
index 888ae4c..047fee0 100644
--- a/docs/handbook/es/html/index.html
+++ b/docs/handbook/es/html/index.html
@@ -1,10 +1,10 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>El Manual BibleTime</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime es un programa de estudio bíblico completamente libre. La interfaz del programa está construida con el framework de Qt, que hace que corra en múltiples sistemas operativos incluyendo Linux, Windows, FreeBSD y Mac OS X. El software usa la librería de programación de SWORD con más de 200 textos libres, Biblias, comentarios, diccionarios y libros provistos por la Sociedad Bíblica Crosswire."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Dialogo de Ayuda"><link rel="home" href="index.html" title="El Manual BibleTime"><link rel="next" href="hdbk-intro.html" title="Capítulo 1. Introducción"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">El Manual <span class="application">BibleTime</span></th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Siguiente</a></td></tr></table><hr></div><div class="book" title="El Manual BibleTime"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467424"></a>El Manual <span class="application">BibleTime</span></h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.9.2</p></div><div><p class="copyright">Copyright © 1999-2013 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Aviso Legal"><a name="idp26712288"></a><p>El Manual de <span class="application">BibleTime</span> es distribuido con el programa de estudio bíblico
-<span class="application">BibleTime</span>.</p></div></div><div><div class="abstract" title="Resumen"><p class="title"><b>Resumen</b></p><p><span class="application">BibleTime</span> es un programa de estudio bíblico completamente libre. La
-interfaz del programa está construida con el framework de <span class="application">Qt</span>, que hace que
-corra en múltiples sistemas operativos incluyendo Linux, Windows, FreeBSD y
-Mac OS X. El software usa la librería de programación de <span class="application">SWORD</span> con más de
-200 textos libres, Biblias, comentarios, diccionarios y libros provistos por
-la <span class="application">Sociedad Bíblica Crosswire</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Tabla de contenidos</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Introducción</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">Acerca de <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Obras disponibles</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivación</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. Iniciar <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Como iniciar <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting">Iniciar <span class="application">BibleTime</span></a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Inicio de personalización</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Iniciando <span class="application">BibleTime</span> por primera vez</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Operación del programa</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Visión general del programa</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">Las partes de la ventana de aplicación <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">La Biblioteca</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">El Lente (Lupa)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">El Escritorio</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Buscando en las obras</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Buscando texto en una ventana abierta de lectura</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Acceso al dialogo de búsqueda</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Configuración de búsqueda</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Resultados de la búsqueda</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">El <span class="guimenuitem">Administrador de biblioteca</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Ruta de instalación de la Biblioteca</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Instalar/actualizar obra(s)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Eliminar obra(s)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Índices de Búsqueda</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Exportando e Imprimiendo</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. Configurando <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Diálogo de Configuración <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>El Manual BibleTime</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime is a completely free Bible study program. The program's user interface is built with Qt framework, which makes it run on several operating systems including Linux, Windows, FreeBSD and Mac OS X. The software uses the SWORD programming library to work with over 200 free Bible texts, commentaries, dictionaries and books in over 50 languages provided by the Sociedad Bíblica Crosswire."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Dialogo de Ayuda"><link rel="home" href="index.html" title="El Manual BibleTime"><link rel="next" href="hdbk-intro.html" title="Capítulo 1. Introducción"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">El Manual <span class="application">BibleTime</span></th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Siguiente</a></td></tr></table><hr></div><div class="book" title="El Manual BibleTime"><div class="titlepage"><div><div><h1 class="title"><a name="idp28248012"></a>El Manual <span class="application">BibleTime</span></h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.10.1</p></div><div><p class="copyright">Copyright © 1999-2014 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Aviso Legal"><a name="idp29314828"></a><p>El Manual de <span class="application">BibleTime</span> es distribuido con el programa de estudio bíblico
+<span class="application">BibleTime</span>.</p></div></div><div><div class="abstract" title="Resumen"><p class="title"><b>Resumen</b></p><p><span class="application">BibleTime</span> is a completely free Bible study program. The program's user
+interface is built with <span class="application">Qt</span> framework, which makes it run on several
+operating systems including Linux, Windows, FreeBSD and Mac OS X. The
+software uses the <span class="application">SWORD</span> programming library to work with over 200 free
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the <span class="application">Sociedad Bíblica Crosswire</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Tabla de contenidos</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Introducción</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">Acerca de <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Obras disponibles</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivación</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. Iniciar <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Como iniciar <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting">Iniciar <span class="application">BibleTime</span></a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Inicio de personalización</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Iniciando <span class="application">BibleTime</span> por primera vez</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Operación del programa</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Visión general del programa</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">Las partes de la ventana de aplicación <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">La Biblioteca</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">El Lente (Lupa)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">El Escritorio</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Buscando en las obras</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Buscando texto en una ventana abierta de lectura</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Acceso al dialogo de búsqueda</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Configuración de búsqueda</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Resultados de la búsqueda</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">El <span class="guimenuitem">Administrador de biblioteca</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Ruta de instalación de la Biblioteca</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Instalar/actualizar obra(s)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Eliminar obra(s)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Índices de Búsqueda</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Exportando e Imprimiendo</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. Configurando <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Diálogo de Configuración <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
         <span class="guimenu">Mostrar</span>
       </a></span></dt><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-desk">
         <span class="guimenu">Escritorio</span>
diff --git a/docs/handbook/es/pdf/handbook.pdf b/docs/handbook/es/pdf/handbook.pdf
index 89bf1ef..7aaad14 100644
--- a/docs/handbook/es/pdf/handbook.pdf
+++ b/docs/handbook/es/pdf/handbook.pdf
diff --git a/docs/handbook/fi/docbook/index.docbook b/docs/handbook/fi/docbook/index.docbook
index 97efddc..22fb620 100644
--- a/docs/handbook/fi/docbook/index.docbook
+++ b/docs/handbook/fi/docbook/index.docbook
@@ -42,23 +42,24 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder>
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder>
 </copyright>
 
   <legalnotice>
     <para>The &bibletime; Handbook is distributed with the &bibletime; study program.</para>
   </legalnotice>
 
-  <date>January 2012</date>
+  <date>January 2014</date>
 
-  <releaseinfo>2.9.2</releaseinfo>
+  <releaseinfo>2.10.1</releaseinfo>
 
   <abstract>
     <para>&bibletime; is a completely free Bible study program. The program's user
 interface is built with &qt; framework, which makes it run on several
 operating systems including Linux, Windows, FreeBSD and Mac OS X. The
 software uses the &sword; programming library to work with over 200 free
-Bible texts, commentaries, dictionaries and books provided by the &cbs;.</para>
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the &cbs;.</para>
   </abstract>
 
   <keywordset>
diff --git a/docs/handbook/fi/html/index.html b/docs/handbook/fi/html/index.html
index 42584df..1c30b3e 100644
--- a/docs/handbook/fi/html/index.html
+++ b/docs/handbook/fi/html/index.html
@@ -1,8 +1,9 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The BibleTime Handbook</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime is a completely free Bible study program. The program's user interface is built with Qt framework, which makes it run on several operating systems including Linux, Windows, FreeBSD and Mac OS X. The software uses the SWORD programming library to work with over 200 free Bible texts, commentaries, dictionaries and books provided by the Crosswire Bible Society."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Help dialog"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="next" href="hdbk-intro.html" title="Luku 1. Johdanto"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The <span class="application">BibleTime</span> Handbook</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Seuraava</a></td></tr></table><hr></div><div class="book" title="The BibleTime Handbook"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467424"></a>The <span class="application">BibleTime</span> Handbook</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.9.2</p></div><div><p class="copyright">Tekijänoikeudet © 1999-2013 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Oikeudellinen ilmoitus"><a name="idp26712352"></a><p>The <span class="application">BibleTime</span> Handbook is distributed with the <span class="application">BibleTime</span> study program.</p></div></div><div><div class="abstract" title="Tiivistelmä"><p class="title"><b>Tiivistelmä</b></p><p><span class="application">BibleTime</span> is a completely free Bible study program. The program's user
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The BibleTime Handbook</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime is a completely free Bible study program. The program's user interface is built with Qt framework, which makes it run on several operating systems including Linux, Windows, FreeBSD and Mac OS X. The software uses the SWORD programming library to work with over 200 free Bible texts, commentaries, dictionaries and books in over 50 languages provided by the Crosswire Bible Society."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Help dialog"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="next" href="hdbk-intro.html" title="Luku 1. Johdanto"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The <span class="application">BibleTime</span> Handbook</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Seuraava</a></td></tr></table><hr></div><div class="book" title="The BibleTime Handbook"><div class="titlepage"><div><div><h1 class="title"><a name="idp28248012"></a>The <span class="application">BibleTime</span> Handbook</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.10.1</p></div><div><p class="copyright">Tekijänoikeudet © 1999-2014 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Oikeudellinen ilmoitus"><a name="idp29314892"></a><p>The <span class="application">BibleTime</span> Handbook is distributed with the <span class="application">BibleTime</span> study program.</p></div></div><div><div class="abstract" title="Tiivistelmä"><p class="title"><b>Tiivistelmä</b></p><p><span class="application">BibleTime</span> is a completely free Bible study program. The program's user
 interface is built with <span class="application">Qt</span> framework, which makes it run on several
 operating systems including Linux, Windows, FreeBSD and Mac OS X. The
 software uses the <span class="application">SWORD</span> programming library to work with over 200 free
-Bible texts, commentaries, dictionaries and books provided by the <span class="application">Crosswire Bible Society</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Sisällys</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Johdanto</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">Tietoja <span class="application">BibleTime</span>:stä</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Saatavana olevat tehtävät</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivaatiota</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. <span class="application">BibleTime</span>n käynnistys</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Kuinka <span class="application">BibleTime</span> käynnistetään</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting"><span class="application">BibleTime</span>n käynnistys</a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Käynnistyksen säätäminen</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Starting <span class="application">BibleTime</span> for the first time</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Ohjelman toiminto</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Yleiskatsaus ohjelmaan</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html"><span class="application">BibleTime</span>n osa sovellusikkuna</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">Kirjahylly</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">Suurennuslasi</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">Työpöytä</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Etsintä teoksista</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Tekstin haku avoimessa lukuikkunassa</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Etsi-ikkunaan pääsy</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Etsinnän asetukset</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Etsinnän tulokset</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html"><span class="guimenuitem">Kirjahyllyn hallinta</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Kirjahyllyn polun/polkujen asetus</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Asenna/päivitä teos/teoksia</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Poista teos/teoksia</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Etsii indeksejä</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Vienti ja tulostus</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. <span class="application">BibleTime</span>:n asetukset</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Configure <span class="application">BibleTime</span> Dialog</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the <span class="application">Crosswire Bible Society</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Sisällys</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Johdanto</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">Tietoja <span class="application">BibleTime</span>:stä</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Saatavana olevat tehtävät</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivaatiota</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. <span class="application">BibleTime</span>n käynnistys</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Kuinka <span class="application">BibleTime</span> käynnistetään</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting"><span class="application">BibleTime</span>n käynnistys</a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Käynnistyksen säätäminen</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Starting <span class="application">BibleTime</span> for the first time</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Ohjelman toiminto</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Yleiskatsaus ohjelmaan</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html"><span class="application">BibleTime</span>n osa sovellusikkuna</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">Kirjahylly</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">Suurennuslasi</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">Työpöytä</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Etsintä teoksista</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Tekstin haku avoimessa lukuikkunassa</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Etsi-ikkunaan pääsy</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Etsinnän asetukset</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Etsinnän tulokset</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html"><span class="guimenuitem">Kirjahyllyn hallinta</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Kirjahyllyn polun/polkujen asetus</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Asenna/päivitä teos/teoksia</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Poista teos/teoksia</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Etsii indeksejä</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Vienti ja tulostus</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. <span class="application">BibleTime</span>:n asetukset</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Configure <span class="application">BibleTime</span> Dialog</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
         <span class="guimenu">Display</span>
       </a></span></dt><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-desk">
         <span class="guimenu">Desk</span>
diff --git a/docs/handbook/fi/pdf/handbook.pdf b/docs/handbook/fi/pdf/handbook.pdf
index 0851eb9..83d1b6b 100644
--- a/docs/handbook/fi/pdf/handbook.pdf
+++ b/docs/handbook/fi/pdf/handbook.pdf
diff --git a/docs/handbook/fr/docbook/index.docbook b/docs/handbook/fr/docbook/index.docbook
index 870175b..22fb620 100644
--- a/docs/handbook/fr/docbook/index.docbook
+++ b/docs/handbook/fr/docbook/index.docbook
@@ -42,24 +42,24 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder>
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder>
 </copyright>
 
   <legalnotice>
     <para>The &bibletime; Handbook is distributed with the &bibletime; study program.</para>
   </legalnotice>
 
-  <date>January 2012</date>
+  <date>January 2014</date>
 
-  <releaseinfo>2.9.2</releaseinfo>
+  <releaseinfo>2.10.1</releaseinfo>
 
   <abstract>
-    <para>&bibletime; est un programme d'études offert gratuitement Bible. L'interface
-utilisateur du programme est construit avec le cadre &qt;, qui lui fait
-tourner sur plusieurs systèmes d'exploitation dont Linux, Windows, FreeBSD
-et Mac OS X. Le logiciel utilise la librairie de programmation &sword; de
-travailler avec plus de 200 textes de la Bible gratuite, des commentaires,
-des dictionnaires et des livres fournis par le &cbs;.</para>
+    <para>&bibletime; is a completely free Bible study program. The program's user
+interface is built with &qt; framework, which makes it run on several
+operating systems including Linux, Windows, FreeBSD and Mac OS X. The
+software uses the &sword; programming library to work with over 200 free
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the &cbs;.</para>
   </abstract>
 
   <keywordset>
diff --git a/docs/handbook/fr/html/index.html b/docs/handbook/fr/html/index.html
index 212242b..58bc05c 100644
--- a/docs/handbook/fr/html/index.html
+++ b/docs/handbook/fr/html/index.html
@@ -1,9 +1,9 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The BibleTime Handbook</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime est un programme d'études offert gratuitement Bible. L'interface utilisateur du programme est construit avec le cadre Qt, qui lui fait tourner sur plusieurs systèmes d'exploitation dont Linux, Windows, FreeBSD et Mac OS X. Le logiciel utilise la librairie de programmation SWORD de travailler avec plus de 200 textes de la Bible gratuite, des commentaires, des dictionnaires et des livres fournis par le Crosswire Bible Society."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Help dialog"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="next" href="hdbk-intro.html" title="Chapitre 1. Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The <span class="application">BibleTime</span> Handbook</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Suivant</a></td></tr></table><hr></div><div class="book" title="The BibleTime Handbook"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467424"></a>The <span class="application">BibleTime</span> Handbook</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.9.2</p></div><div><p class="copyright">Copyright © 1999-2013 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Note légale"><a name="idp26712352"></a><p>The <span class="application">BibleTime</span> Handbook is distributed with the <span class="application">BibleTime</span> study program.</p></div></div><div><div class="abstract" title="Résumé"><p class="title"><b>Résumé</b></p><p><span class="application">BibleTime</span> est un programme d'études offert gratuitement Bible. L'interface
-utilisateur du programme est construit avec le cadre <span class="application">Qt</span>, qui lui fait
-tourner sur plusieurs systèmes d'exploitation dont Linux, Windows, FreeBSD
-et Mac OS X. Le logiciel utilise la librairie de programmation <span class="application">SWORD</span> de
-travailler avec plus de 200 textes de la Bible gratuite, des commentaires,
-des dictionnaires et des livres fournis par le <span class="application">Crosswire Bible Society</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Table des matières</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Introduction</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">About <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">&#338;uvres disponibles</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivation</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. Lancer <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Comment lancer <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting">Lancer <span class="application">BibleTime</span></a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Configuration du démarrage</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Starting <span class="application">BibleTime</span> for the first time</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Utilisation du programme</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Vue d'ensemble du programme</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">Regardons les différentes parties de l'application une par une.</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">La bibliothèque</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">Le zoom</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">Le bureau</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Rechercher dans des modules</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Searching text in an open read window</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Accéder au dialogue de recherche</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Configuration de la recherche</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Résultats de recherche</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">Le <span class="guimenuitem">Gestionnaire de Bibliothèque</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Configurer les chemins vers les bibliothèques</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Installer/mettre à jour module</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Enlever des modules</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Search Indexes</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Exporter et imprimer</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. Configurer <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Configure <span class="application">BibleTime</span> Dialog</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The BibleTime Handbook</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime is a completely free Bible study program. The program's user interface is built with Qt framework, which makes it run on several operating systems including Linux, Windows, FreeBSD and Mac OS X. The software uses the SWORD programming library to work with over 200 free Bible texts, commentaries, dictionaries and books in over 50 languages provided by the Crosswire Bible Society."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Help dialog"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="next" href="hdbk-intro.html" title="Chapitre 1. Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The <span class="application">BibleTime</span> Handbook</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Suivant</a></td></tr></table><hr></div><div class="book" title="The BibleTime Handbook"><div class="titlepage"><div><div><h1 class="title"><a name="idp28248012"></a>The <span class="application">BibleTime</span> Handbook</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.10.1</p></div><div><p class="copyright">Copyright © 1999-2014 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Note légale"><a name="idp29314892"></a><p>The <span class="application">BibleTime</span> Handbook is distributed with the <span class="application">BibleTime</span> study program.</p></div></div><div><div class="abstract" title="Résumé"><p class="title"><b>Résumé</b></p><p><span class="application">BibleTime</span> is a completely free Bible study program. The program's user
+interface is built with <span class="application">Qt</span> framework, which makes it run on several
+operating systems including Linux, Windows, FreeBSD and Mac OS X. The
+software uses the <span class="application">SWORD</span> programming library to work with over 200 free
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the <span class="application">Crosswire Bible Society</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Table des matières</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Introduction</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">About <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">&#338;uvres disponibles</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivation</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. Lancer <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Comment lancer <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting">Lancer <span class="application">BibleTime</span></a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Configuration du démarrage</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Starting <span class="application">BibleTime</span> for the first time</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Utilisation du programme</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Vue d'ensemble du programme</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">Regardons les différentes parties de l'application une par une.</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">La bibliothèque</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">Le zoom</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">Le bureau</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Rechercher dans des modules</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Searching text in an open read window</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Accéder au dialogue de recherche</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Configuration de la recherche</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Résultats de recherche</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">Le <span class="guimenuitem">Gestionnaire de Bibliothèque</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Configurer les chemins vers les bibliothèques</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Installer/mettre à jour module</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Enlever des modules</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Search Indexes</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Exporter et imprimer</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. Configurer <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Configure <span class="application">BibleTime</span> Dialog</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
         <span class="guimenu">Display</span>
       </a></span></dt><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-desk">
         <span class="guimenu">Desk</span>
diff --git a/docs/handbook/fr/pdf/handbook.pdf b/docs/handbook/fr/pdf/handbook.pdf
index c27944b..b0ecc66 100644
--- a/docs/handbook/fr/pdf/handbook.pdf
+++ b/docs/handbook/fr/pdf/handbook.pdf
diff --git a/docs/handbook/hu/docbook/index.docbook b/docs/handbook/hu/docbook/index.docbook
index 31aa814..b1b63e7 100644
--- a/docs/handbook/hu/docbook/index.docbook
+++ b/docs/handbook/hu/docbook/index.docbook
@@ -42,24 +42,24 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder>
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder>
 </copyright>
 
   <legalnotice>
     <para>A &bibletime; kézikönyv a &bibletime; programmal együtt terjesztve.</para>
   </legalnotice>
 
-  <date>January 2012</date>
+  <date>January 2014</date>
 
-  <releaseinfo>2.9.2</releaseinfo>
+  <releaseinfo>2.10.1</releaseinfo>
 
   <abstract>
-    <para>A &bibletime; egy teljesen ingyenes és szabad Biblia tanulmányozó program. A
-program kezelőfelülete a &qt; keretrendszerre épült, ami lehetővé teszi
-többféle operációs rendszeren való futtatását, mint Linux, Windows, FreeBSD
-és Mac OS X rendszeren. A szoftver a &sword; programozási könyvtárat
-használja, több, mint 200 ingyenes Bibliaváltozattal, kommentárokkal,
-szótárakkal és könyvekkel, amit a &cbs; biztosít.</para>
+    <para>&bibletime; is a completely free Bible study program. The program's user
+interface is built with &qt; framework, which makes it run on several
+operating systems including Linux, Windows, FreeBSD and Mac OS X. The
+software uses the &sword; programming library to work with over 200 free
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the &cbs;.</para>
   </abstract>
 
   <keywordset>
diff --git a/docs/handbook/hu/html/index.html b/docs/handbook/hu/html/index.html
index c9a3e94..6753324 100644
--- a/docs/handbook/hu/html/index.html
+++ b/docs/handbook/hu/html/index.html
@@ -1,9 +1,9 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>BibleTime kézikönyv</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="A BibleTime egy teljesen ingyenes és szabad Biblia tanulmányozó program. A program kezel&#337;felülete a Qt keretrendszerre épült, ami lehet&#337;vé teszi többféle operációs rendszeren való futtatását, mint Linux, Windows, FreeBSD és Mac OS X rendszeren. A szoftver a SWORD programozási könyvtárat használja, több, mint 200 ingyenes Bibliaváltozattal, kommentárokkal, szótárakkal és könyvekkel, amit a Crosswire Bible Society biztosít."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Segítség párbeszédablak"><link rel="home" href="index.html" title="BibleTime kézikönyv"><link rel="next" href="hdbk-intro.html" title="1. fejezet - Bevezetés"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center"><span class="application">BibleTime</span> kézikönyv</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">El&#337;re</a></td></tr></table><hr></div><div class="book" title="BibleTime kézikönyv"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467424"></a><span class="application">BibleTime</span> kézikönyv</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="surname">Saalbach</span>, <span class="firstname">Fred</span></h3></div><div class="author"><h3 class="author"><span class="surname">Hoyt</span>, <span class="firstname">Jeffrey</span></h3></div><div class="author"><h3 class="author"><span class="surname">Gruner</span>, <span class="firstname">Martin</span></h3></div><div class="author"><h3 class="author"><span class="surname">Abthorpe</span>, <span class="firstname">Thomas</span></h3></div></div></div><div><p class="releaseinfo">2.9.2</p></div><div><p class="copyright">Szerz&#337;i jog © 1999-2013 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Jogi közlemény"><a name="idp26712288"></a><p>A <span class="application">BibleTime</span> kézikönyv a <span class="application">BibleTime</span> programmal együtt terjesztve.</p></div></div><div><div class="abstract" title="Kivonat"><p class="title"><b>Kivonat</b></p><p>A <span class="application">BibleTime</span> egy teljesen ingyenes és szabad Biblia tanulmányozó program. A
-program kezel&#337;felülete a <span class="application">Qt</span> keretrendszerre épült, ami lehet&#337;vé teszi
-többféle operációs rendszeren való futtatását, mint Linux, Windows, FreeBSD
-és Mac OS X rendszeren. A szoftver a <span class="application">SWORD</span> programozási könyvtárat
-használja, több, mint 200 ingyenes Bibliaváltozattal, kommentárokkal,
-szótárakkal és könyvekkel, amit a <span class="application">Crosswire  Bible Society</span> biztosít.</p></div></div></div><hr></div><div class="toc"><p><b>Tartalom</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Bevezetés</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">Mi a <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Elérhet&#337; dokumentumok</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivációnk</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. <span class="application">BibleTime</span> indítása</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Hogyan indítsuk a <span class="application">BibleTime</span> programot</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting"><span class="application">BibleTime</span> indítása</a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Egyéni indítások</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html"><span class="application">BibleTime</span> els&#337; indítása </a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. A program m&#369;ködése</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">A program áttekintése</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">A <span class="application">BibleTime</span> ablak részei</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">A Könyvespolc</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">A Nagyító</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">A Munkaasztal</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Keresés a dokumentumokban</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Keresés egy megnyitott ablakban </a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Keresési párbeszédablak elérése </a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">A keresés testreszabása </a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Keresési találatok</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">A <span class="guimenuitem">Könyvespolc menedzser</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Telepítési útvonal(ak) beállítása</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Dokumentum(ok) telepítése/frissítése</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Dokumentum(ok) törlése</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Keresési indexek</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Exportálás és Nyomtatás</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4.  <span class="application">BibleTime</span> beállítása</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">A <span class="application">BibleTime</span> Beállítása párbeszédablak</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>BibleTime kézikönyv</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime is a completely free Bible study program. The program's user interface is built with Qt framework, which makes it run on several operating systems including Linux, Windows, FreeBSD and Mac OS X. The software uses the SWORD programming library to work with over 200 free Bible texts, commentaries, dictionaries and books in over 50 languages provided by the Crosswire Bible Society."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Segítség párbeszédablak"><link rel="home" href="index.html" title="BibleTime kézikönyv"><link rel="next" href="hdbk-intro.html" title="1. fejezet - Bevezetés"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center"><span class="application">BibleTime</span> kézikönyv</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">El&#337;re</a></td></tr></table><hr></div><div class="book" title="BibleTime kézikönyv"><div class="titlepage"><div><div><h1 class="title"><a name="idp28248012"></a><span class="application">BibleTime</span> kézikönyv</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="surname">Saalbach</span>, <span class="firstname">Fred</span></h3></div><div class="author"><h3 class="author"><span class="surname">Hoyt</span>, <span class="firstname">Jeffrey</span></h3></div><div class="author"><h3 class="author"><span class="surname">Gruner</span>, <span class="firstname">Martin</span></h3></div><div class="author"><h3 class="author"><span class="surname">Abthorpe</span>, <span class="firstname">Thomas</span></h3></div></div></div><div><p class="releaseinfo">2.10.1</p></div><div><p class="copyright">Szerz&#337;i jog © 1999-2014 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Jogi közlemény"><a name="idp29314828"></a><p>A <span class="application">BibleTime</span> kézikönyv a <span class="application">BibleTime</span> programmal együtt terjesztve.</p></div></div><div><div class="abstract" title="Kivonat"><p class="title"><b>Kivonat</b></p><p><span class="application">BibleTime</span> is a completely free Bible study program. The program's user
+interface is built with <span class="application">Qt</span> framework, which makes it run on several
+operating systems including Linux, Windows, FreeBSD and Mac OS X. The
+software uses the <span class="application">SWORD</span> programming library to work with over 200 free
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the <span class="application">Crosswire  Bible Society</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Tartalom</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Bevezetés</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">Mi a <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Elérhet&#337; dokumentumok</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivációnk</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. <span class="application">BibleTime</span> indítása</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Hogyan indítsuk a <span class="application">BibleTime</span> programot</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting"><span class="application">BibleTime</span> indítása</a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Egyéni indítások</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html"><span class="application">BibleTime</span> els&#337; indítása </a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. A program m&#369;ködése</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">A program áttekintése</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">A <span class="application">BibleTime</span> ablak részei</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">A Könyvespolc</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">A Nagyító</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">A Munkaasztal</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Keresés a dokumentumokban</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Keresés egy megnyitott ablakban </a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Keresési párbeszédablak elérése </a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">A keresés testreszabása </a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Keresési találatok</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">A <span class="guimenuitem">Könyvespolc menedzser</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Telepítési útvonal(ak) beállítása</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Dokumentum(ok) telepítése/frissítése</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Dokumentum(ok) törlése</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Keresési indexek</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Exportálás és Nyomtatás</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4.  <span class="application">BibleTime</span> beállítása</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">A <span class="application">BibleTime</span> Beállítása párbeszédablak</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
         <span class="guimenu">Képerny&#337;</span>
       </a></span></dt><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-desk">
         <span class="guimenu">Munkaasztal</span>
diff --git a/docs/handbook/hu/pdf/handbook.pdf b/docs/handbook/hu/pdf/handbook.pdf
index 5f1591b..074f10c 100644
--- a/docs/handbook/hu/pdf/handbook.pdf
+++ b/docs/handbook/hu/pdf/handbook.pdf
diff --git a/docs/handbook/it/docbook/index.docbook b/docs/handbook/it/docbook/index.docbook
index 4158068..28fdef7 100644
--- a/docs/handbook/it/docbook/index.docbook
+++ b/docs/handbook/it/docbook/index.docbook
@@ -42,7 +42,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder>
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder>
 </copyright>
 
   <legalnotice>
@@ -50,17 +50,17 @@
 &bibletime;.</para>
   </legalnotice>
 
-  <date>January 2012</date>
+  <date>January 2014</date>
 
-  <releaseinfo>2.9.2</releaseinfo>
+  <releaseinfo>2.10.1</releaseinfo>
 
   <abstract>
-    <para>&bibletime; è un programma di studio della Bibbia completamente
-gratuito. L'interfaccia del programma è costruita con il framework &qt;, che
-lo fa funzionare su diversi sistemi operativi inclusi Linux, Windows,
-FreeBSD e Mac OS X. Il software usa la libreria &sword; per lavorare con
-oltre 200 testi della Bibbia, commenti, dizionari e libri gratuiti forniti
-da &cbs;.</para>
+    <para>&bibletime; is a completely free Bible study program. The program's user
+interface is built with &qt; framework, which makes it run on several
+operating systems including Linux, Windows, FreeBSD and Mac OS X. The
+software uses the &sword; programming library to work with over 200 free
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the &cbs;.</para>
   </abstract>
 
   <keywordset>
diff --git a/docs/handbook/it/html/index.html b/docs/handbook/it/html/index.html
index d1352ad..6d6e012 100644
--- a/docs/handbook/it/html/index.html
+++ b/docs/handbook/it/html/index.html
@@ -1,10 +1,10 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Il Manuale di BibleTime</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime è un programma di studio della Bibbia completamente gratuito. L'interfaccia del programma è costruita con il framework Qt, che lo fa funzionare su diversi sistemi operativi inclusi Linux, Windows, FreeBSD e Mac OS X. Il software usa la libreria SWORD per lavorare con oltre 200 testi della Bibbia, commenti, dizionari e libri gratuiti forniti da Crosswire Bible Society."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Finestra di aiuto"><link rel="home" href="index.html" title="Il Manuale di BibleTime"><link rel="next" href="hdbk-intro.html" title="Capitolo 1. Introduzione"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Il Manuale di <span class="application">BibleTime</span></th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Avanti</a></td></tr></table><hr></div><div class="book" title="Il Manuale di BibleTime"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467424"></a>Il Manuale di <span class="application">BibleTime</span></h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.9.2</p></div><div><p class="copyright">Diritto d'autore © 1999-2013 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Nota Legale"><a name="idp26712288"></a><p>Il Manuale di <span class="application">BibleTime</span> è distribuito con il programma di studio di
-<span class="application">BibleTime</span>.</p></div></div><div><div class="abstract" title="Sommario"><p class="title"><b>Sommario</b></p><p><span class="application">BibleTime</span> è un programma di studio della Bibbia completamente
-gratuito. L'interfaccia del programma è costruita con il framework <span class="application">Qt</span>, che
-lo fa funzionare su diversi sistemi operativi inclusi Linux, Windows,
-FreeBSD e Mac OS X. Il software usa la libreria <span class="application">SWORD</span> per lavorare con
-oltre 200 testi della Bibbia, commenti, dizionari e libri gratuiti forniti
-da <span class="application">Crosswire Bible Society</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Indice</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Introduzione</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">About <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Documenti disponibili</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivazione</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. Avviando <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Come avviare <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting">Avviando <span class="application">BibleTime</span></a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Personalizzazione avvio</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Avviando <span class="application">BibleTime</span> per la prima volta</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Funzionamento Programma</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Panoramica del Programma</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">Parti della finestra di applicazione <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">La Libreria</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">La Lente</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">La Scrivania</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Cercare nei documenti</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Cercare testo in una finestra di lettura aperta</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Accesso alla finestra di ricerca</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Configurazione ricerca</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Risultati di ricerca</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">Il <span class="guimenuitem">Gestore Libreria</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Setup percorsi Libreria</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Installa/aggiorna documenti</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Rimuovi documenti</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Indici di Ricerca</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Esportazione e Stampa</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. Configurando <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Configura <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Il Manuale di BibleTime</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime is a completely free Bible study program. The program's user interface is built with Qt framework, which makes it run on several operating systems including Linux, Windows, FreeBSD and Mac OS X. The software uses the SWORD programming library to work with over 200 free Bible texts, commentaries, dictionaries and books in over 50 languages provided by the Crosswire Bible Society."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Finestra di aiuto"><link rel="home" href="index.html" title="Il Manuale di BibleTime"><link rel="next" href="hdbk-intro.html" title="Capitolo 1. Introduzione"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Il Manuale di <span class="application">BibleTime</span></th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Avanti</a></td></tr></table><hr></div><div class="book" title="Il Manuale di BibleTime"><div class="titlepage"><div><div><h1 class="title"><a name="idp28248012"></a>Il Manuale di <span class="application">BibleTime</span></h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.10.1</p></div><div><p class="copyright">Diritto d'autore © 1999-2014 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Nota Legale"><a name="idp29314828"></a><p>Il Manuale di <span class="application">BibleTime</span> è distribuito con il programma di studio di
+<span class="application">BibleTime</span>.</p></div></div><div><div class="abstract" title="Sommario"><p class="title"><b>Sommario</b></p><p><span class="application">BibleTime</span> is a completely free Bible study program. The program's user
+interface is built with <span class="application">Qt</span> framework, which makes it run on several
+operating systems including Linux, Windows, FreeBSD and Mac OS X. The
+software uses the <span class="application">SWORD</span> programming library to work with over 200 free
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the <span class="application">Crosswire Bible Society</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Indice</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Introduzione</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">About <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Documenti disponibili</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivazione</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. Avviando <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Come avviare <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting">Avviando <span class="application">BibleTime</span></a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Personalizzazione avvio</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Avviando <span class="application">BibleTime</span> per la prima volta</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Funzionamento Programma</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Panoramica del Programma</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">Parti della finestra di applicazione <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">La Libreria</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">La Lente</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">La Scrivania</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Cercare nei documenti</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Cercare testo in una finestra di lettura aperta</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Accesso alla finestra di ricerca</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Configurazione ricerca</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Risultati di ricerca</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">Il <span class="guimenuitem">Gestore Libreria</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Setup percorsi Libreria</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Installa/aggiorna documenti</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Rimuovi documenti</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Indici di Ricerca</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Esportazione e Stampa</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. Configurando <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Configura <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
         <span class="guimenu">Visualizzazione</span>
       </a></span></dt><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-desk">
         <span class="guimenu">Scrivania</span>
diff --git a/docs/handbook/it/pdf/handbook.pdf b/docs/handbook/it/pdf/handbook.pdf
index 0eb0fc6..2a3cede 100644
--- a/docs/handbook/it/pdf/handbook.pdf
+++ b/docs/handbook/it/pdf/handbook.pdf
diff --git a/docs/handbook/nl/docbook/index.docbook b/docs/handbook/nl/docbook/index.docbook
index 97efddc..22fb620 100644
--- a/docs/handbook/nl/docbook/index.docbook
+++ b/docs/handbook/nl/docbook/index.docbook
@@ -42,23 +42,24 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder>
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder>
 </copyright>
 
   <legalnotice>
     <para>The &bibletime; Handbook is distributed with the &bibletime; study program.</para>
   </legalnotice>
 
-  <date>January 2012</date>
+  <date>January 2014</date>
 
-  <releaseinfo>2.9.2</releaseinfo>
+  <releaseinfo>2.10.1</releaseinfo>
 
   <abstract>
     <para>&bibletime; is a completely free Bible study program. The program's user
 interface is built with &qt; framework, which makes it run on several
 operating systems including Linux, Windows, FreeBSD and Mac OS X. The
 software uses the &sword; programming library to work with over 200 free
-Bible texts, commentaries, dictionaries and books provided by the &cbs;.</para>
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the &cbs;.</para>
   </abstract>
 
   <keywordset>
diff --git a/docs/handbook/nl/html/index.html b/docs/handbook/nl/html/index.html
index a6bf810..8fcf3a4 100644
--- a/docs/handbook/nl/html/index.html
+++ b/docs/handbook/nl/html/index.html
@@ -1,8 +1,9 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The BibleTime Handbook</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime is a completely free Bible study program. The program's user interface is built with Qt framework, which makes it run on several operating systems including Linux, Windows, FreeBSD and Mac OS X. The software uses the SWORD programming library to work with over 200 free Bible texts, commentaries, dictionaries and books provided by the Crosswire Bible Society."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Help dialog"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="next" href="hdbk-intro.html" title="Hoofdstuk 1. Introductie"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The <span class="application">BibleTime</span> Handbook</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Volgende</a></td></tr></table><hr></div><div class="book" title="The BibleTime Handbook"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467424"></a>The <span class="application">BibleTime</span> Handbook</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.9.2</p></div><div><p class="copyright">Copyright © 1999-2013 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Juridische kennisgeving"><a name="idp26712352"></a><p>The <span class="application">BibleTime</span> Handbook is distributed with the <span class="application">BibleTime</span> study program.</p></div></div><div><div class="abstract" title="Samenvatting"><p class="title"><b>Samenvatting</b></p><p><span class="application">BibleTime</span> is a completely free Bible study program. The program's user
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The BibleTime Handbook</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime is a completely free Bible study program. The program's user interface is built with Qt framework, which makes it run on several operating systems including Linux, Windows, FreeBSD and Mac OS X. The software uses the SWORD programming library to work with over 200 free Bible texts, commentaries, dictionaries and books in over 50 languages provided by the Crosswire Bible Society."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Help dialog"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="next" href="hdbk-intro.html" title="Hoofdstuk 1. Introductie"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The <span class="application">BibleTime</span> Handbook</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Volgende</a></td></tr></table><hr></div><div class="book" title="The BibleTime Handbook"><div class="titlepage"><div><div><h1 class="title"><a name="idp28252108"></a>The <span class="application">BibleTime</span> Handbook</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.10.1</p></div><div><p class="copyright">Copyright © 1999-2014 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Juridische kennisgeving"><a name="idp29294412"></a><p>The <span class="application">BibleTime</span> Handbook is distributed with the <span class="application">BibleTime</span> study program.</p></div></div><div><div class="abstract" title="Samenvatting"><p class="title"><b>Samenvatting</b></p><p><span class="application">BibleTime</span> is a completely free Bible study program. The program's user
 interface is built with <span class="application">Qt</span> framework, which makes it run on several
 operating systems including Linux, Windows, FreeBSD and Mac OS X. The
 software uses the <span class="application">SWORD</span> programming library to work with over 200 free
-Bible texts, commentaries, dictionaries and books provided by the <span class="application">Crosswire Bible Society</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Inhoudsopgave</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Introductie</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">About <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Beschikbare modules</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivatie</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. <span class="application">BibleTime</span> opstarten</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Hoe u <span class="application">BibleTime</span> opstart</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting"><span class="application">BibleTime</span> opstarten</a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Aanpassing van het opstarten</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Starting <span class="application">BibleTime</span> for the first time</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Werking van het programma</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Programma overzicht</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">Onderdelen van het <span class="application">BibleTime</span> toepassingsvenster</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">De Boekenplank</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">Het Vergrootglas</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">Het Bureau</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Zoeken in modules</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Tekst zoeken in een geopend leesvenster</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">De zoekdialoog benaderen</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Configuratie van de zoekopdracht</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Zoekresultaten</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">De <span class="guimenuitem">Boekenplank Manager</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Het instellen van Boekenplank bestandspad(en)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Modules installeren/bijwerken</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Module(s) verwijderen</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Search Indexes</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Exporteren en Printen</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. <span class="application">BibleTime</span> configureren</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Configure <span class="application">BibleTime</span> Dialog</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the <span class="application">Crosswire Bible Society</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Inhoudsopgave</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Introductie</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">About <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Beschikbare modules</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivatie</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. <span class="application">BibleTime</span> opstarten</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Hoe u <span class="application">BibleTime</span> opstart</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting"><span class="application">BibleTime</span> opstarten</a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Aanpassing van het opstarten</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Starting <span class="application">BibleTime</span> for the first time</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Werking van het programma</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Programma overzicht</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">Onderdelen van het <span class="application">BibleTime</span> toepassingsvenster</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">De Boekenplank</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">Het Vergrootglas</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">Het Bureau</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Zoeken in modules</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Tekst zoeken in een geopend leesvenster</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">De zoekdialoog benaderen</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Configuratie van de zoekopdracht</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Zoekresultaten</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">De <span class="guimenuitem">Boekenplank Manager</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Het instellen van Boekenplank bestandspad(en)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Modules installeren/bijwerken</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Module(s) verwijderen</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">Search Indexes</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Exporteren en Printen</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. <span class="application">BibleTime</span> configureren</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Configure <span class="application">BibleTime</span> Dialog</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
         <span class="guimenu">Display</span>
       </a></span></dt><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-desk">
         <span class="guimenu">Desk</span>
diff --git a/docs/handbook/nl/pdf/handbook.pdf b/docs/handbook/nl/pdf/handbook.pdf
index 2dcfb44..8098463 100644
--- a/docs/handbook/nl/pdf/handbook.pdf
+++ b/docs/handbook/nl/pdf/handbook.pdf
diff --git a/docs/handbook/pt_BR/docbook/index.docbook b/docs/handbook/pt_BR/docbook/index.docbook
index 8c7db6e..c672b40 100644
--- a/docs/handbook/pt_BR/docbook/index.docbook
+++ b/docs/handbook/pt_BR/docbook/index.docbook
@@ -42,24 +42,24 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder>
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder>
 </copyright>
 
   <legalnotice>
     <para>O Manual do &bibletime; é distribuído como parte do programa &bibletime;.</para>
   </legalnotice>
 
-  <date>Janeiro 2012</date>
+  <date>January 2014</date>
 
-  <releaseinfo>2.9.2</releaseinfo>
+  <releaseinfo>2.10.1</releaseinfo>
 
   <abstract>
-    <para>&bibletime; é um programa de estudo da Bíblia completamente livre. A
-interface com o usuário é construída com o framework &qt;, que pode ser
-executado em vários sistemas operacionais, incluindo Linux, Windows, FreeBSD
-e Mac OS X. O software utiliza o &sword; biblioteca de programação que
-trabalha com mais de 200 textos bíblicos livres, comentários, dicionários e
-livros providos pela &cbs;.</para>
+    <para>&bibletime; is a completely free Bible study program. The program's user
+interface is built with &qt; framework, which makes it run on several
+operating systems including Linux, Windows, FreeBSD and Mac OS X. The
+software uses the &sword; programming library to work with over 200 free
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the &cbs;.</para>
   </abstract>
 
   <keywordset>
diff --git a/docs/handbook/pt_BR/html/index.html b/docs/handbook/pt_BR/html/index.html
index 3bcc117..7bab1b2 100644
--- a/docs/handbook/pt_BR/html/index.html
+++ b/docs/handbook/pt_BR/html/index.html
@@ -1,9 +1,9 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>O livro de mão do BibleTime</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime é um programa de estudo da Bíblia completamente livre. A interface com o usuário é construída com o framework Qt, que pode ser executado em vários sistemas operacionais, incluindo Linux, Windows, FreeBSD e Mac OS X. O software utiliza o SWORD biblioteca de programação que trabalha com mais de 200 textos bíblicos livres, comentários, dicionários e livros providos pela Sociedade Bíblica Crosswire."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Diálogo de ajuda"><link rel="home" href="index.html" title="O livro de mão do BibleTime"><link rel="next" href="hdbk-intro.html" title="Capítulo 1. Introdução"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">O livro de mão do <span class="application">BibleTime</span></th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Próxima</a></td></tr></table><hr></div><div class="book" title="O livro de mão do BibleTime"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467424"></a>O livro de mão do <span class="application">BibleTime</span></h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.9.2</p></div><div><p class="copyright">Copyright © 1999-2013 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Nota Legal"><a name="idp26712288"></a><p>O Manual do <span class="application">BibleTime</span> é distribuído como parte do programa <span class="application">BibleTime</span>.</p></div></div><div><div class="abstract" title="Resumo"><p class="title"><b>Resumo</b></p><p><span class="application">BibleTime</span> é um programa de estudo da Bíblia completamente livre. A
-interface com o usuário é construída com o framework <span class="application">Qt</span>, que pode ser
-executado em vários sistemas operacionais, incluindo Linux, Windows, FreeBSD
-e Mac OS X. O software utiliza o <span class="application">SWORD</span> biblioteca de programação que
-trabalha com mais de 200 textos bíblicos livres, comentários, dicionários e
-livros providos pela <span class="application">Sociedade Bíblica Crosswire</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Índice</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Introdução</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">Sobre <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Obras disponíveis</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivação</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. Iniciando <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Como iniciar o <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting">Iniciando <span class="application">BibleTime</span></a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Personalização de início</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Iniciando <span class="application">BibleTime</span> pela primeira vez</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Operação do programa</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Viso geral do programa</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">Partes da janela de aplicação do <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">A Estante de Livros</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">A Lupa</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">A Mesa</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Buscando em obras</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Procurando texto em uma janela de leitura aberta</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Acessando o diálogo de busca</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Configuração de pesquisa</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Resultados de busca</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">O <span class="guimenuitem">Gerenciador da Estante</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Configuração do(s) caminho(s) da Estante</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Instalar/atualizar obra(s)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Remover obra(s)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">índices de pesquisa</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Exportando e Imprimindo</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. Configurando <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Diálogo de configuração do <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>O livro de mão do BibleTime</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="BibleTime is a completely free Bible study program. The program's user interface is built with Qt framework, which makes it run on several operating systems including Linux, Windows, FreeBSD and Mac OS X. The software uses the SWORD programming library to work with over 200 free Bible texts, commentaries, dictionaries and books in over 50 languages provided by the Sociedade Bíblica Crosswire."><meta name="keywords" content="Qt4, BibleTime, SWORD, Crosswire, Diálogo de ajuda"><link rel="home" href="index.html" title="O livro de mão do BibleTime"><link rel="next" href="hdbk-intro.html" title="Capítulo 1. Introdução"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">O livro de mão do <span class="application">BibleTime</span></th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="hdbk-intro.html">Próxima</a></td></tr></table><hr></div><div class="book" title="O livro de mão do BibleTime"><div class="titlepage"><div><div><h1 class="title"><a name="idp28248012"></a>O livro de mão do <span class="application">BibleTime</span></h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Fred</span> <span class="surname">Saalbach</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Jeffrey</span> <span class="surname">Hoyt</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Martin</span> <span class="surname">Gruner</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Thomas</span> <span class="surname">Abthorpe</span></h3></div></div></div><div><p class="releaseinfo">2.10.1</p></div><div><p class="copyright">Copyright © 1999-2014 The <span class="application">BibleTime</span> Team</p></div><div><div class="legalnotice" title="Nota Legal"><a name="idp29314828"></a><p>O Manual do <span class="application">BibleTime</span> é distribuído como parte do programa <span class="application">BibleTime</span>.</p></div></div><div><div class="abstract" title="Resumo"><p class="title"><b>Resumo</b></p><p><span class="application">BibleTime</span> is a completely free Bible study program. The program's user
+interface is built with <span class="application">Qt</span> framework, which makes it run on several
+operating systems including Linux, Windows, FreeBSD and Mac OS X. The
+software uses the <span class="application">SWORD</span> programming library to work with over 200 free
+Bible texts, commentaries, dictionaries and books in over 50 languages
+provided by the <span class="application">Sociedade Bíblica Crosswire</span>.</p></div></div></div><hr></div><div class="toc"><p><b>Índice</b></p><dl><dt><span class="chapter"><a href="hdbk-intro.html">1. Introdução</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-intro.html#hdbk-intro-about">Sobre <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-works">Obras disponíveis</a></span></dt><dt><span class="sect2"><a href="hdbk-intro.html#hdbk-intro-motivation">Motivação</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="hdbk-term.html">2. Iniciando <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-term.html#hdbk-start">Como iniciar o <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-starting">Iniciando <span class="application">BibleTime</span></a></span></dt><dt><span class="sect2"><a href="hdbk-term.html#hdbk-start-custom">Personalização de início</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-start-firstrun.html">Iniciando <span class="application">BibleTime</span> pela primeira vez</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-op.html">3. Operação do programa</a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-op.html#hdbk-op-overview">Viso geral do programa</a></span></dt><dt><span class="sect1"><a href="hdbk-op-parts.html">Partes da janela de aplicação do <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-bookshelf">A Estante de Livros</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-mag">A Lupa</a></span></dt><dt><span class="sect2"><a href="hdbk-op-parts.html#hdbk-op-parts-desk">A Mesa</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-search.html">Buscando em obras</a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-intext">Procurando texto em uma janela de leitura aberta</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-access">Acessando o diálogo de busca</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-config">Configuração de pesquisa</a></span></dt><dt><span class="sect2"><a href="hdbk-op-search.html#hdbk-op-search-results">Resultados de busca</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-bookshelfmanager.html">O <span class="guimenuitem">Gerenciador da Estante</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-path">Configuração do(s) caminho(s) da Estante</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-installupdate">Instalar/atualizar obra(s)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-remove">Remover obra(s)</a></span></dt><dt><span class="sect2"><a href="hdbk-op-bookshelfmanager.html#hdbk-op-bookshelfmanager-searchindexes">índices de pesquisa</a></span></dt></dl></dd><dt><span class="sect1"><a href="hdbk-op-output.html">Exportando e Imprimindo</a></span></dt></dl></dd><dt><span class="chapter"><a href="hdbk-config.html">4. Configurando <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="hdbk-config.html#hdbk-config-bt">Diálogo de configuração do <span class="application">BibleTime</span></a></span></dt><dd><dl><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-display">
         <span class="guimenu">Exibir</span>
       </a></span></dt><dt><span class="sect2"><a href="hdbk-config.html#hdbk-config-bt-desk">
         <span class="guimenu">Mesa</span>
diff --git a/docs/handbook/pt_BR/pdf/handbook.pdf b/docs/handbook/pt_BR/pdf/handbook.pdf
new file mode 100644
index 0000000..24d3f23
--- /dev/null
+++ b/docs/handbook/pt_BR/pdf/handbook.pdf
diff --git a/docs/howto/ar/docbook/index.docbook b/docs/howto/ar/docbook/index.docbook
index b854205..ca38134 100644
--- a/docs/howto/ar/docbook/index.docbook
+++ b/docs/howto/ar/docbook/index.docbook
@@ -24,7 +24,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team
 (bt-devel@crosswire.org)</holder> </copyright>
   <legalnotice>
     <para>This document was originally created by Mr. Bob Harman and is licensed under
diff --git a/docs/howto/ar/html/index.html b/docs/howto/ar/html/index.html
index 65f8b02..f7e262d 100644
--- a/docs/howto/ar/html/index.html
+++ b/docs/howto/ar/html/index.html
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>&#1603;&#1610;&#1601;&#1610;&#1577; &#1583;&#1585;&#1575;&#1587;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="&#1578;&#1604;&#1582;&#1610;&#1589; The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605; team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="&#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;, &#1575;&#1583;&#1585;&#1587;, &#1603;&#1610;&#1601;&#1610;&#1577; &#1583;&#1585;&#1575;&#1587;&#1577;"><link rel="home" href="index.html" title="&#1603;&#1610;&#1601;&#1610;&#1577; &#1583;&#1585;&#1575;&#1587;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;"><link rel="next" href="h2-importance.html" title="&#1601;&#1589;&#1604; 1. &#1571;&#1607;&#1605;&#1610;&#1577; &#1603;&#1604;&#1605;&#1577; &#1575;&#1604;&#1604;&#1607;"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF" dir="rtl"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">&#1603;&#1610;&#1601;&#1610;&#1577; &#1583;&#1585;&#1575;&#1587;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;</th></tr><tr><td width="20%" align="right"> </td><th width="60%" align="center"> </th><td width="20%" align="left"> <a accesskey="n" href="h2-importance.html">&#1575;&#1604;&#1578;&#1575;&#1604;&#1610;</a></td></tr></table><hr></div><div class="book" title="&#1603;&#1610;&#1601;&#1610;&#1577; &#1583;&#1585;&#1575;&#1587;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467296"></a>&#1603;&#1610;&#1601;&#1610;&#1577; &#1583;&#1585;&#1575;&#1587;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">&#1576;&#1608;&#1576;</span> <span class="surname">&#1607;&#1575;&#1585;&#1605;&#1575;&#1606;</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">&#1581;&#1602;&#1608;&#1602; &#1575;&#1604;&#1606;&#1588;&#1585; © 1999-2013 The <span class="application">&#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</span> Team
-(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="&#1605;&#1604;&#1575;&#1581;&#1592;&#1577; &#1602;&#1575;&#1606;&#1608;&#1606;&#1610;&#1577;"><a name="idp26706720"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>&#1603;&#1610;&#1601;&#1610;&#1577; &#1583;&#1585;&#1575;&#1587;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="&#1578;&#1604;&#1582;&#1610;&#1589; The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the &#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605; team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="&#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;, &#1575;&#1583;&#1585;&#1587;, &#1603;&#1610;&#1601;&#1610;&#1577; &#1583;&#1585;&#1575;&#1587;&#1577;"><link rel="home" href="index.html" title="&#1603;&#1610;&#1601;&#1610;&#1577; &#1583;&#1585;&#1575;&#1587;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;"><link rel="next" href="h2-importance.html" title="&#1601;&#1589;&#1604; 1. &#1571;&#1607;&#1605;&#1610;&#1577; &#1603;&#1604;&#1605;&#1577; &#1575;&#1604;&#1604;&#1607;"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF" dir="rtl"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">&#1603;&#1610;&#1601;&#1610;&#1577; &#1583;&#1585;&#1575;&#1587;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;</th></tr><tr><td width="20%" align="right"> </td><th width="60%" align="center"> </th><td width="20%" align="left"> <a accesskey="n" href="h2-importance.html">&#1575;&#1604;&#1578;&#1575;&#1604;&#1610;</a></td></tr></table><hr></div><div class="book" title="&#1603;&#1610;&#1601;&#1610;&#1577; &#1583;&#1585;&#1575;&#1587;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;"><div class="titlepage"><div><div><h1 class="title"><a name="idp28251916"></a>&#1603;&#1610;&#1601;&#1610;&#1577; &#1583;&#1585;&#1575;&#1587;&#1577; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587;</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">&#1576;&#1608;&#1576;</span> <span class="surname">&#1607;&#1575;&#1585;&#1605;&#1575;&#1606;</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">&#1581;&#1602;&#1608;&#1602; &#1575;&#1604;&#1606;&#1588;&#1585; © 1999-2014 The <span class="application">&#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</span> Team
+(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="&#1605;&#1604;&#1575;&#1581;&#1592;&#1577; &#1602;&#1575;&#1606;&#1608;&#1606;&#1610;&#1577;"><a name="idp29329740"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
 the terms of the license <a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top"> "Creative Commons
 Attribution-Share Alike"</a>.</p><p>&#1606;&#1589;&#1608;&#1589; &#1575;&#1604;&#1603;&#1578;&#1575;&#1576; &#1575;&#1604;&#1605;&#1602;&#1583;&#1587; &#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577; &#1605;&#1602;&#1578;&#1576;&#1587;&#1577; &#1605;&#1606; &#1578;&#1585;&#1580;&#1605;&#1577; &#1587;&#1605;&#1610;&#1579; &#1601;&#1575;&#1606; &#1583;&#1575;&#1610;&#1603; &#1605;&#1575;&#1604;&#1605; &#1610;&#1584;&#1603;&#1585; &#1594;&#1610;&#1585; &#1584;&#1604;&#1603;.</p></div></div><div><div class="abstract" title="&#1578;&#1604;&#1582;&#1610;&#1589;"><p class="title"><b>&#1578;&#1604;&#1582;&#1610;&#1589;</b></p><p>The <span class="application">Biblestudy HowTo</span> is a guide for studying the
 Bible.</p><p>It is the hope of the <span class="application">&#1576;&#1610;&#1576;&#1604; &#1578;&#1575;&#1610;&#1605;</span> team that this HowTo will provoke the
diff --git a/docs/howto/bg/docbook/index.docbook b/docs/howto/bg/docbook/index.docbook
index 7d9b200..8185577 100644
--- a/docs/howto/bg/docbook/index.docbook
+++ b/docs/howto/bg/docbook/index.docbook
@@ -24,7 +24,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team
 (bt-devel@crosswire.org)</holder> </copyright>
   <legalnotice>
     <para>This document was originally created by Mr. Bob Harman and is licensed under
diff --git a/docs/howto/bg/html/index.html b/docs/howto/bg/html/index.html
index e9a8a19..31d971c 100644
--- a/docs/howto/bg/html/index.html
+++ b/docs/howto/bg/html/index.html
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>&#1056;&#1098;&#1082;&#1086;&#1074;&#1086;&#1076;&#1089;&#1090;&#1074;&#1086; &#1079;&#1072; &#1080;&#1079;&#1091;&#1095;&#1072;&#1074;&#1072;&#1085;&#1077; &#1085;&#1072; &#1041;&#1080;&#1073;&#1083;&#1080;&#1103;&#1090;&#1072;</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="&#1056;&#1077;&#1079;&#1102;&#1084;&#1077; The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Study, HowTo"><link rel="home" href="index.html" title="&#1056;&#1098;&#1082;&#1086;&#1074;&#1086;&#1076;&#1089;&#1090;&#1074;&#1086; &#1079;&#1072; &#1080;&#1079;&#1091;&#1095;&#1072;&#1074;&#1072;&#1085;&#1077; &#1085;&#1072; &#1041;&#1080;&#1073;&#1083;&#1080;&#1103;&#1090;&#1072;"><link rel="next" href="h2-importance.html" title="&#1043;&#1083;&#1072;&#1074;&#1072; 1. &#1042;&#1072;&#1078;&#1085;&#1086;&#1089;&#1090;&#1090;&#1072; &#1085;&#1072; &#1041;&#1086;&#1078;&#1080;&#1077;&#1090;&#1086; &#1057;&#1083;&#1086;&#1074;&#1086;"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">&#1056;&#1098;&#1082;&#1086;&#1074;&#1086;&#1076;&#1089;&#1090;&#1074;&#1086; &#1079;&#1072; &#1080;&#1079;&#1091;&#1095;&#1072;&#1074;&#1072;&#1085;&#1077; &#1085;&#1072; &#1041;&#1080;&#1073;&#1083;&#1080;&#1103;&#1090;&#1072;</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">&#1053;&#1072;&#1087;&#1088;&#1077;&#1076;</a></td></tr></table><hr></div><div class="book" title="&#1056;&#1098;&#1082;&#1086;&#1074;&#1086;&#1076;&#1089;&#1090;&#1074;&#1086; &#1079;&#1072; &#1080;&#1079;&#1091;&#1095;&#1072;&#1074;&#1072;&#1085;&#1077; &#1085;&#1072; &#1041;&#1080;&#1073;&#1083;&#1080;&#1103;&#1090;&#1072;"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467296"></a>&#1056;&#1098;&#1082;&#1086;&#1074;&#1086;&#1076;&#1089;&#1090;&#1074;&#1086; &#1079;&#1072; &#1080;&#1079;&#1091;&#1095;&#1072;&#1074;&#1072;&#1085;&#1077; &#1085;&#1072; &#1041;&#1080;&#1073;&#1083;&#1080;&#1103;&#1090;&#1072;</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">&#1040;&#1074;&#1090;&#1086;&#1088;&#1089;&#1082;&#1080; &#1087;&#1088;&#1072;&#1074;&#1072; © 1999-2013 The <span class="application">BibleTime</span> Team
-(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="&#1040;&#1074;&#1090;&#1086;&#1088;&#1089;&#1082;&#1080; &#1087;&#1088;&#1072;&#1074;&#1072;"><a name="idp26706720"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>&#1056;&#1098;&#1082;&#1086;&#1074;&#1086;&#1076;&#1089;&#1090;&#1074;&#1086; &#1079;&#1072; &#1080;&#1079;&#1091;&#1095;&#1072;&#1074;&#1072;&#1085;&#1077; &#1085;&#1072; &#1041;&#1080;&#1073;&#1083;&#1080;&#1103;&#1090;&#1072;</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="&#1056;&#1077;&#1079;&#1102;&#1084;&#1077; The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Study, HowTo"><link rel="home" href="index.html" title="&#1056;&#1098;&#1082;&#1086;&#1074;&#1086;&#1076;&#1089;&#1090;&#1074;&#1086; &#1079;&#1072; &#1080;&#1079;&#1091;&#1095;&#1072;&#1074;&#1072;&#1085;&#1077; &#1085;&#1072; &#1041;&#1080;&#1073;&#1083;&#1080;&#1103;&#1090;&#1072;"><link rel="next" href="h2-importance.html" title="&#1043;&#1083;&#1072;&#1074;&#1072; 1. &#1042;&#1072;&#1078;&#1085;&#1086;&#1089;&#1090;&#1090;&#1072; &#1085;&#1072; &#1041;&#1086;&#1078;&#1080;&#1077;&#1090;&#1086; &#1057;&#1083;&#1086;&#1074;&#1086;"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">&#1056;&#1098;&#1082;&#1086;&#1074;&#1086;&#1076;&#1089;&#1090;&#1074;&#1086; &#1079;&#1072; &#1080;&#1079;&#1091;&#1095;&#1072;&#1074;&#1072;&#1085;&#1077; &#1085;&#1072; &#1041;&#1080;&#1073;&#1083;&#1080;&#1103;&#1090;&#1072;</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">&#1053;&#1072;&#1087;&#1088;&#1077;&#1076;</a></td></tr></table><hr></div><div class="book" title="&#1056;&#1098;&#1082;&#1086;&#1074;&#1086;&#1076;&#1089;&#1090;&#1074;&#1086; &#1079;&#1072; &#1080;&#1079;&#1091;&#1095;&#1072;&#1074;&#1072;&#1085;&#1077; &#1085;&#1072; &#1041;&#1080;&#1073;&#1083;&#1080;&#1103;&#1090;&#1072;"><div class="titlepage"><div><div><h1 class="title"><a name="idp28247820"></a>&#1056;&#1098;&#1082;&#1086;&#1074;&#1086;&#1076;&#1089;&#1090;&#1074;&#1086; &#1079;&#1072; &#1080;&#1079;&#1091;&#1095;&#1072;&#1074;&#1072;&#1085;&#1077; &#1085;&#1072; &#1041;&#1080;&#1073;&#1083;&#1080;&#1103;&#1090;&#1072;</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">&#1040;&#1074;&#1090;&#1086;&#1088;&#1089;&#1082;&#1080; &#1087;&#1088;&#1072;&#1074;&#1072; © 1999-2014 The <span class="application">BibleTime</span> Team
+(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="&#1040;&#1074;&#1090;&#1086;&#1088;&#1089;&#1082;&#1080; &#1087;&#1088;&#1072;&#1074;&#1072;"><a name="idp29333836"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
 the terms of the license <a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top"> "Creative Commons
 Attribution-Share Alike"</a>.</p><p>Scripture quotes are from the New American Standard Bible unless otherwise
 indicated.</p></div></div><div><div class="abstract" title="&#1056;&#1077;&#1079;&#1102;&#1084;&#1077;"><p class="title"><b>&#1056;&#1077;&#1079;&#1102;&#1084;&#1077;</b></p><p>The <span class="application">Biblestudy HowTo</span> is a guide for studying the
diff --git a/docs/howto/cs/docbook/index.docbook b/docs/howto/cs/docbook/index.docbook
index 83c2015..d3b4af8 100644
--- a/docs/howto/cs/docbook/index.docbook
+++ b/docs/howto/cs/docbook/index.docbook
@@ -24,7 +24,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team
 (bt-devel@crosswire.org)</holder> </copyright>
   <legalnotice>
     <para>This document was originally created by Mr. Bob Harman and is licensed under
diff --git a/docs/howto/cs/html/index.html b/docs/howto/cs/html/index.html
index 1524892..6f0aaec 100644
--- a/docs/howto/cs/html/index.html
+++ b/docs/howto/cs/html/index.html
@@ -1,6 +1,6 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Jak studovat Bibli</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="P&#367;vodní anglické zn&#283;ní: The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Scripture quotes are from the New American Standard Bible unless otherwise
-indicated, HowTo"><link rel="home" href="index.html" title="Jak studovat Bibli"><link rel="next" href="h2-importance.html" title="Kapitola 1. Význam Bo&#382;ího Slova"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Jak studovat Bibli</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Dal&#353;í</a></td></tr></table><hr></div><div class="book" title="Jak studovat Bibli"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467296"></a>Jak studovat Bibli</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Copyright © 1999-2013 The <span class="application">BibleTime</span> Team
-(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Právní dolo&#382;ka"><a name="idp26710816"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
+indicated, HowTo"><link rel="home" href="index.html" title="Jak studovat Bibli"><link rel="next" href="h2-importance.html" title="Kapitola 1. Význam Bo&#382;ího Slova"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Jak studovat Bibli</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Dal&#353;í</a></td></tr></table><hr></div><div class="book" title="Jak studovat Bibli"><div class="titlepage"><div><div><h1 class="title"><a name="idp28247820"></a>Jak studovat Bibli</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Copyright © 1999-2014 The <span class="application">BibleTime</span> Team
+(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Právní dolo&#382;ka"><a name="idp29321548"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
 the terms of the license <a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top"> "Creative Commons
 Attribution-Share Alike"</a>.</p><p>Scripture quotes are from the New American Standard Bible unless otherwise
 indicated.</p></div></div><div><div class="abstract" title="P&#367;vodní anglické zn&#283;ní:"><p class="title"><b>P&#367;vodní anglické zn&#283;ní:</b></p><p>The <span class="application">Biblestudy HowTo</span> is a guide for studying the
diff --git a/docs/howto/da/docbook/index.docbook b/docs/howto/da/docbook/index.docbook
index 0c41cc5..79b07ce 100644
--- a/docs/howto/da/docbook/index.docbook
+++ b/docs/howto/da/docbook/index.docbook
@@ -24,7 +24,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team
 (bt-devel@crosswire.org)</holder> </copyright>
   <legalnotice>
     <para>This document was originally created by Mr. Bob Harman and is licensed under
diff --git a/docs/howto/da/html/index.html b/docs/howto/da/html/index.html
index 082e0bc..a60865b 100644
--- a/docs/howto/da/html/index.html
+++ b/docs/howto/da/html/index.html
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Guiden til Bibelstudie</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Abstrakt The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Studér, HowTo"><link rel="home" href="index.html" title="Guiden til Bibelstudie"><link rel="next" href="h2-importance.html" title="Kapitel 1. Vigtigheden af Guds Ord"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Guiden til Bibelstudie</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">næste</a></td></tr></table><hr></div><div class="book" title="Guiden til Bibelstudie"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467296"></a>Guiden til Bibelstudie</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Ophavsret © 1999-2013 The <span class="application">BibleTime</span> Team
-(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Retslig note"><a name="idp26710816"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Guiden til Bibelstudie</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Abstrakt The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Studér, HowTo"><link rel="home" href="index.html" title="Guiden til Bibelstudie"><link rel="next" href="h2-importance.html" title="Kapitel 1. Vigtigheden af Guds Ord"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Guiden til Bibelstudie</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">næste</a></td></tr></table><hr></div><div class="book" title="Guiden til Bibelstudie"><div class="titlepage"><div><div><h1 class="title"><a name="idp28247820"></a>Guiden til Bibelstudie</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Ophavsret © 1999-2014 The <span class="application">BibleTime</span> Team
+(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Retslig note"><a name="idp29321548"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
 the terms of the license <a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top"> "Creative Commons
 Attribution-Share Alike"</a>.</p><p>Skriftsteder er fra Bibelselskabets Autoriserede Bibel fra 1992, med mindre
 andet er indikeret.</p></div></div><div><div class="abstract" title="Abstrakt"><p class="title"><b>Abstrakt</b></p><p>The <span class="application">Biblestudy HowTo</span> is a guide for studying the
diff --git a/docs/howto/de/docbook/index.docbook b/docs/howto/de/docbook/index.docbook
index 7192595..0ac1bfe 100644
--- a/docs/howto/de/docbook/index.docbook
+++ b/docs/howto/de/docbook/index.docbook
@@ -24,7 +24,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team
 (bt-devel@crosswire.org)</holder> </copyright>
   <legalnotice>
     <para>Dieses Dokument wurde ursprünglich von Herrn Bob Harman erstellt und ist
diff --git a/docs/howto/de/html/index.html b/docs/howto/de/html/index.html
index c027b4f..d4a0980 100644
--- a/docs/howto/de/html/index.html
+++ b/docs/howto/de/html/index.html
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Die Anleitung zum Bibelstudium</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Zusammenfassung Die Anleitung zum Bibelstudium (Das Biblestudy HowTo) ist ein Handbuch zum Studieren der Bibel. Es ist die Hoffnung des BibleTime-Teams, dass diese Anleitung die Leser zum Studieren der Bibel bewegt, um zu sehen, was die Bibel zu sagen hat. Diese spezielle Anleitung wurde ausgewählt, da sie darauf achtet, keine bestimmte Bekenntnisgruppe zu fördern. Wir möchten Ihnen ans Herz legen, dass Sie die Bibel studieren, um zu verstehen, was in ihr steht. Wenn Sie mit der Einstellungherangehen, dass Sie wünschen, dass Gott Sein Wort in Ihr Herz sät, wird Er Sie nicht enttäuschen."><meta name="keywords" content="Bibel, Studium, Anleitung"><link rel="home" href="index.html" title="Die Anleitung zum Bibelstudium"><link rel="next" href="h2-importance.html" title="Kapitel 1. Bedeutung des Wortes Gottes"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Die Anleitung zum Bibelstudium</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Weiter</a></td></tr></table><hr></div><div class="book" title="Die Anleitung zum Bibelstudium"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467296"></a>Die Anleitung zum Bibelstudium</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">Das BibleTime-Team</span></h3></div></div></div><div><p class="copyright">Copyright © 1999-2013 The <span class="application">BibleTime</span> Team
-(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Rechtlicher Hinweis"><a name="idp26710816"></a><p>Dieses Dokument wurde ursprünglich von Herrn Bob Harman erstellt und ist
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Die Anleitung zum Bibelstudium</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Zusammenfassung Die Anleitung zum Bibelstudium (Das Biblestudy HowTo) ist ein Handbuch zum Studieren der Bibel. Es ist die Hoffnung des BibleTime-Teams, dass diese Anleitung die Leser zum Studieren der Bibel bewegt, um zu sehen, was die Bibel zu sagen hat. Diese spezielle Anleitung wurde ausgewählt, da sie darauf achtet, keine bestimmte Bekenntnisgruppe zu fördern. Wir möchten Ihnen ans Herz legen, dass Sie die Bibel studieren, um zu verstehen, was in ihr steht. Wenn Sie mit der Einstellungherangehen, dass Sie wünschen, dass Gott Sein Wort in Ihr Herz sät, wird Er Sie nicht enttäuschen."><meta name="keywords" content="Bibel, Studium, Anleitung"><link rel="home" href="index.html" title="Die Anleitung zum Bibelstudium"><link rel="next" href="h2-importance.html" title="Kapitel 1. Bedeutung des Wortes Gottes"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Die Anleitung zum Bibelstudium</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Weiter</a></td></tr></table><hr></div><div class="book" title="Die Anleitung zum Bibelstudium"><div class="titlepage"><div><div><h1 class="title"><a name="idp28247820"></a>Die Anleitung zum Bibelstudium</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">Das BibleTime-Team</span></h3></div></div></div><div><p class="copyright">Copyright © 1999-2014 The <span class="application">BibleTime</span> Team
+(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Rechtlicher Hinweis"><a name="idp29321548"></a><p>Dieses Dokument wurde ursprünglich von Herrn Bob Harman erstellt und ist
 unter die Bestimmungen der Lizenz <a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top"> "Creative Commons
 Attribution-Share Alike"</a> gestellt.</p><p><span class="emphasis"><em>Anm. des Übersetzers:</em></span> Der deutsche Text der
 Bibelstellen ist meistens der deutschen revidierten Lutherbibel von 1984
diff --git a/docs/howto/en/docbook/index.docbook b/docs/howto/en/docbook/index.docbook
index 37734ac..af236cf 100644
--- a/docs/howto/en/docbook/index.docbook
+++ b/docs/howto/en/docbook/index.docbook
@@ -24,7 +24,7 @@
   </authorgroup>
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
   <copyright>
-    <year>1999-2013</year>
+    <year>1999-2014</year>
     <holder>The &bibletime; Team (bt-devel@crosswire.org)</holder>
   </copyright>
   <legalnotice>
diff --git a/docs/howto/en/html/index.html b/docs/howto/en/html/index.html
index d39db3e..057201f 100644
--- a/docs/howto/en/html/index.html
+++ b/docs/howto/en/html/index.html
@@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The Biblestudy HowTo</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Abstract The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Study, HowTo"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="next" href="h2-importance.html" title="Chapter 1. Importance of God's Word"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The Biblestudy HowTo</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Next</a></td></tr></table><hr></div><div class="book" title="The Biblestudy HowTo"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467296"></a>The Biblestudy HowTo</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Copyright © 1999-2013 The <span class="application">BibleTime</span> Team (bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Legal Notice"><a name="idp26710816"></a><p>This document was originally created by Mr. Bob Harman and is
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The Biblestudy HowTo</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Abstract The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Study, HowTo"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="next" href="h2-importance.html" title="Chapter 1. Importance of God's Word"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The Biblestudy HowTo</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Next</a></td></tr></table><hr></div><div class="book" title="The Biblestudy HowTo"><div class="titlepage"><div><div><h1 class="title"><a name="idp28251916"></a>The Biblestudy HowTo</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Copyright © 1999-2014 The <span class="application">BibleTime</span> Team (bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Legal Notice"><a name="idp29333836"></a><p>This document was originally created by Mr. Bob Harman and is
       licensed under the terms of the license 
       <a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top">
       "Creative Commons Attribution-Share Alike"</a>.</p><p>Scripture quotes are from the New American Standard Bible
diff --git a/docs/howto/es/docbook/index.docbook b/docs/howto/es/docbook/index.docbook
index 4265c8d..5f464d5 100644
--- a/docs/howto/es/docbook/index.docbook
+++ b/docs/howto/es/docbook/index.docbook
@@ -24,7 +24,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team
 (bt-devel@crosswire.org)</holder> </copyright>
   <legalnotice>
     <para>This document was originally created by Mr. Bob Harman and is licensed under
diff --git a/docs/howto/es/html/index.html b/docs/howto/es/html/index.html
index d4e2a75..737085d 100644
--- a/docs/howto/es/html/index.html
+++ b/docs/howto/es/html/index.html
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>El Cómo Estudiar la Biblia</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Resumen The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Estudio, HowTo"><link rel="home" href="index.html" title="El Cómo Estudiar la Biblia"><link rel="next" href="h2-importance.html" title="Capítulo 1. Importancia de la Palabra de Dios"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">El Cómo Estudiar la Biblia</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Siguiente</a></td></tr></table><hr></div><div class="book" title="El Cómo Estudiar la Biblia"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467296"></a>El Cómo Estudiar la Biblia</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Copyright © 1999-2013 The <span class="application">BibleTime</span> Team
-(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Aviso Legal"><a name="idp26710880"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>El Cómo Estudiar la Biblia</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Resumen The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Estudio, HowTo"><link rel="home" href="index.html" title="El Cómo Estudiar la Biblia"><link rel="next" href="h2-importance.html" title="Capítulo 1. Importancia de la Palabra de Dios"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">El Cómo Estudiar la Biblia</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Siguiente</a></td></tr></table><hr></div><div class="book" title="El Cómo Estudiar la Biblia"><div class="titlepage"><div><div><h1 class="title"><a name="idp28247820"></a>El Cómo Estudiar la Biblia</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Copyright © 1999-2014 The <span class="application">BibleTime</span> Team
+(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Aviso Legal"><a name="idp29321612"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
 the terms of the license <a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top"> "Creative Commons
 Attribution-Share Alike"</a>.</p><p>Citas bíblicas son de la New American Standard Bible menos que se indique lo
 contrario. [Nota del traductor: En la mayor parte de las citas usé
diff --git a/docs/howto/fi/docbook/index.docbook b/docs/howto/fi/docbook/index.docbook
index 433c6cf..a183720 100644
--- a/docs/howto/fi/docbook/index.docbook
+++ b/docs/howto/fi/docbook/index.docbook
@@ -24,7 +24,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team
 (bt-devel@crosswire.org)</holder> </copyright>
   <legalnotice>
     <para>This document was originally created by Mr. Bob Harman and is licensed under
diff --git a/docs/howto/fi/html/index.html b/docs/howto/fi/html/index.html
index b834ebe..a244504 100644
--- a/docs/howto/fi/html/index.html
+++ b/docs/howto/fi/html/index.html
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Raamatuntutkimisen HowTo</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Abstrakti The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Tutki, HowTo"><link rel="home" href="index.html" title="Raamatuntutkimisen HowTo"><link rel="next" href="h2-importance.html" title="Luku 1. Jumalan Sanan tärkeys"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Raamatuntutkimisen HowTo</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Seuraava</a></td></tr></table><hr></div><div class="book" title="Raamatuntutkimisen HowTo"><div class="titlepage"><div><div><h1 class="title"><a name="idp25457120"></a>Raamatuntutkimisen HowTo</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Tekijänoikeudet © 1999-2013 The <span class="application">BibleTime</span> Team
-(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Oikeudellinen ilmoitus"><a name="idp26706720"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Raamatuntutkimisen HowTo</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Abstrakti The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Tutki, HowTo"><link rel="home" href="index.html" title="Raamatuntutkimisen HowTo"><link rel="next" href="h2-importance.html" title="Luku 1. Jumalan Sanan tärkeys"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Raamatuntutkimisen HowTo</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Seuraava</a></td></tr></table><hr></div><div class="book" title="Raamatuntutkimisen HowTo"><div class="titlepage"><div><div><h1 class="title"><a name="idp28247820"></a>Raamatuntutkimisen HowTo</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Tekijänoikeudet © 1999-2014 The <span class="application">BibleTime</span> Team
+(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Oikeudellinen ilmoitus"><a name="idp29321548"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
 the terms of the license <a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top"> "Creative Commons
 Attribution-Share Alike"</a>.</p><p>Tekstien lainausmerkit ovat peräisin uudesta amerikkalaisesta
 standardi-Raamatusta, jos ei muuta ole sanottu</p></div></div><div><div class="abstract" title="Abstrakti"><p class="title"><b>Abstrakti</b></p><p>The <span class="application">Biblestudy HowTo</span> is a guide for studying the
diff --git a/docs/howto/fr/docbook/index.docbook b/docs/howto/fr/docbook/index.docbook
index 23a7921..378538b 100644
--- a/docs/howto/fr/docbook/index.docbook
+++ b/docs/howto/fr/docbook/index.docbook
@@ -24,7 +24,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team
 (bt-devel@crosswire.org)</holder> </copyright>
   <legalnotice>
     <para>This document was originally created by Mr. Bob Harman and is licensed under
diff --git a/docs/howto/fr/html/index.html b/docs/howto/fr/html/index.html
index a63a05d..0855bdc 100644
--- a/docs/howto/fr/html/index.html
+++ b/docs/howto/fr/html/index.html
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Tutoriel d'étude biblique</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Résumé The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Étude, Tutoriel"><link rel="home" href="index.html" title="Tutoriel d'étude biblique"><link rel="next" href="h2-importance.html" title="Chapitre 1. Importance de la Parole de Dieu"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Tutoriel d'étude biblique</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Suivant</a></td></tr></table><hr></div><div class="book" title="Tutoriel d'étude biblique"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467296"></a>Tutoriel d'étude biblique</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Copyright © 1999-2013 The <span class="application">BibleTime</span> Team
-(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Note légale"><a name="idp26710880"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Tutoriel d'étude biblique</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Résumé The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Étude, Tutoriel"><link rel="home" href="index.html" title="Tutoriel d'étude biblique"><link rel="next" href="h2-importance.html" title="Chapitre 1. Importance de la Parole de Dieu"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Tutoriel d'étude biblique</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Suivant</a></td></tr></table><hr></div><div class="book" title="Tutoriel d'étude biblique"><div class="titlepage"><div><div><h1 class="title"><a name="idp28247820"></a>Tutoriel d'étude biblique</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Copyright © 1999-2014 The <span class="application">BibleTime</span> Team
+(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Note légale"><a name="idp29321612"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
 the terms of the license <a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top"> "Creative Commons
 Attribution-Share Alike"</a>.</p><p>Scripture quotes are from the New American Standard Bible unless otherwise
 indicated.</p></div></div><div><div class="abstract" title="Résumé"><p class="title"><b>Résumé</b></p><p>The <span class="application">Biblestudy HowTo</span> is a guide for studying the
diff --git a/docs/howto/hu/docbook/index.docbook b/docs/howto/hu/docbook/index.docbook
index ac32e95..f4236b4 100644
--- a/docs/howto/hu/docbook/index.docbook
+++ b/docs/howto/hu/docbook/index.docbook
@@ -24,7 +24,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team
 (bt-devel@crosswire.org)</holder> </copyright>
   <legalnotice>
     <para>This document was originally created by Mr. Bob Harman and is licensed under
diff --git a/docs/howto/hu/html/index.html b/docs/howto/hu/html/index.html
index 671efcf..900551c 100644
--- a/docs/howto/hu/html/index.html
+++ b/docs/howto/hu/html/index.html
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Hogyan tanulmányozza a Bibliát</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Vázlat The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Tanulmányozni, HowTo"><link rel="home" href="index.html" title="Hogyan tanulmányozza a Bibliát"><link rel="next" href="h2-importance.html" title="1. fejezet - Isten szavának jelent&#337;sége"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Hogyan tanulmányozza a Bibliát</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">El&#337;re</a></td></tr></table><hr></div><div class="book" title="Hogyan tanulmányozza a Bibliát"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467296"></a>Hogyan tanulmányozza a Bibliát</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="surname">Harman</span>, <span class="firstname">Bob</span></h3></div><div class="author"><h3 class="author"><span class="surname">The BibleTime Team</span>, <span class="firstname"></span></h3></div></div></div><div><p class="copyright">Szerz&#337;i jog © 1999-2013 The <span class="application">BibleTime</span> Team
-(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Jogi közlemény"><a name="idp26710816"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Hogyan tanulmányozza a Bibliát</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Vázlat The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Tanulmányozni, HowTo"><link rel="home" href="index.html" title="Hogyan tanulmányozza a Bibliát"><link rel="next" href="h2-importance.html" title="1. fejezet - Isten szavának jelent&#337;sége"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Hogyan tanulmányozza a Bibliát</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">El&#337;re</a></td></tr></table><hr></div><div class="book" title="Hogyan tanulmányozza a Bibliát"><div class="titlepage"><div><div><h1 class="title"><a name="idp28247820"></a>Hogyan tanulmányozza a Bibliát</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="surname">Harman</span>, <span class="firstname">Bob</span></h3></div><div class="author"><h3 class="author"><span class="surname">The BibleTime Team</span>, <span class="firstname"></span></h3></div></div></div><div><p class="copyright">Szerz&#337;i jog © 1999-2014 The <span class="application">BibleTime</span> Team
+(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Jogi közlemény"><a name="idp29321548"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
 the terms of the license <a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top"> "Creative Commons
 Attribution-Share Alike"</a>.</p><p>Az idézetek a Károli Gáspár -féle Bibliából származnak, kivéve a külön
 jelzettek.</p></div></div><div><div class="abstract" title="Vázlat"><p class="title"><b>Vázlat</b></p><p>The <span class="application">Biblestudy HowTo</span> is a guide for studying the
diff --git a/docs/howto/it/docbook/index.docbook b/docs/howto/it/docbook/index.docbook
index e04edc3..21d801d 100644
--- a/docs/howto/it/docbook/index.docbook
+++ b/docs/howto/it/docbook/index.docbook
@@ -24,7 +24,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team
 (bt-devel@crosswire.org)</holder> </copyright>
   <legalnotice>
     <para>This document was originally created by Mr. Bob Harman and is licensed under
diff --git a/docs/howto/it/html/index.html b/docs/howto/it/html/index.html
index 86b3270..fb65624 100644
--- a/docs/howto/it/html/index.html
+++ b/docs/howto/it/html/index.html
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>HowTo sullo studio della Bibbia</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Sommario The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bibbia, Studio, HowTo"><link rel="home" href="index.html" title="HowTo sullo studio della Bibbia"><link rel="next" href="h2-importance.html" title="Capitolo 1. L'importanza della Parola di Dio"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">HowTo sullo studio della Bibbia</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Avanti</a></td></tr></table><hr></div><div class="book" title="HowTo sullo studio della Bibbia"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467296"></a>HowTo sullo studio della Bibbia</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Diritto d'autore © 1999-2013 The <span class="application">BibleTime</span> Team
-(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Nota Legale"><a name="idp26710816"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>HowTo sullo studio della Bibbia</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Sommario The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bibbia, Studio, HowTo"><link rel="home" href="index.html" title="HowTo sullo studio della Bibbia"><link rel="next" href="h2-importance.html" title="Capitolo 1. L'importanza della Parola di Dio"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">HowTo sullo studio della Bibbia</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Avanti</a></td></tr></table><hr></div><div class="book" title="HowTo sullo studio della Bibbia"><div class="titlepage"><div><div><h1 class="title"><a name="idp28247820"></a>HowTo sullo studio della Bibbia</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Diritto d'autore © 1999-2014 The <span class="application">BibleTime</span> Team
+(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Nota Legale"><a name="idp29321548"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
 the terms of the license <a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top"> "Creative Commons
 Attribution-Share Alike"</a>.</p><p>I testi citati dalla Bibbia sono presi dal testo ufficiale della CEI</p></div></div><div><div class="abstract" title="Sommario"><p class="title"><b>Sommario</b></p><p>The <span class="application">Biblestudy HowTo</span> is a guide for studying the
 Bible.</p><p>It is the hope of the <span class="application">BibleTime</span> team that this HowTo will provoke the
diff --git a/docs/howto/ko/docbook/index.docbook b/docs/howto/ko/docbook/index.docbook
index 4e04ed6..24696bc 100644
--- a/docs/howto/ko/docbook/index.docbook
+++ b/docs/howto/ko/docbook/index.docbook
@@ -24,7 +24,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team
 (bt-devel@crosswire.org)</holder> </copyright>
   <legalnotice>
     <para>This document was originally created by Mr. Bob Harman and is licensed under
diff --git a/docs/howto/ko/html/index.html b/docs/howto/ko/html/index.html
index fb61ed7..413b851 100644
--- a/docs/howto/ko/html/index.html
+++ b/docs/howto/ko/html/index.html
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>&#48148;&#51060;&#48660;&#49828;&#53552;&#46356; &#54616;&#50864;&#53804;</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="&#44060;&#50836; The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, &#44277;&#48512;, HowTo"><link rel="home" href="index.html" title="&#48148;&#51060;&#48660;&#49828;&#53552;&#46356; &#54616;&#50864;&#53804;"><link rel="next" href="h2-importance.html" title="1&#51109;. &#54616;&#45208;&#45784;&#51032; &#47568;&#50432;&#51032; &#51473;&#50836;&#49457;"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">&#48148;&#51060;&#48660;&#49828;&#53552;&#46356; &#54616;&#50864;&#53804;</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">&#45796;&#51020;</a></td></tr></table><hr></div><div class="book" title="&#48148;&#51060;&#48660;&#49828;&#53552;&#46356; &#54616;&#50864;&#53804;"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467296"></a>&#48148;&#51060;&#48660;&#49828;&#53552;&#46356; &#54616;&#50864;&#53804;</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">&#51200;&#51089;&#44428; © 1999-2013 The <span class="application">BibleTime</span> Team
-(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="&#48277;&#51201; &#44277;&#51648;"><a name="idp26710816"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>&#48148;&#51060;&#48660;&#49828;&#53552;&#46356; &#54616;&#50864;&#53804;</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="&#44060;&#50836; The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, &#44277;&#48512;, HowTo"><link rel="home" href="index.html" title="&#48148;&#51060;&#48660;&#49828;&#53552;&#46356; &#54616;&#50864;&#53804;"><link rel="next" href="h2-importance.html" title="1&#51109;. &#54616;&#45208;&#45784;&#51032; &#47568;&#50432;&#51032; &#51473;&#50836;&#49457;"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">&#48148;&#51060;&#48660;&#49828;&#53552;&#46356; &#54616;&#50864;&#53804;</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">&#45796;&#51020;</a></td></tr></table><hr></div><div class="book" title="&#48148;&#51060;&#48660;&#49828;&#53552;&#46356; &#54616;&#50864;&#53804;"><div class="titlepage"><div><div><h1 class="title"><a name="idp28247820"></a>&#48148;&#51060;&#48660;&#49828;&#53552;&#46356; &#54616;&#50864;&#53804;</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">&#51200;&#51089;&#44428; © 1999-2014 The <span class="application">BibleTime</span> Team
+(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="&#48277;&#51201; &#44277;&#51648;"><a name="idp29321548"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
 the terms of the license <a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top"> "Creative Commons
 Attribution-Share Alike"</a>.</p><p>Scripture quotes are from the New American Standard Bible unless otherwise
 indicated.</p></div></div><div><div class="abstract" title="&#44060;&#50836;"><p class="title"><b>&#44060;&#50836;</b></p><p>The <span class="application">Biblestudy HowTo</span> is a guide for studying the
diff --git a/docs/howto/nl/docbook/index.docbook b/docs/howto/nl/docbook/index.docbook
index c560ea1..2f0cc9b 100644
--- a/docs/howto/nl/docbook/index.docbook
+++ b/docs/howto/nl/docbook/index.docbook
@@ -24,7 +24,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team
 (bt-devel@crosswire.org)</holder> </copyright>
   <legalnotice>
     <para>This document was originally created by Mr. Bob Harman and is licensed under
diff --git a/docs/howto/nl/html/index.html b/docs/howto/nl/html/index.html
index 16e82bd..05f05cf 100644
--- a/docs/howto/nl/html/index.html
+++ b/docs/howto/nl/html/index.html
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Bijbelstudie HowTo</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Overzicht The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Bestuderen, HowTo"><link rel="home" href="index.html" title="Bijbelstudie HowTo"><link rel="next" href="h2-importance.html" title="Hoofdstuk 1. Het belang van Gods Woord"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Bijbelstudie HowTo</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Volgende</a></td></tr></table><hr></div><div class="book" title="Bijbelstudie HowTo"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467296"></a>Bijbelstudie HowTo</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Copyright © 1999-2013 The <span class="application">BibleTime</span> Team
-(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Juridische kennisgeving"><a name="idp26710816"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Bijbelstudie HowTo</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Overzicht The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, Bestuderen, HowTo"><link rel="home" href="index.html" title="Bijbelstudie HowTo"><link rel="next" href="h2-importance.html" title="Hoofdstuk 1. Het belang van Gods Woord"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Bijbelstudie HowTo</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Volgende</a></td></tr></table><hr></div><div class="book" title="Bijbelstudie HowTo"><div class="titlepage"><div><div><h1 class="title"><a name="idp28251916"></a>Bijbelstudie HowTo</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">Copyright © 1999-2014 The <span class="application">BibleTime</span> Team
+(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Juridische kennisgeving"><a name="idp29301068"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
 the terms of the license <a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top"> "Creative Commons
 Attribution-Share Alike"</a>.</p><p>Scripture quotes are from the New American Standard Bible unless otherwise
 indicated.</p></div></div><div><div class="abstract" title="Overzicht"><p class="title"><b>Overzicht</b></p><p>The <span class="application">Biblestudy HowTo</span> is a guide for studying the
diff --git a/docs/howto/pt_BR/docbook/index.docbook b/docs/howto/pt_BR/docbook/index.docbook
index be906b9..a8e4721 100644
--- a/docs/howto/pt_BR/docbook/index.docbook
+++ b/docs/howto/pt_BR/docbook/index.docbook
@@ -24,7 +24,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team
 (bt-devel@crosswire.org)</holder> </copyright>
   <legalnotice>
     <para>Este documento foi originalmente criado pelo Sr. Bob Harman e é licenciado
diff --git a/docs/howto/pt_BR/html/index.html b/docs/howto/pt_BR/html/index.html
index 4d9fa0a..c2c43f1 100644
--- a/docs/howto/pt_BR/html/index.html
+++ b/docs/howto/pt_BR/html/index.html
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Estudo Bíblico HowTo</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Resumo O Estudo Bíblico HowTo é um guia para estudo da Bíblia. A esperança do time do BibleTime é que esse Como Fazer incentive os leitores a estudar as escrituras e ver o que elas dizem. Esse guia de estudo particular foi escolhido porque não promove nenhuma doutrina denominacional em particular. Nós esperamos que você leia e estude as escrituras para entender o que elas dizem. Se você começar com a atitude de querer que o Senhor mostre sua Palavra em seu coração, Ele não desapontará você."><meta name="keywords" content="Bíblia, Estudo, Como fazer"><link rel="home" href="index.html" title="Estudo Bíblico HowTo"><link rel="next" href="h2-importance.html" title="Capítulo 1. Importância da Palavra de Deus"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Estudo Bíblico HowTo</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Próxima</a></td></tr></table><hr></div><div class="book" title="Estudo Bíblico HowTo"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467296"></a>Estudo Bíblico HowTo</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">O Time BibleTime</span></h3></div></div></div><div><p class="copyright">Copyright © 1999-2013 The <span class="application">BibleTime</span> Team
-(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Nota Legal"><a name="idp26710816"></a><p>Este documento foi originalmente criado pelo Sr. Bob Harman e é licenciado
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Estudo Bíblico HowTo</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="Resumo O Estudo Bíblico HowTo é um guia para estudo da Bíblia. A esperança do time do BibleTime é que esse Como Fazer incentive os leitores a estudar as escrituras e ver o que elas dizem. Esse guia de estudo particular foi escolhido porque não promove nenhuma doutrina denominacional em particular. Nós esperamos que você leia e estude as escrituras para entender o que elas dizem. Se você começar com a atitude de querer que o Senhor mostre sua Palavra em seu coração, Ele não desapontará você."><meta name="keywords" content="Bíblia, Estudo, Como fazer"><link rel="home" href="index.html" title="Estudo Bíblico HowTo"><link rel="next" href="h2-importance.html" title="Capítulo 1. Importância da Palavra de Deus"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Estudo Bíblico HowTo</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">Próxima</a></td></tr></table><hr></div><div class="book" title="Estudo Bíblico HowTo"><div class="titlepage"><div><div><h1 class="title"><a name="idp28251916"></a>Estudo Bíblico HowTo</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">O Time BibleTime</span></h3></div></div></div><div><p class="copyright">Copyright © 1999-2014 The <span class="application">BibleTime</span> Team
+(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="Nota Legal"><a name="idp29329740"></a><p>Este documento foi originalmente criado pelo Sr. Bob Harman e é licenciado
 pelos termos da licença<a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top"> "Creative Commons
 Attribution-Share Alike"</a>.</p><p>Citações das Escrituras no original em inglês são da New American Standard
 Bible.Na tradução em português foi usada a edição Almeida e Corrigida Fiel
diff --git a/docs/howto/ru/docbook/index.docbook b/docs/howto/ru/docbook/index.docbook
index b86d18e..fc6e9b8 100644
--- a/docs/howto/ru/docbook/index.docbook
+++ b/docs/howto/ru/docbook/index.docbook
@@ -24,7 +24,7 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright> <year>1999-2013</year> <holder>The &bibletime; Team
+<copyright> <year>1999-2014</year> <holder>The &bibletime; Team
 (bt-devel@crosswire.org)</holder> </copyright>
   <legalnotice>
     <para>This document was originally created by Mr. Bob Harman and is licensed under
diff --git a/docs/howto/ru/html/index.html b/docs/howto/ru/html/index.html
index 54f4914..b53667b 100644
--- a/docs/howto/ru/html/index.html
+++ b/docs/howto/ru/html/index.html
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>&#1050;&#1072;&#1082; &#1080;&#1079;&#1091;&#1095;&#1072;&#1090;&#1100; &#1041;&#1080;&#1073;&#1083;&#1080;&#1102;</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="&#1056;&#1077;&#1079;&#1102;&#1084;&#1077; The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, &#1048;&#1079;&#1091;&#1095;&#1072;&#1090;&#1100;, HowTo"><link rel="home" href="index.html" title="&#1050;&#1072;&#1082; &#1080;&#1079;&#1091;&#1095;&#1072;&#1090;&#1100; &#1041;&#1080;&#1073;&#1083;&#1080;&#1102;"><link rel="next" href="h2-importance.html" title="&#1043;&#1083;&#1072;&#1074;&#1072; 1. &#1042;&#1072;&#1078;&#1085;&#1086;&#1089;&#1090;&#1100; &#1057;&#1083;&#1086;&#1074;&#1072; &#1041;&#1086;&#1078;&#1100;&#1077;&#1075;&#1086;"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">&#1050;&#1072;&#1082; &#1080;&#1079;&#1091;&#1095;&#1072;&#1090;&#1100; &#1041;&#1080;&#1073;&#1083;&#1080;&#1102;</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">&#1057;&#1083;&#1077;&#1076;.</a></td></tr></table><hr></div><div class="book" title="&#1050;&#1072;&#1082; &#1080;&#1079;&#1091;&#1095;&#1072;&#1090;&#1100; &#1041;&#1080;&#1073;&#1083;&#1080;&#1102;"><div class="titlepage"><div><div><h1 class="title"><a name="idp25467296"></a>&#1050;&#1072;&#1082; &#1080;&#1079;&#1091;&#1095;&#1072;&#1090;&#1100; &#1041;&#1080;&#1073;&#1083;&#1080;&#1102;</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">&#1040;&#1074;&#1090;&#1086;&#1088;&#1089;&#1082;&#1080;&#1077; &#1087;&#1088;&#1072;&#1074;&#1072; © 1999-2013 The <span class="application">BibleTime</span> Team
-(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="&#1070;&#1088;&#1080;&#1076;&#1080;&#1095;&#1077;&#1089;&#1082;&#1086;&#1077; &#1091;&#1074;&#1077;&#1076;&#1086;&#1084;&#1083;&#1077;&#1085;&#1080;&#1077;"><a name="idp26710816"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>&#1050;&#1072;&#1082; &#1080;&#1079;&#1091;&#1095;&#1072;&#1090;&#1100; &#1041;&#1080;&#1073;&#1083;&#1080;&#1102;</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="&#1056;&#1077;&#1079;&#1102;&#1084;&#1077; The Biblestudy HowTo is a guide for studying the Bible. It is the hope of the BibleTime team that this HowTo will provoke the readers to study the scriptures to see what they say. This particular study guide has been chosen as it takes care not to advocate any particular denominational doctrine. We recommend you to read and study the scriptures to understand what they say. If you start with the attitude that you want to have the Lord sow his word in your heart He will not disappoint you."><meta name="keywords" content="Bible, &#1048;&#1079;&#1091;&#1095;&#1072;&#1090;&#1100;, HowTo"><link rel="home" href="index.html" title="&#1050;&#1072;&#1082; &#1080;&#1079;&#1091;&#1095;&#1072;&#1090;&#1100; &#1041;&#1080;&#1073;&#1083;&#1080;&#1102;"><link rel="next" href="h2-importance.html" title="&#1043;&#1083;&#1072;&#1074;&#1072; 1. &#1042;&#1072;&#1078;&#1085;&#1086;&#1089;&#1090;&#1100; &#1057;&#1083;&#1086;&#1074;&#1072; &#1041;&#1086;&#1078;&#1100;&#1077;&#1075;&#1086;"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">&#1050;&#1072;&#1082; &#1080;&#1079;&#1091;&#1095;&#1072;&#1090;&#1100; &#1041;&#1080;&#1073;&#1083;&#1080;&#1102;</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="h2-importance.html">&#1057;&#1083;&#1077;&#1076;.</a></td></tr></table><hr></div><div class="book" title="&#1050;&#1072;&#1082; &#1080;&#1079;&#1091;&#1095;&#1072;&#1090;&#1100; &#1041;&#1080;&#1073;&#1083;&#1080;&#1102;"><div class="titlepage"><div><div><h1 class="title"><a name="idp28247820"></a>&#1050;&#1072;&#1082; &#1080;&#1079;&#1091;&#1095;&#1072;&#1090;&#1100; &#1041;&#1080;&#1073;&#1083;&#1080;&#1102;</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Bob</span> <span class="surname">Harman</span></h3></div><div class="author"><h3 class="author"><span class="firstname"></span> <span class="surname">The BibleTime Team</span></h3></div></div></div><div><p class="copyright">&#1040;&#1074;&#1090;&#1086;&#1088;&#1089;&#1082;&#1080;&#1077; &#1087;&#1088;&#1072;&#1074;&#1072; © 1999-2014 The <span class="application">BibleTime</span> Team
+(bt-devel@crosswire.org)</p></div><div><div class="legalnotice" title="&#1070;&#1088;&#1080;&#1076;&#1080;&#1095;&#1077;&#1089;&#1082;&#1086;&#1077; &#1091;&#1074;&#1077;&#1076;&#1086;&#1084;&#1083;&#1077;&#1085;&#1080;&#1077;"><a name="idp29321548"></a><p>This document was originally created by Mr. Bob Harman and is licensed under
 the terms of the license <a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top"> "Creative Commons
 Attribution-Share Alike"</a>.</p><p>Scripture quotes are from the New American Standard Bible unless otherwise
 indicated.</p></div></div><div><div class="abstract" title="&#1056;&#1077;&#1079;&#1102;&#1084;&#1077;"><p class="title"><b>&#1056;&#1077;&#1079;&#1102;&#1084;&#1077;</b></p><p>The <span class="application">Biblestudy HowTo</span> is a guide for studying the
diff --git a/i18n/handbook/handbook-ar.po b/i18n/handbook/handbook-ar.po
index a5b1e74..e464f82 100644
--- a/i18n/handbook/handbook-ar.po
+++ b/i18n/handbook/handbook-ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 10:53-0300\n"
+"POT-Creation-Date: 2014-01-04 00:43-0500\n"
 "PO-Revision-Date: 2010-12-14 15:56+0200\n"
 "Last-Translator: Andrew Alfy <andrewalfy@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -899,9 +899,9 @@ msgid ""
 "read mode. You will not be able to edit it in this mode. Should you wish to "
 "write annotations into the personal commentary, you have to open it with the "
 "<mousebutton>right</mousebutton> mouse button and then select <guimenu>Edit "
-"this work</guimenu> and then either <guimenuitem>Plain text</guimenuitem>"
-"(source code editor) or <guimenuitem>HTML</guimenuitem>(basic gui wysiwyg "
-"editor)."
+"this work</guimenu> and then either <guimenuitem>Plain text</"
+"guimenuitem>(source code editor) or <guimenuitem>HTML</guimenuitem>(basic "
+"gui wysiwyg editor)."
 msgstr ""
 "إذا قمت ب�تح كتاب التعليقات الشخصية بالنقر على أيقونته من ر� الكتب بزر "
 "ال�أرة <mousebutton>الأيسر</mousebutton>، سي�تح العنصر �ي وضع القراءة ولن "
@@ -1029,10 +1029,10 @@ msgstr "إختيار الكتب"
 #. type: Content of: <chapter><sect1><sect2><sect3><para>
 #: docs/handbook/en/docbook/hdbk-operation.docbook:252
 msgid ""
-"At the top of the options tab you will find <guibutton>Choose</guibutton>"
-"(works). If you would like to search in multiple works, click on this button "
-"and you will be offered a menu where you can select the works you want to "
-"search in."
+"At the top of the options tab you will find <guibutton>Choose</"
+"guibutton>(works). If you would like to search in multiple works, click on "
+"this button and you will be offered a menu where you can select the works "
+"you want to search in."
 msgstr ""
 "على رأس لسان الخيارات ستجد <guibutton>اختر</guibutton> (الكتب). إذا كنت تريد "
 "البحث �ي عدة كتب، انقر على هذا الزر وسي�تح لك هذا قائمة تستطيع من خلالها "
@@ -3280,13 +3280,13 @@ msgstr "Abthorpe"
 #: docs/handbook/en/docbook/index.docbook:44
 #, fuzzy
 #| msgid ""
-#| "<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> "
+#| "<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> "
 #| "</copyright>"
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> </"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> </"
 "copyright>"
 msgstr ""
-"<copyright> <year>1999-2013</year> <holder>�ريق بيبل تايم</holder> </"
+"<copyright> <year>1999-2014</year> <holder>�ريق بيبل تايم</holder> </"
 "copyright>"
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
@@ -3299,22 +3299,30 @@ msgstr "يوزع دليل إستخدام بيبل تايم مع برنامج دØ
 #: docs/handbook/en/docbook/index.docbook:54
 #, fuzzy
 #| msgid "<date>December 2010</date>"
-msgid "<date>January 2012</date>"
+msgid "<date>January 2014</date>"
 msgstr "<date>ديسمبر 2010 </date>"
 
 #. type: Content of: <book><bookinfo><releaseinfo>
 #: docs/handbook/en/docbook/index.docbook:56
-msgid "2.9.2"
+msgid "2.10.1"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><abstract><para>
 #: docs/handbook/en/docbook/index.docbook:59
+#, fuzzy
+#| msgid ""
+#| "&bibletime; is a completely free Bible study program. The program's user "
+#| "interface is built with &qt; framework, which makes it run on several "
+#| "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
+#| "software uses the &sword; programming library to work with over 200 free "
+#| "Bible texts, commentaries, dictionaries and books provided by the &cbs;."
 msgid ""
 "&bibletime; is a completely free Bible study program. The program's user "
 "interface is built with &qt; framework, which makes it run on several "
 "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
 "software uses the &sword; programming library to work with over 200 free "
-"Bible texts, commentaries, dictionaries and books provided by the &cbs;."
+"Bible texts, commentaries, dictionaries and books in over 50 languages "
+"provided by the &cbs;."
 msgstr ""
 "بيبل تايم هو برنامج مجاني تماماً لدراسة الكتاب المقدس. واجهة البرنامج مبنية "
 "بإطار عمل كيوت، والذي يتيح للبرنامج العمل على عدة أنظمة تشغيل تتضمن لينكس، "
diff --git a/i18n/handbook/handbook-cs.po b/i18n/handbook/handbook-cs.po
index f978254..3407a2b 100644
--- a/i18n/handbook/handbook-cs.po
+++ b/i18n/handbook/handbook-cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: handbook-cs\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 10:53-0300\n"
+"POT-Creation-Date: 2014-01-04 00:43-0500\n"
 "PO-Revision-Date: 2009-12-11 21:06+0100\n"
 "Last-Translator: Jan Belohoubek <j.bel@atlas.cz>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -395,11 +395,11 @@ msgid ""
 "url=\"http://www.alanwood.net/unicode/fontsbyrange.html\"> Unicode character "
 "ranges and the Unicode fonts that support them</ulink>)."
 msgstr ""
-"Dobré seznamy písem Unicode na internetu, jako jedno od Christopha Singera"
-"( <ulink url=\"http://www.slovo.info/unifonts.htm\">Vícejazy�ná Unicode "
-"TrueType Fonts na internetu</ulink>), nebo jedno od Alana Wooda ( <ulink url="
-"\"http://www.alanwood.net/unicode/fontsbyrange.html\"> výběr znaků Unicode a "
-"písma Unicode, která je podporují</ulink>)."
+"Dobré seznamy písem Unicode na internetu, jako jedno od Christopha "
+"Singera( <ulink url=\"http://www.slovo.info/unifonts.htm\">Vícejazy�ná "
+"Unicode TrueType Fonts na internetu</ulink>), nebo jedno od Alana Wooda "
+"( <ulink url=\"http://www.alanwood.net/unicode/fontsbyrange.html\"> výběr "
+"znaků Unicode a písma Unicode, která je podporují</ulink>)."
 
 #. type: Content of: <chapter><sect1><sect2><title>
 #: docs/handbook/en/docbook/hdbk-config.docbook:202
@@ -830,8 +830,8 @@ msgid ""
 "<link linkend=\"hdbk-op-search\">Searching in Works section</link>."
 msgstr ""
 "Vyhledávat v díle můžete kliknutím <mousebutton>pravým</mousebutton> "
-"tla�ítkem myši na jeho symbol a vybráním položky<guimenuitem>\"Hledat v díle"
-"(ch)\"</guimenuitem>. Stiskem klávesy &Shift; a kliknutím na další díla "
+"tla�ítkem myši na jeho symbol a vybráním položky<guimenuitem>\"Hledat v "
+"díle(ch)\"</guimenuitem>. Stiskem klávesy &Shift; a kliknutím na další díla "
 "můžete vybrat více než jedno. Poté následuje stejný proces s otevřením "
 "vyhledávacího dialogu. Budete vyhledávat ve všech těchto dokumentech. "
 "Kompletní popis obsluhy vyhledávacích funkcí naleznete v sekci <link linkend="
@@ -1005,9 +1005,9 @@ msgid ""
 "read mode. You will not be able to edit it in this mode. Should you wish to "
 "write annotations into the personal commentary, you have to open it with the "
 "<mousebutton>right</mousebutton> mouse button and then select <guimenu>Edit "
-"this work</guimenu> and then either <guimenuitem>Plain text</guimenuitem>"
-"(source code editor) or <guimenuitem>HTML</guimenuitem>(basic gui wysiwyg "
-"editor)."
+"this work</guimenu> and then either <guimenuitem>Plain text</"
+"guimenuitem>(source code editor) or <guimenuitem>HTML</guimenuitem>(basic "
+"gui wysiwyg editor)."
 msgstr ""
 "Pokud otevřete osobní komentář kliknutím <mousebutton>levým</mousebutton>  "
 "tla�ítkem myši na jeho symbol v knihovně, otevře se v módu pro �tení. V "
@@ -1146,10 +1146,10 @@ msgstr "Výběr děl"
 #. type: Content of: <chapter><sect1><sect2><sect3><para>
 #: docs/handbook/en/docbook/hdbk-operation.docbook:252
 msgid ""
-"At the top of the options tab you will find <guibutton>Choose</guibutton>"
-"(works). If you would like to search in multiple works, click on this button "
-"and you will be offered a menu where you can select the works you want to "
-"search in."
+"At the top of the options tab you will find <guibutton>Choose</"
+"guibutton>(works). If you would like to search in multiple works, click on "
+"this button and you will be offered a menu where you can select the works "
+"you want to search in."
 msgstr ""
 "Nahoře v okně nastavení vyhledávání najdete tla�ítko <guibutton>Vybrat (nebo "
 "Choose)</guibutton> (díla). Pokud chcete vyhledávat ve více dílech, klikněte "
@@ -3481,7 +3481,7 @@ msgstr ""
 #. type: Content of: <book><bookinfo>
 #: docs/handbook/en/docbook/index.docbook:44
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> </"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> </"
 "copyright>"
 msgstr ""
 
@@ -3495,15 +3495,14 @@ msgstr "Příru�ka &bibletime; je sou�ástí &bibletime; studijní nápovědy.
 
 #. type: Content of: <book><bookinfo>
 #: docs/handbook/en/docbook/index.docbook:54
-msgid "<date>January 2012</date>"
+msgid "<date>January 2014</date>"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><releaseinfo>
 #: docs/handbook/en/docbook/index.docbook:56
-msgid "2.9.2"
+msgid "2.10.1"
 msgstr ""
 
-# type: Content of: <book><bookinfo><abstract><para>
 #. type: Content of: <book><bookinfo><abstract><para>
 #: docs/handbook/en/docbook/index.docbook:59
 msgid ""
@@ -3511,7 +3510,8 @@ msgid ""
 "interface is built with &qt; framework, which makes it run on several "
 "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
 "software uses the &sword; programming library to work with over 200 free "
-"Bible texts, commentaries, dictionaries and books provided by the &cbs;."
+"Bible texts, commentaries, dictionaries and books in over 50 languages "
+"provided by the &cbs;."
 msgstr ""
 
 #. type: Content of: <book><bookinfo><keywordset><keyword>
diff --git a/i18n/handbook/handbook-de.po b/i18n/handbook/handbook-de.po
index b66285c..3b5ae13 100644
--- a/i18n/handbook/handbook-de.po
+++ b/i18n/handbook/handbook-de.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: handbook-de\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 10:53-0300\n"
+"POT-Creation-Date: 2014-01-04 00:43-0500\n"
 "PO-Revision-Date: 2012-05-25 22:22+0200\n"
 "Last-Translator: \n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -966,9 +966,9 @@ msgid ""
 "read mode. You will not be able to edit it in this mode. Should you wish to "
 "write annotations into the personal commentary, you have to open it with the "
 "<mousebutton>right</mousebutton> mouse button and then select <guimenu>Edit "
-"this work</guimenu> and then either <guimenuitem>Plain text</guimenuitem>"
-"(source code editor) or <guimenuitem>HTML</guimenuitem>(basic gui wysiwyg "
-"editor)."
+"this work</guimenu> and then either <guimenuitem>Plain text</"
+"guimenuitem>(source code editor) or <guimenuitem>HTML</guimenuitem>(basic "
+"gui wysiwyg editor)."
 msgstr ""
 "Wenn Sie den persönlichen Kommentar durch Klicken auf sein Symbol im "
 "Bücherregal mit der <mousebutton>linken Maustaste</mousebutton> öffnen, wird "
@@ -1108,10 +1108,10 @@ msgstr "Werke auswählen"
 #. type: Content of: <chapter><sect1><sect2><sect3><para>
 #: docs/handbook/en/docbook/hdbk-operation.docbook:252
 msgid ""
-"At the top of the options tab you will find <guibutton>Choose</guibutton>"
-"(works). If you would like to search in multiple works, click on this button "
-"and you will be offered a menu where you can select the works you want to "
-"search in."
+"At the top of the options tab you will find <guibutton>Choose</"
+"guibutton>(works). If you would like to search in multiple works, click on "
+"this button and you will be offered a menu where you can select the works "
+"you want to search in."
 msgstr ""
 "Oben im Optionen-Reiter finden Sie <guibutton>Auswählen...</guibutton>. "
 "Falls Sie in mehreren Werken suchen möchten, klicken Sie auf diesen Knopf "
@@ -3484,13 +3484,13 @@ msgstr "Abthorpe"
 #: docs/handbook/en/docbook/index.docbook:44
 #, fuzzy
 #| msgid ""
-#| "<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> "
+#| "<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> "
 #| "</copyright>"
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> </"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> </"
 "copyright>"
 msgstr ""
-"<copyright> <year>1999-2013</year> <holder>Das &bibletime;-Team</holder> </"
+"<copyright> <year>1999-2014</year> <holder>Das &bibletime;-Team</holder> </"
 "copyright>"
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
@@ -3503,23 +3503,33 @@ msgstr ""
 
 #. type: Content of: <book><bookinfo>
 #: docs/handbook/en/docbook/index.docbook:54
-msgid "<date>January 2012</date>"
+#, fuzzy
+#| msgid "<date>January 2012</date>"
+msgid "<date>January 2014</date>"
 msgstr "<date>Januar 2012</date>"
 
 #. type: Content of: <book><bookinfo><releaseinfo>
 #: docs/handbook/en/docbook/index.docbook:56
-msgid "2.9.2"
-msgstr "2.9.2"
+msgid "2.10.1"
+msgstr ""
 
 # type: Content of: <book><bookinfo><abstract><para>
 #. type: Content of: <book><bookinfo><abstract><para>
 #: docs/handbook/en/docbook/index.docbook:59
+#, fuzzy
+#| msgid ""
+#| "&bibletime; is a completely free Bible study program. The program's user "
+#| "interface is built with &qt; framework, which makes it run on several "
+#| "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
+#| "software uses the &sword; programming library to work with over 200 free "
+#| "Bible texts, commentaries, dictionaries and books provided by the &cbs;."
 msgid ""
 "&bibletime; is a completely free Bible study program. The program's user "
 "interface is built with &qt; framework, which makes it run on several "
 "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
 "software uses the &sword; programming library to work with over 200 free "
-"Bible texts, commentaries, dictionaries and books provided by the &cbs;."
+"Bible texts, commentaries, dictionaries and books in over 50 languages "
+"provided by the &cbs;."
 msgstr ""
 "&bibletime; ist ein absolut freies Bibelarbeits-Programm. Seine "
 "Benutzeroberfläche ist mit dem &qt;-Rahmenwerk erstellt, das es auf mehreren "
@@ -3552,3 +3562,6 @@ msgstr "Crosswire"
 #: docs/handbook/en/docbook/index.docbook:72
 msgid "Help dialog"
 msgstr "Hilfe-Dialog"
+
+#~ msgid "2.9.2"
+#~ msgstr "2.9.2"
diff --git a/i18n/handbook/handbook-es.po b/i18n/handbook/handbook-es.po
index c4f959b..73a28f7 100644
--- a/i18n/handbook/handbook-es.po
+++ b/i18n/handbook/handbook-es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 10:53-0300\n"
+"POT-Creation-Date: 2014-01-04 00:43-0500\n"
 "PO-Revision-Date: 2010-07-25 20:20-0400\n"
 "Last-Translator: Roy Alvear <racl@fedoraproject.org>\n"
 "Language-Team: Spanish <kde-i18n-doc@kde.org>\n"
@@ -1034,9 +1034,9 @@ msgid ""
 "read mode. You will not be able to edit it in this mode. Should you wish to "
 "write annotations into the personal commentary, you have to open it with the "
 "<mousebutton>right</mousebutton> mouse button and then select <guimenu>Edit "
-"this work</guimenu> and then either <guimenuitem>Plain text</guimenuitem>"
-"(source code editor) or <guimenuitem>HTML</guimenuitem>(basic gui wysiwyg "
-"editor)."
+"this work</guimenu> and then either <guimenuitem>Plain text</"
+"guimenuitem>(source code editor) or <guimenuitem>HTML</guimenuitem>(basic "
+"gui wysiwyg editor)."
 msgstr ""
 "Si abre el comentario personal haciendo clic en su símbolo en la biblioteca "
 "con el <mousebutton>botón izquierdo</mousebutton> del ratón, se abre en modo "
@@ -1182,10 +1182,10 @@ msgstr "Seleccionando obras"
 #. type: Content of: <chapter><sect1><sect2><sect3><para>
 #: docs/handbook/en/docbook/hdbk-operation.docbook:252
 msgid ""
-"At the top of the options tab you will find <guibutton>Choose</guibutton>"
-"(works). If you would like to search in multiple works, click on this button "
-"and you will be offered a menu where you can select the works you want to "
-"search in."
+"At the top of the options tab you will find <guibutton>Choose</"
+"guibutton>(works). If you would like to search in multiple works, click on "
+"this button and you will be offered a menu where you can select the works "
+"you want to search in."
 msgstr ""
 "En la parte superior de la pestaña de opciones se encuentra "
 "<guibutton>Elegir</guibutton> (obras). Si desea buscar en múltiples "
@@ -3649,13 +3649,13 @@ msgstr "Abthorpe"
 #: docs/handbook/en/docbook/index.docbook:44
 #, fuzzy
 #| msgid ""
-#| "<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> "
+#| "<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> "
 #| "</copyright>"
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> </"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> </"
 "copyright>"
 msgstr ""
-"<copyright> <year>1999-2013</year> <holder>El Equipo &bibletime;</holder> </"
+"<copyright> <year>1999-2014</year> <holder>El Equipo &bibletime;</holder> </"
 "copyright>"
 
 # type: Content of: <book><bookinfo><legalnotice><para>
@@ -3669,23 +3669,31 @@ msgstr ""
 
 #. type: Content of: <book><bookinfo>
 #: docs/handbook/en/docbook/index.docbook:54
-msgid "<date>January 2012</date>"
+msgid "<date>January 2014</date>"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><releaseinfo>
 #: docs/handbook/en/docbook/index.docbook:56
-msgid "2.9.2"
+msgid "2.10.1"
 msgstr ""
 
 # type: Content of: <book><bookinfo><abstract><para>
 #. type: Content of: <book><bookinfo><abstract><para>
 #: docs/handbook/en/docbook/index.docbook:59
+#, fuzzy
+#| msgid ""
+#| "&bibletime; is a completely free Bible study program. The program's user "
+#| "interface is built with &qt; framework, which makes it run on several "
+#| "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
+#| "software uses the &sword; programming library to work with over 200 free "
+#| "Bible texts, commentaries, dictionaries and books provided by the &cbs;."
 msgid ""
 "&bibletime; is a completely free Bible study program. The program's user "
 "interface is built with &qt; framework, which makes it run on several "
 "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
 "software uses the &sword; programming library to work with over 200 free "
-"Bible texts, commentaries, dictionaries and books provided by the &cbs;."
+"Bible texts, commentaries, dictionaries and books in over 50 languages "
+"provided by the &cbs;."
 msgstr ""
 "&bibletime; es un programa de estudio bíblico completamente libre. La "
 "interfaz del programa está construida con el framework de &qt;, que hace que "
diff --git a/i18n/handbook/handbook-fi.po b/i18n/handbook/handbook-fi.po
index 2173c51..a93e2d8 100644
--- a/i18n/handbook/handbook-fi.po
+++ b/i18n/handbook/handbook-fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: handbook-fi\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 10:53-0300\n"
+"POT-Creation-Date: 2014-01-04 00:43-0500\n"
 "PO-Revision-Date: 2009-03-06 16:56+0200\n"
 "Last-Translator: Ilpo Kantonen <ilpo@iki.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -878,9 +878,9 @@ msgid ""
 "read mode. You will not be able to edit it in this mode. Should you wish to "
 "write annotations into the personal commentary, you have to open it with the "
 "<mousebutton>right</mousebutton> mouse button and then select <guimenu>Edit "
-"this work</guimenu> and then either <guimenuitem>Plain text</guimenuitem>"
-"(source code editor) or <guimenuitem>HTML</guimenuitem>(basic gui wysiwyg "
-"editor)."
+"this work</guimenu> and then either <guimenuitem>Plain text</"
+"guimenuitem>(source code editor) or <guimenuitem>HTML</guimenuitem>(basic "
+"gui wysiwyg editor)."
 msgstr ""
 
 # type: Content of: <chapter><sect1><sect2><sect3><tip><para>
@@ -992,10 +992,10 @@ msgstr "Tehtävien valinta"
 #. type: Content of: <chapter><sect1><sect2><sect3><para>
 #: docs/handbook/en/docbook/hdbk-operation.docbook:252
 msgid ""
-"At the top of the options tab you will find <guibutton>Choose</guibutton>"
-"(works). If you would like to search in multiple works, click on this button "
-"and you will be offered a menu where you can select the works you want to "
-"search in."
+"At the top of the options tab you will find <guibutton>Choose</"
+"guibutton>(works). If you would like to search in multiple works, click on "
+"this button and you will be offered a menu where you can select the works "
+"you want to search in."
 msgstr ""
 
 #. type: Content of: <chapter><sect1><sect2><sect3><title>
@@ -3168,7 +3168,7 @@ msgstr ""
 #. type: Content of: <book><bookinfo>
 #: docs/handbook/en/docbook/index.docbook:44
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> </"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> </"
 "copyright>"
 msgstr ""
 
@@ -3181,15 +3181,14 @@ msgstr "&bibletime;-käsikirja on osa &bibletime;-ohjelmaa."
 
 #. type: Content of: <book><bookinfo>
 #: docs/handbook/en/docbook/index.docbook:54
-msgid "<date>January 2012</date>"
+msgid "<date>January 2014</date>"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><releaseinfo>
 #: docs/handbook/en/docbook/index.docbook:56
-msgid "2.9.2"
+msgid "2.10.1"
 msgstr ""
 
-# type: Content of: <book><bookinfo><abstract><para>
 #. type: Content of: <book><bookinfo><abstract><para>
 #: docs/handbook/en/docbook/index.docbook:59
 msgid ""
@@ -3197,7 +3196,8 @@ msgid ""
 "interface is built with &qt; framework, which makes it run on several "
 "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
 "software uses the &sword; programming library to work with over 200 free "
-"Bible texts, commentaries, dictionaries and books provided by the &cbs;."
+"Bible texts, commentaries, dictionaries and books in over 50 languages "
+"provided by the &cbs;."
 msgstr ""
 
 #. type: Content of: <book><bookinfo><keywordset><keyword>
diff --git a/i18n/handbook/handbook-fr.po b/i18n/handbook/handbook-fr.po
index 4679206..80a009a 100644
--- a/i18n/handbook/handbook-fr.po
+++ b/i18n/handbook/handbook-fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: handbook\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 10:53-0300\n"
+"POT-Creation-Date: 2014-01-04 00:43-0500\n"
 "PO-Revision-Date: 2010-05-21 16:06-0500\n"
 "Last-Translator: Thomas Abthorpe <tabthorpe@FreeBSD.org>\n"
 "Language-Team: BibleTime Translators <bibletime-translasions@lists."
@@ -977,9 +977,9 @@ msgid ""
 "read mode. You will not be able to edit it in this mode. Should you wish to "
 "write annotations into the personal commentary, you have to open it with the "
 "<mousebutton>right</mousebutton> mouse button and then select <guimenu>Edit "
-"this work</guimenu> and then either <guimenuitem>Plain text</guimenuitem>"
-"(source code editor) or <guimenuitem>HTML</guimenuitem>(basic gui wysiwyg "
-"editor)."
+"this work</guimenu> and then either <guimenuitem>Plain text</"
+"guimenuitem>(source code editor) or <guimenuitem>HTML</guimenuitem>(basic "
+"gui wysiwyg editor)."
 msgstr ""
 "Si vous ouvrez le commentaire personnel en cliquant sur son icône dans la "
 "bibliothèque avec le <mousebutton>bouton gauche de la souris</mousebutton> "
@@ -1110,10 +1110,10 @@ msgstr "Sélectionner les modules"
 #: docs/handbook/en/docbook/hdbk-operation.docbook:252
 #, fuzzy
 msgid ""
-"At the top of the options tab you will find <guibutton>Choose</guibutton>"
-"(works). If you would like to search in multiple works, click on this button "
-"and you will be offered a menu where you can select the works you want to "
-"search in."
+"At the top of the options tab you will find <guibutton>Choose</"
+"guibutton>(works). If you would like to search in multiple works, click on "
+"this button and you will be offered a menu where you can select the works "
+"you want to search in."
 msgstr ""
 "En haut de l'onglet, le bouton  <guibutton>Choisir les modules</guibutton> "
 "vous permet d'ouvrir un menu pour sélectionner les modules dans lesquelles "
@@ -3312,7 +3312,7 @@ msgstr ""
 #. type: Content of: <book><bookinfo>
 #: docs/handbook/en/docbook/index.docbook:44
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> </"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> </"
 "copyright>"
 msgstr ""
 
@@ -3325,23 +3325,31 @@ msgstr "Le manuel &bibletime; fait partie de &bibletime;."
 
 #. type: Content of: <book><bookinfo>
 #: docs/handbook/en/docbook/index.docbook:54
-msgid "<date>January 2012</date>"
+msgid "<date>January 2014</date>"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><releaseinfo>
 #: docs/handbook/en/docbook/index.docbook:56
-msgid "2.9.2"
+msgid "2.10.1"
 msgstr ""
 
 # type: Content of: <book><bookinfo><abstract><para>
 #. type: Content of: <book><bookinfo><abstract><para>
 #: docs/handbook/en/docbook/index.docbook:59
+#, fuzzy
+#| msgid ""
+#| "&bibletime; is a completely free Bible study program. The program's user "
+#| "interface is built with &qt; framework, which makes it run on several "
+#| "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
+#| "software uses the &sword; programming library to work with over 200 free "
+#| "Bible texts, commentaries, dictionaries and books provided by the &cbs;."
 msgid ""
 "&bibletime; is a completely free Bible study program. The program's user "
 "interface is built with &qt; framework, which makes it run on several "
 "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
 "software uses the &sword; programming library to work with over 200 free "
-"Bible texts, commentaries, dictionaries and books provided by the &cbs;."
+"Bible texts, commentaries, dictionaries and books in over 50 languages "
+"provided by the &cbs;."
 msgstr ""
 "&bibletime; est un programme d'études offert gratuitement Bible. L'interface "
 "utilisateur du programme est construit avec le cadre &qt;, qui lui fait "
diff --git a/i18n/handbook/handbook-hu.po b/i18n/handbook/handbook-hu.po
index ebd13df..6c51ad7 100644
--- a/i18n/handbook/handbook-hu.po
+++ b/i18n/handbook/handbook-hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: handbook-hu\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 10:53-0300\n"
+"POT-Creation-Date: 2014-01-04 00:43-0500\n"
 "PO-Revision-Date: 2011-10-17 13:54+0100\n"
 "Last-Translator: Geza Novak <geza.novak@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -1013,9 +1013,9 @@ msgid ""
 "read mode. You will not be able to edit it in this mode. Should you wish to "
 "write annotations into the personal commentary, you have to open it with the "
 "<mousebutton>right</mousebutton> mouse button and then select <guimenu>Edit "
-"this work</guimenu> and then either <guimenuitem>Plain text</guimenuitem>"
-"(source code editor) or <guimenuitem>HTML</guimenuitem>(basic gui wysiwyg "
-"editor)."
+"this work</guimenu> and then either <guimenuitem>Plain text</"
+"guimenuitem>(source code editor) or <guimenuitem>HTML</guimenuitem>(basic "
+"gui wysiwyg editor)."
 msgstr ""
 "Amikor megnyitja a saját kommentárját az ikonjára <mousebutton>kattintva</"
 "mousebutton> a könyvespolcon, olvasási üzemmódban nyílik meg, ekkor nem "
@@ -1160,10 +1160,10 @@ msgstr "Dokumentumok kiválasztása"
 #. type: Content of: <chapter><sect1><sect2><sect3><para>
 #: docs/handbook/en/docbook/hdbk-operation.docbook:252
 msgid ""
-"At the top of the options tab you will find <guibutton>Choose</guibutton>"
-"(works). If you would like to search in multiple works, click on this button "
-"and you will be offered a menu where you can select the works you want to "
-"search in."
+"At the top of the options tab you will find <guibutton>Choose</"
+"guibutton>(works). If you would like to search in multiple works, click on "
+"this button and you will be offered a menu where you can select the works "
+"you want to search in."
 msgstr ""
 "A párbeszédablak felső részében található egy <guibutton>Választás</"
 "guibutton> feliratú gomb. Ha egyszerre több dokumentumban kíván keresni, "
@@ -1604,11 +1604,11 @@ msgid ""
 "<guibutton>Remove works</guibutton>."
 msgstr ""
 "Ez a lehetőség biztosítja önnek, hogy a nem kívánt munkákat eltávolítsa, "
-"lemezterületet szabadítson fel. Egyszerűen jelölje meg a törölni kívánt eleme"
-"(ke)t a könyvespolcon, majd kattintson a <guibutton>Törlés...</guibutton> "
-"gombra.Ez a lehetőség biztosítja önnek, hogy a nem kívánt munkákat "
-"eltávolítsa, lemezterületet szabadítson fel. Egyszerűen jelölje meg a "
-"törölni kívánt eleme(ke)t a könyvespolcon, majd kattintson a "
+"lemezterületet szabadítson fel. Egyszerűen jelölje meg a törölni kívánt "
+"eleme(ke)t a könyvespolcon, majd kattintson a <guibutton>Törlés...</"
+"guibutton> gombra.Ez a lehetőség biztosítja önnek, hogy a nem kívánt "
+"munkákat eltávolítsa, lemezterületet szabadítson fel. Egyszerűen jelölje meg "
+"a törölni kívánt eleme(ke)t a könyvespolcon, majd kattintson a "
 "<guibutton>Törlés...</guibutton> gombra."
 
 # type: Content of: <chapter><sect1><sect2><title>
@@ -3638,13 +3638,13 @@ msgstr "Abthorpe"
 #: docs/handbook/en/docbook/index.docbook:44
 #, fuzzy
 #| msgid ""
-#| "<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> "
+#| "<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> "
 #| "</copyright>"
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> </"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> </"
 "copyright>"
 msgstr ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> </"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> </"
 "copyright>"
 
 # type: Content of: <book><bookinfo><legalnotice><para>
@@ -3658,25 +3658,31 @@ msgstr "A &bibletime; kézikönyv a &bibletime; programmal együtt terjesztve."
 #: docs/handbook/en/docbook/index.docbook:54
 #, fuzzy
 #| msgid "<date>January 2011</date>"
-msgid "<date>January 2012</date>"
+msgid "<date>January 2014</date>"
 msgstr "<date>Január 2011</date>"
 
 #. type: Content of: <book><bookinfo><releaseinfo>
 #: docs/handbook/en/docbook/index.docbook:56
-#, fuzzy
-#| msgid "2.9.0"
-msgid "2.9.2"
-msgstr "2.9.0"
+msgid "2.10.1"
+msgstr ""
 
 # type: Content of: <book><bookinfo><abstract><para>
 #. type: Content of: <book><bookinfo><abstract><para>
 #: docs/handbook/en/docbook/index.docbook:59
+#, fuzzy
+#| msgid ""
+#| "&bibletime; is a completely free Bible study program. The program's user "
+#| "interface is built with &qt; framework, which makes it run on several "
+#| "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
+#| "software uses the &sword; programming library to work with over 200 free "
+#| "Bible texts, commentaries, dictionaries and books provided by the &cbs;."
 msgid ""
 "&bibletime; is a completely free Bible study program. The program's user "
 "interface is built with &qt; framework, which makes it run on several "
 "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
 "software uses the &sword; programming library to work with over 200 free "
-"Bible texts, commentaries, dictionaries and books provided by the &cbs;."
+"Bible texts, commentaries, dictionaries and books in over 50 languages "
+"provided by the &cbs;."
 msgstr ""
 "A &bibletime; egy teljesen ingyenes és szabad Biblia tanulmányozó program. A "
 "program kezelőfelülete a &qt; keretrendszerre épült, ami lehetővé teszi "
@@ -3710,3 +3716,8 @@ msgstr "Crosswire"
 #: docs/handbook/en/docbook/index.docbook:72
 msgid "Help dialog"
 msgstr "Segítség párbeszédablak"
+
+#, fuzzy
+#~| msgid "2.9.0"
+#~ msgid "2.9.2"
+#~ msgstr "2.9.0"
diff --git a/i18n/handbook/handbook-it.po b/i18n/handbook/handbook-it.po
index 075e76f..c233b31 100644
--- a/i18n/handbook/handbook-it.po
+++ b/i18n/handbook/handbook-it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 10:53-0300\n"
+"POT-Creation-Date: 2014-01-04 00:43-0500\n"
 "PO-Revision-Date: 2011-12-04 23:37-0500\n"
 "Last-Translator: Thomas Abthorpe <tabthorpe@FreeBSD.org>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -1018,9 +1018,9 @@ msgid ""
 "read mode. You will not be able to edit it in this mode. Should you wish to "
 "write annotations into the personal commentary, you have to open it with the "
 "<mousebutton>right</mousebutton> mouse button and then select <guimenu>Edit "
-"this work</guimenu> and then either <guimenuitem>Plain text</guimenuitem>"
-"(source code editor) or <guimenuitem>HTML</guimenuitem>(basic gui wysiwyg "
-"editor)."
+"this work</guimenu> and then either <guimenuitem>Plain text</"
+"guimenuitem>(source code editor) or <guimenuitem>HTML</guimenuitem>(basic "
+"gui wysiwyg editor)."
 msgstr ""
 "Se apri i commenti personali cliccando sul suo simbolo nella Libreria con il "
 "pulsante <mousebutton>sinistro</mousebutton> del mouse, si apre in lettura. "
@@ -1166,10 +1166,10 @@ msgstr "Selezione documenti"
 #. type: Content of: <chapter><sect1><sect2><sect3><para>
 #: docs/handbook/en/docbook/hdbk-operation.docbook:252
 msgid ""
-"At the top of the options tab you will find <guibutton>Choose</guibutton>"
-"(works). If you would like to search in multiple works, click on this button "
-"and you will be offered a menu where you can select the works you want to "
-"search in."
+"At the top of the options tab you will find <guibutton>Choose</"
+"guibutton>(works). If you would like to search in multiple works, click on "
+"this button and you will be offered a menu where you can select the works "
+"you want to search in."
 msgstr ""
 "In cima alla scheda delle opzioni troverai <guibutton>Scegli</guibutton> "
 "(documenti). Se volessi cercare in più documenti, clicca su questo pulsante "
@@ -3617,13 +3617,13 @@ msgstr "Abthorpe"
 #: docs/handbook/en/docbook/index.docbook:44
 #, fuzzy
 #| msgid ""
-#| "<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> "
+#| "<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> "
 #| "</copyright>"
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> </"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> </"
 "copyright>"
 msgstr ""
-"<copyright> <year>1999-2013</year> <holder>Il Team di &bibletime;</holder> </"
+"<copyright> <year>1999-2014</year> <holder>Il Team di &bibletime;</holder> </"
 "copyright>"
 
 # type: Content of: <book><bookinfo><legalnotice><para>
@@ -3639,25 +3639,31 @@ msgstr ""
 #: docs/handbook/en/docbook/index.docbook:54
 #, fuzzy
 #| msgid "<date>January 2011</date>"
-msgid "<date>January 2012</date>"
+msgid "<date>January 2014</date>"
 msgstr "<date>Gennaio 2011</date>"
 
 #. type: Content of: <book><bookinfo><releaseinfo>
 #: docs/handbook/en/docbook/index.docbook:56
-#, fuzzy
-#| msgid "2.9.0"
-msgid "2.9.2"
-msgstr "2.9.0"
+msgid "2.10.1"
+msgstr ""
 
 # type: Content of: <book><bookinfo><abstract><para>
 #. type: Content of: <book><bookinfo><abstract><para>
 #: docs/handbook/en/docbook/index.docbook:59
+#, fuzzy
+#| msgid ""
+#| "&bibletime; is a completely free Bible study program. The program's user "
+#| "interface is built with &qt; framework, which makes it run on several "
+#| "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
+#| "software uses the &sword; programming library to work with over 200 free "
+#| "Bible texts, commentaries, dictionaries and books provided by the &cbs;."
 msgid ""
 "&bibletime; is a completely free Bible study program. The program's user "
 "interface is built with &qt; framework, which makes it run on several "
 "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
 "software uses the &sword; programming library to work with over 200 free "
-"Bible texts, commentaries, dictionaries and books provided by the &cbs;."
+"Bible texts, commentaries, dictionaries and books in over 50 languages "
+"provided by the &cbs;."
 msgstr ""
 "&bibletime; è un programma di studio della Bibbia completamente gratuito. "
 "L'interfaccia del programma è costruita con il framework &qt;, che lo fa "
@@ -3690,3 +3696,8 @@ msgstr "Crosswire"
 #: docs/handbook/en/docbook/index.docbook:72
 msgid "Help dialog"
 msgstr "Finestra di aiuto"
+
+#, fuzzy
+#~| msgid "2.9.0"
+#~ msgid "2.9.2"
+#~ msgstr "2.9.0"
diff --git a/i18n/handbook/handbook-nl.po b/i18n/handbook/handbook-nl.po
index 47ee381..77e519d 100644
--- a/i18n/handbook/handbook-nl.po
+++ b/i18n/handbook/handbook-nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 10:53-0300\n"
+"POT-Creation-Date: 2014-01-04 00:43-0500\n"
 "PO-Revision-Date: 2006-12-07 11:35+0100\n"
 "Last-Translator: Martin Gruner <mg.pub@gmx.net>\n"
 "Language-Team: Deutsch\n"
@@ -988,9 +988,9 @@ msgid ""
 "read mode. You will not be able to edit it in this mode. Should you wish to "
 "write annotations into the personal commentary, you have to open it with the "
 "<mousebutton>right</mousebutton> mouse button and then select <guimenu>Edit "
-"this work</guimenu> and then either <guimenuitem>Plain text</guimenuitem>"
-"(source code editor) or <guimenuitem>HTML</guimenuitem>(basic gui wysiwyg "
-"editor)."
+"this work</guimenu> and then either <guimenuitem>Plain text</"
+"guimenuitem>(source code editor) or <guimenuitem>HTML</guimenuitem>(basic "
+"gui wysiwyg editor)."
 msgstr ""
 "Als u het persoonlijk bijbelcommentaar opent door met de <mousebutton> "
 "linker</mousebutton> muisknop te klikken op zijn symbool in de Boekenplank, "
@@ -1126,10 +1126,10 @@ msgstr "Modules selecteren"
 #: docs/handbook/en/docbook/hdbk-operation.docbook:252
 #, fuzzy
 msgid ""
-"At the top of the options tab you will find <guibutton>Choose</guibutton>"
-"(works). If you would like to search in multiple works, click on this button "
-"and you will be offered a menu where you can select the works you want to "
-"search in."
+"At the top of the options tab you will find <guibutton>Choose</"
+"guibutton>(works). If you would like to search in multiple works, click on "
+"this button and you will be offered a menu where you can select the works "
+"you want to search in."
 msgstr ""
 "Bovenaan het tabblad Opties treft u <guibutton>Kies module(s)</guibutton> "
 "aan. Als u in meerdere modules wilt zoeken, klik dan op deze knop en er "
@@ -3332,7 +3332,7 @@ msgstr ""
 #. type: Content of: <book><bookinfo>
 #: docs/handbook/en/docbook/index.docbook:44
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> </"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> </"
 "copyright>"
 msgstr ""
 
@@ -3345,15 +3345,14 @@ msgstr "Het &bibletime; handboek is onderdeel van &bibletime;"
 
 #. type: Content of: <book><bookinfo>
 #: docs/handbook/en/docbook/index.docbook:54
-msgid "<date>January 2012</date>"
+msgid "<date>January 2014</date>"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><releaseinfo>
 #: docs/handbook/en/docbook/index.docbook:56
-msgid "2.9.2"
+msgid "2.10.1"
 msgstr ""
 
-# type: Content of: <book><bookinfo><abstract><para>
 #. type: Content of: <book><bookinfo><abstract><para>
 #: docs/handbook/en/docbook/index.docbook:59
 msgid ""
@@ -3361,7 +3360,8 @@ msgid ""
 "interface is built with &qt; framework, which makes it run on several "
 "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
 "software uses the &sword; programming library to work with over 200 free "
-"Bible texts, commentaries, dictionaries and books provided by the &cbs;."
+"Bible texts, commentaries, dictionaries and books in over 50 languages "
+"provided by the &cbs;."
 msgstr ""
 
 #. type: Content of: <book><bookinfo><keywordset><keyword>
diff --git a/i18n/handbook/handbook-pt_BR.po b/i18n/handbook/handbook-pt_BR.po
index 26cc326..f634a67 100644
--- a/i18n/handbook/handbook-pt_BR.po
+++ b/i18n/handbook/handbook-pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: handbook\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 10:53-0300\n"
+"POT-Creation-Date: 2014-01-04 00:43-0500\n"
 "PO-Revision-Date: 2012-08-01 10:53-0500\n"
 "Last-Translator: Thomas Abthorpe <tabthorpe@FreeBSD.org>\n"
 "Language-Team: Português do Brasil <kde-i18n-doc@kde.org>\n"
@@ -1019,9 +1019,9 @@ msgid ""
 "read mode. You will not be able to edit it in this mode. Should you wish to "
 "write annotations into the personal commentary, you have to open it with the "
 "<mousebutton>right</mousebutton> mouse button and then select <guimenu>Edit "
-"this work</guimenu> and then either <guimenuitem>Plain text</guimenuitem>"
-"(source code editor) or <guimenuitem>HTML</guimenuitem>(basic gui wysiwyg "
-"editor)."
+"this work</guimenu> and then either <guimenuitem>Plain text</"
+"guimenuitem>(source code editor) or <guimenuitem>HTML</guimenuitem>(basic "
+"gui wysiwyg editor)."
 msgstr ""
 "Se você abrir o comentário pessoal clicando no seu símbolo na Estante com o "
 "botão <mousebutton>esquerdo</mousebutton> do mouse, ele abre em modo de "
@@ -1166,10 +1166,10 @@ msgstr "Selecionando obras"
 #. type: Content of: <chapter><sect1><sect2><sect3><para>
 #: docs/handbook/en/docbook/hdbk-operation.docbook:252
 msgid ""
-"At the top of the options tab you will find <guibutton>Choose</guibutton>"
-"(works). If you would like to search in multiple works, click on this button "
-"and you will be offered a menu where you can select the works you want to "
-"search in."
+"At the top of the options tab you will find <guibutton>Choose</"
+"guibutton>(works). If you would like to search in multiple works, click on "
+"this button and you will be offered a menu where you can select the works "
+"you want to search in."
 msgstr ""
 "No topo da aba de opções você vai encontrar <guibutton>Escolher</guibutton> "
 "(obras). Se você gostaria de buscar em várias obras, clique nesse botão e "
@@ -3566,13 +3566,13 @@ msgstr "Abthorpe"
 #: docs/handbook/en/docbook/index.docbook:44
 #, fuzzy
 #| msgid ""
-#| "<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> "
+#| "<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> "
 #| "</copyright>"
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> </"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> </"
 "copyright>"
 msgstr ""
-"<copyright> <year>1999-2013</year> <holder>O Time &bibletime;</holder> </"
+"<copyright> <year>1999-2014</year> <holder>O Time &bibletime;</holder> </"
 "copyright>"
 
 # type: Content of: <book><bookinfo><legalnotice><para>
@@ -3585,23 +3585,33 @@ msgstr ""
 
 #. type: Content of: <book><bookinfo>
 #: docs/handbook/en/docbook/index.docbook:54
-msgid "<date>January 2012</date>"
+#, fuzzy
+#| msgid "<date>January 2012</date>"
+msgid "<date>January 2014</date>"
 msgstr "<date>Janeiro 2012</date>"
 
 #. type: Content of: <book><bookinfo><releaseinfo>
 #: docs/handbook/en/docbook/index.docbook:56
-msgid "2.9.2"
-msgstr "2.9.2"
+msgid "2.10.1"
+msgstr ""
 
 # type: Content of: <book><bookinfo><abstract><para>
 #. type: Content of: <book><bookinfo><abstract><para>
 #: docs/handbook/en/docbook/index.docbook:59
+#, fuzzy
+#| msgid ""
+#| "&bibletime; is a completely free Bible study program. The program's user "
+#| "interface is built with &qt; framework, which makes it run on several "
+#| "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
+#| "software uses the &sword; programming library to work with over 200 free "
+#| "Bible texts, commentaries, dictionaries and books provided by the &cbs;."
 msgid ""
 "&bibletime; is a completely free Bible study program. The program's user "
 "interface is built with &qt; framework, which makes it run on several "
 "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
 "software uses the &sword; programming library to work with over 200 free "
-"Bible texts, commentaries, dictionaries and books provided by the &cbs;."
+"Bible texts, commentaries, dictionaries and books in over 50 languages "
+"provided by the &cbs;."
 msgstr ""
 "&bibletime; é um programa de estudo da Bíblia completamente livre. A "
 "interface com o usuário é construída com o framework &qt;, que pode ser "
@@ -3635,3 +3645,6 @@ msgstr "Crosswire"
 #: docs/handbook/en/docbook/index.docbook:72
 msgid "Help dialog"
 msgstr "Diálogo de ajuda"
+
+#~ msgid "2.9.2"
+#~ msgstr "2.9.2"
diff --git a/i18n/handbook/handbook.pot b/i18n/handbook/handbook.pot
index 77c569c..0d8d6ab 100644
--- a/i18n/handbook/handbook.pot
+++ b/i18n/handbook/handbook.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 10:53-0300\n"
+"POT-Creation-Date: 2014-01-04 00:43-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2598,7 +2598,7 @@ msgstr ""
 #. type: Content of: <book><bookinfo>
 #: docs/handbook/en/docbook/index.docbook:44
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team</holder> "
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team</holder> "
 "</copyright>"
 msgstr ""
 
@@ -2609,12 +2609,12 @@ msgstr ""
 
 #. type: Content of: <book><bookinfo>
 #: docs/handbook/en/docbook/index.docbook:54
-msgid "<date>January 2012</date>"
+msgid "<date>January 2014</date>"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><releaseinfo>
 #: docs/handbook/en/docbook/index.docbook:56
-msgid "2.9.2"
+msgid "2.10.1"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><abstract><para>
@@ -2624,7 +2624,8 @@ msgid ""
 "interface is built with &qt; framework, which makes it run on several "
 "operating systems including Linux, Windows, FreeBSD and Mac OS X. The "
 "software uses the &sword; programming library to work with over 200 free "
-"Bible texts, commentaries, dictionaries and books provided by the &cbs;."
+"Bible texts, commentaries, dictionaries and books in over 50 languages "
+"provided by the &cbs;."
 msgstr ""
 
 #. type: Content of: <book><bookinfo><keywordset><keyword>
diff --git a/i18n/howto/howto-ar.po b/i18n/howto/howto-ar.po
index 74777d6..93b405f 100644
--- a/i18n/howto/howto-ar.po
+++ b/i18n/howto/howto-ar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 11:03-0300\n"
+"POT-Creation-Date: 2014-01-04 00:55-0500\n"
 "PO-Revision-Date: 2010-12-14 15:54+0200\n"
 "Last-Translator: Andrew Alfy <andrewalfy@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2627,13 +2627,13 @@ msgstr "�ريق بيبل تايم"
 #: docs/howto/en/docbook/index.docbook:26
 #, fuzzy
 #| msgid ""
-#| "<copyright> <year>1999-2013</year> <holder>The team of &bibletime; "
+#| "<copyright> <year>1999-2014</year> <holder>The team of &bibletime; "
 #| "(info@bibletime.info)</holder> </copyright>"
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team (bt-"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team (bt-"
 "devel@crosswire.org)</holder> </copyright>"
 msgstr ""
-"<copyright> <year>1999-2013</year> <holder>�ريق بيبل تايم ; (info@bibletime."
+"<copyright> <year>1999-2014</year> <holder>�ريق بيبل تايم ; (info@bibletime."
 "info)</holder> </copyright>"
 
 # type: Content of: <book><bookinfo><legalnotice><para>
diff --git a/i18n/howto/howto-bg.po b/i18n/howto/howto-bg.po
index 5864813..f36b7ac 100644
--- a/i18n/howto/howto-bg.po
+++ b/i18n/howto/howto-bg.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: index\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 11:03-0300\n"
+"POT-Creation-Date: 2014-01-04 00:55-0500\n"
 "PO-Revision-Date: 2003-12-28 14:05+0200\n"
 "Last-Translator: Andrew Ivanov <linux_ready@yahoo.com>\n"
 "Language-Team: Bulgarian\n"
@@ -2125,7 +2125,7 @@ msgstr ""
 #. type: Content of: <book><bookinfo>
 #: docs/howto/en/docbook/index.docbook:26
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team (bt-"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team (bt-"
 "devel@crosswire.org)</holder> </copyright>"
 msgstr ""
 
diff --git a/i18n/howto/howto-cs.po b/i18n/howto/howto-cs.po
index 988090e..39f554c 100644
--- a/i18n/howto/howto-cs.po
+++ b/i18n/howto/howto-cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 11:03-0300\n"
+"POT-Creation-Date: 2014-01-04 00:55-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2096,7 +2096,7 @@ msgstr ""
 #. type: Content of: <book><bookinfo>
 #: docs/howto/en/docbook/index.docbook:26
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team (bt-"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team (bt-"
 "devel@crosswire.org)</holder> </copyright>"
 msgstr ""
 
diff --git a/i18n/howto/howto-da.po b/i18n/howto/howto-da.po
index 65377e9..caed485 100644
--- a/i18n/howto/howto-da.po
+++ b/i18n/howto/howto-da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: howto(2)\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 11:03-0300\n"
+"POT-Creation-Date: 2014-01-04 00:55-0500\n"
 "PO-Revision-Date: 2009-08-09 21:36+0200\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -2056,7 +2056,7 @@ msgstr ""
 #. type: Content of: <book><bookinfo>
 #: docs/howto/en/docbook/index.docbook:26
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team (bt-"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team (bt-"
 "devel@crosswire.org)</holder> </copyright>"
 msgstr ""
 
diff --git a/i18n/howto/howto-de.po b/i18n/howto/howto-de.po
index 46f4bec..6904512 100644
--- a/i18n/howto/howto-de.po
+++ b/i18n/howto/howto-de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: howto-de\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 11:03-0300\n"
+"POT-Creation-Date: 2014-01-04 00:55-0500\n"
 "PO-Revision-Date: 2012-06-05 00:26+0200\n"
 "Last-Translator: \n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -2129,13 +2129,13 @@ msgstr "Das BibleTime-Team"
 #: docs/howto/en/docbook/index.docbook:26
 #, fuzzy
 #| msgid ""
-#| "<copyright> <year>1999-2013</year> <holder>The &bibletime; Team (bt-"
+#| "<copyright> <year>1999-2014</year> <holder>The &bibletime; Team (bt-"
 #| "devel@crosswire.org)</holder> </copyright>"
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team (bt-"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team (bt-"
 "devel@crosswire.org)</holder> </copyright>"
 msgstr ""
-"<copyright> <year>1999-2013</year> <holder>Das &bibletime;-Team (bt-"
+"<copyright> <year>1999-2014</year> <holder>Das &bibletime;-Team (bt-"
 "devel@crosswire.org)</holder> </copyright>"
 
 # type: Content of: <book><bookinfo><legalnotice><para>
diff --git a/i18n/howto/howto-es.po b/i18n/howto/howto-es.po
index 826c755..c4030ec 100644
--- a/i18n/howto/howto-es.po
+++ b/i18n/howto/howto-es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: howto\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 11:03-0300\n"
+"POT-Creation-Date: 2014-01-04 00:55-0500\n"
 "PO-Revision-Date: 2010-05-10 22:48-0400\n"
 "Last-Translator: Roy Alvear <racl@gulix.cl>\n"
 "Language-Team: Spanish <kde-i18n-doc@kde.org>\n"
@@ -174,8 +174,8 @@ msgid ""
 "1 Tim.4:13 <quote>give attention to the public reading of Scripture [...]</"
 "quote>"
 msgstr ""
-"1 Timoteo 4:13 <quote>presta atención a la lectura pública de la Escritura"
-"[...]</quote>"
+"1 Timoteo 4:13 <quote>presta atención a la lectura pública de la "
+"Escritura[...]</quote>"
 
 # type: Content of: <chapter><sect1><sect2><title>
 #. type: Content of: <book><bookinfo><keywordset><keyword>
@@ -2288,15 +2288,15 @@ msgid ""
 "not send me to baptize, but to preach the gospel\"</emphasis>?"
 msgstr ""
 "Hechos 2:38 <quote>Pedro les dijo: &quot;Arrepentíos, y bautícese cada uno "
-"de vosotros en el nombre de Jesucristo para perdón de los pecados; [...]"
-"&quot; </quote>. Esta enseñanza es la regeneración bautismal? Si este fuese "
-"el único versículo de la Escritura que hubiese, tendríamos que concluir eso. "
-"Pero a la luz de la clara enseñanza de otros lugares que la regeneración "
-"ocurre por la fe en Cristo, tenemos que interpretar de otro modo. Pedro está "
-"instando al bautismo como un medio para que sus oyentes respondan al "
-"evangelio. Si el bautismo es la vía para volver a nacer, ¿cómo podría Pablo "
-"escribir 1 Cor.1: 17 <emphasis>&quot;Porque no me envió Cristo a bautizar, "
-"sino a predicar el evangelio&quot; </emphasis>?"
+"de vosotros en el nombre de Jesucristo para perdón de los pecados; "
+"[...]&quot; </quote>. Esta enseñanza es la regeneración bautismal? Si este "
+"fuese el único versículo de la Escritura que hubiese, tendríamos que "
+"concluir eso. Pero a la luz de la clara enseñanza de otros lugares que la "
+"regeneración ocurre por la fe en Cristo, tenemos que interpretar de otro "
+"modo. Pedro está instando al bautismo como un medio para que sus oyentes "
+"respondan al evangelio. Si el bautismo es la vía para volver a nacer, ¿cómo "
+"podría Pablo escribir 1 Cor.1: 17 <emphasis>&quot;Porque no me envió Cristo "
+"a bautizar, sino a predicar el evangelio&quot; </emphasis>?"
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
@@ -2720,7 +2720,7 @@ msgstr ""
 #. type: Content of: <book><bookinfo>
 #: docs/howto/en/docbook/index.docbook:26
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team (bt-"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team (bt-"
 "devel@crosswire.org)</holder> </copyright>"
 msgstr ""
 
diff --git a/i18n/howto/howto-fi.po b/i18n/howto/howto-fi.po
index aa2de43..bad057f 100644
--- a/i18n/howto/howto-fi.po
+++ b/i18n/howto/howto-fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: howto-fi\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 11:03-0300\n"
+"POT-Creation-Date: 2014-01-04 00:55-0500\n"
 "PO-Revision-Date: 2009-02-23 20:32+0200\n"
 "Last-Translator: Ilpo Kantonen <ilpo@iki.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -2338,7 +2338,7 @@ msgstr ""
 #. type: Content of: <book><bookinfo>
 #: docs/howto/en/docbook/index.docbook:26
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team (bt-"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team (bt-"
 "devel@crosswire.org)</holder> </copyright>"
 msgstr ""
 
diff --git a/i18n/howto/howto-fr.po b/i18n/howto/howto-fr.po
index edd7890..3b34086 100644
--- a/i18n/howto/howto-fr.po
+++ b/i18n/howto/howto-fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: full\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 11:03-0300\n"
+"POT-Creation-Date: 2014-01-04 00:55-0500\n"
 "PO-Revision-Date: 2011-01-31 12:52+0100\n"
 "Last-Translator: Vincent BERZIN <berzinv@gmail.com>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -2419,13 +2419,13 @@ msgstr "L'équipe BibleTime"
 #: docs/howto/en/docbook/index.docbook:26
 #, fuzzy
 #| msgid ""
-#| "<copyright> <year>1999-2013</year> <holder>The team of &bibletime; "
+#| "<copyright> <year>1999-2014</year> <holder>The team of &bibletime; "
 #| "(info@bibletime.info)</holder> </copyright>"
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team (bt-"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team (bt-"
 "devel@crosswire.org)</holder> </copyright>"
 msgstr ""
-"<copyright> <year>1999-2013</year> <holder>L'équipe BibleTime; "
+"<copyright> <year>1999-2014</year> <holder>L'équipe BibleTime; "
 "(info@bibletime.info)</holder> </copyright>"
 
 # type: Content of: <book><bookinfo><legalnotice><para>
diff --git a/i18n/howto/howto-hu.po b/i18n/howto/howto-hu.po
index 37d54c6..8502b96 100644
--- a/i18n/howto/howto-hu.po
+++ b/i18n/howto/howto-hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: howto-hu\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 11:03-0300\n"
+"POT-Creation-Date: 2014-01-04 00:55-0500\n"
 "PO-Revision-Date: 2009-05-01 20:25+0200\n"
 "Last-Translator: howto.pot\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -2696,7 +2696,7 @@ msgstr ""
 #. type: Content of: <book><bookinfo>
 #: docs/howto/en/docbook/index.docbook:26
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team (bt-"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team (bt-"
 "devel@crosswire.org)</holder> </copyright>"
 msgstr ""
 
diff --git a/i18n/howto/howto-it.po b/i18n/howto/howto-it.po
index 1ed01f9..577b044 100644
--- a/i18n/howto/howto-it.po
+++ b/i18n/howto/howto-it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 11:03-0300\n"
+"POT-Creation-Date: 2014-01-04 00:55-0500\n"
 "PO-Revision-Date: 2010-11-16 09:42+0100\n"
 "Last-Translator: \n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -2495,13 +2495,13 @@ msgstr "Il team di BibleTime"
 #: docs/howto/en/docbook/index.docbook:26
 #, fuzzy
 #| msgid ""
-#| "<copyright> <year>1999-2013</year> <holder>The team of &bibletime; "
+#| "<copyright> <year>1999-2014</year> <holder>The team of &bibletime; "
 #| "(info@bibletime.info)</holder> </copyright>"
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team (bt-"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team (bt-"
 "devel@crosswire.org)</holder> </copyright>"
 msgstr ""
-"<copyright> <year>1999-2013</year> <holder>Il team di &bibletime; "
+"<copyright> <year>1999-2014</year> <holder>Il team di &bibletime; "
 "(info@bibletime.info)</holder> </copyright>"
 
 # type: Content of: <book><bookinfo><legalnotice><para>
diff --git a/i18n/howto/howto-ko.po b/i18n/howto/howto-ko.po
index e684396..0a24341 100644
--- a/i18n/howto/howto-ko.po
+++ b/i18n/howto/howto-ko.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: full\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 11:03-0300\n"
+"POT-Creation-Date: 2014-01-04 00:55-0500\n"
 "PO-Revision-Date: 2004-02-04 11:05+0545\n"
 "Last-Translator:  <s970501@ku.edu.np>\n"
 "Language-Team:  <ko@li.org>\n"
@@ -2108,7 +2108,7 @@ msgstr ""
 #. type: Content of: <book><bookinfo>
 #: docs/howto/en/docbook/index.docbook:26
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team (bt-"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team (bt-"
 "devel@crosswire.org)</holder> </copyright>"
 msgstr ""
 
diff --git a/i18n/howto/howto-nl.po b/i18n/howto/howto-nl.po
index 5fdaa1e..8bc34ea 100644
--- a/i18n/howto/howto-nl.po
+++ b/i18n/howto/howto-nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: index\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 11:03-0300\n"
+"POT-Creation-Date: 2014-01-04 00:55-0500\n"
 "PO-Revision-Date: 2003-07-01 13:57+0200\n"
 "Last-Translator: Harry Vennik <htvennik@zonnet.nl>\n"
 "Language-Team: Nederlands <nl@li.org>\n"
@@ -2171,7 +2171,7 @@ msgstr ""
 #. type: Content of: <book><bookinfo>
 #: docs/howto/en/docbook/index.docbook:26
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team (bt-"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team (bt-"
 "devel@crosswire.org)</holder> </copyright>"
 msgstr ""
 
diff --git a/i18n/howto/howto-pt_BR.po b/i18n/howto/howto-pt_BR.po
index f4bc6c9..5f49ed6 100644
--- a/i18n/howto/howto-pt_BR.po
+++ b/i18n/howto/howto-pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: full\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 11:03-0300\n"
+"POT-Creation-Date: 2014-01-04 00:55-0500\n"
 "PO-Revision-Date: 2012-05-25 00:05-0500\n"
 "Last-Translator: Thomas Abthorpe <tabthorpe@FreeBSD.org>\n"
 "Language-Team: Português do Brasil <kde-i18n-doc@kde.org>\n"
@@ -2017,7 +2017,7 @@ msgstr "O Time BibleTime"
 #. type: Content of: <book><bookinfo>
 #: docs/howto/en/docbook/index.docbook:26
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team (bt-"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team (bt-"
 "devel@crosswire.org)</holder> </copyright>"
 msgstr ""
 
diff --git a/i18n/howto/howto-ru.po b/i18n/howto/howto-ru.po
index fe2eaa8..2877609 100644
--- a/i18n/howto/howto-ru.po
+++ b/i18n/howto/howto-ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: full\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 11:03-0300\n"
+"POT-Creation-Date: 2014-01-04 00:55-0500\n"
 "PO-Revision-Date: 2004-05-20 10:58+0300\n"
 "Last-Translator: Vlad Savitsky <vlad_savitsky@mail.ru>\n"
 "Language-Team: russain <ru@li.org>\n"
@@ -2149,7 +2149,7 @@ msgstr ""
 #. type: Content of: <book><bookinfo>
 #: docs/howto/en/docbook/index.docbook:26
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team (bt-"
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team (bt-"
 "devel@crosswire.org)</holder> </copyright>"
 msgstr ""
 
diff --git a/i18n/howto/howto.pot b/i18n/howto/howto.pot
index 5d5aea5..c0b0210 100644
--- a/i18n/howto/howto.pot
+++ b/i18n/howto/howto.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bibletime-translations@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-05-31 11:03-0300\n"
+"POT-Creation-Date: 2014-01-04 00:55-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1627,7 +1627,7 @@ msgstr ""
 #. type: Content of: <book><bookinfo>
 #: docs/howto/en/docbook/index.docbook:26
 msgid ""
-"<copyright> <year>1999-2013</year> <holder>The &bibletime; Team "
+"<copyright> <year>1999-2014</year> <holder>The &bibletime; Team "
 "(bt-devel@crosswire.org)</holder> </copyright>"
 msgstr ""
 
diff --git a/i18n/messages/bibletime_ui.ts b/i18n/messages/bibletime_ui.ts
index 59c3a35..8531bd9 100644
--- a/i18n/messages/bibletime_ui.ts
+++ b/i18n/messages/bibletime_ui.ts
@@ -6,7 +6,7 @@
     <message>
         <source></source>
         <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
 This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
@@ -22,452 +22,457 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTime</name>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
+        <location filename="../../src/bibletime_init.cpp" line="741"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&amp;Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&amp;Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <source>Sw&amp;itch session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&amp;ttings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&amp;Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&amp;Fullscreen mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
+        <location filename="../../src/bibletime_init.cpp" line="251"/>
         <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
+        <location filename="../../src/bibletime_init.cpp" line="256"/>
         <source>Information about the BibleTime program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&amp;Delete session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&amp;Arrangement mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&amp;Manual mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &amp;vertically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &amp;horizontally</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&amp;cascade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&amp;Cascade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &amp;vertically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &amp;horizontally</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&amp;ose all windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
+        <location filename="../../src/bibletime_init.cpp" line="224"/>
         <source>Close all open windows inside BibleTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
+        <location filename="../../src/bibletime_init.cpp" line="241"/>
         <source>&amp;Handbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&amp;Bible Study Howto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
+        <location filename="../../src/bibletime_slots.cpp" line="533"/>
         <source>Please enter a name for the new session.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
+        <location filename="../../src/bibletime_slots.cpp" line="541"/>
+        <source>Session already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_slots.cpp" line="542"/>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="107"/>
         <source>Quit BibleTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
+        <location filename="../../src/bibletime_init.cpp" line="114"/>
         <source>Toggle fullscreen mode of the main window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
+        <location filename="../../src/bibletime_init.cpp" line="123"/>
         <source>Search in &amp;open works...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &amp;Bible...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &amp;new session...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
+        <location filename="../../src/bibletime_init.cpp" line="140"/>
         <source>Create and save a new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
+        <location filename="../../src/bibletime_init.cpp" line="147"/>
         <source>Manually arrange the open windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
+        <location filename="../../src/bibletime_init.cpp" line="154"/>
         <source>Automatically tile the open windows vertically (arrange side by side)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
+        <location filename="../../src/bibletime_init.cpp" line="161"/>
         <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
+        <location filename="../../src/bibletime_init.cpp" line="165"/>
         <source>Auto-&amp;tile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
+        <location filename="../../src/bibletime_init.cpp" line="168"/>
         <source>Automatically tile the open windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
+        <location filename="../../src/bibletime_init.cpp" line="172"/>
         <source>Ta&amp;bbed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
+        <location filename="../../src/bibletime_init.cpp" line="175"/>
         <source>Automatically tab the open windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
+        <location filename="../../src/bibletime_init.cpp" line="182"/>
         <source>Automatically cascade the open windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
+        <location filename="../../src/bibletime_init.cpp" line="189"/>
         <source>Cascade the open windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
+        <location filename="../../src/bibletime_init.cpp" line="193"/>
         <source>&amp;Tile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
+        <location filename="../../src/bibletime_init.cpp" line="196"/>
         <source>Tile the open windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
+        <location filename="../../src/bibletime_init.cpp" line="203"/>
         <source>Vertically tile (arrange side by side) the open windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
+        <location filename="../../src/bibletime_init.cpp" line="210"/>
         <source>Horizontally tile (arrange on top of each other) the open windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
+        <location filename="../../src/bibletime_init.cpp" line="214"/>
         <source>Close &amp;window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
+        <location filename="../../src/bibletime_init.cpp" line="217"/>
         <source>Close the current open window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
+        <location filename="../../src/bibletime_init.cpp" line="228"/>
         <source>&amp;Configure BibleTime...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime&apos;s preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
+        <location filename="../../src/bibletime_init.cpp" line="234"/>
         <source>Bookshelf &amp;Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
+        <location filename="../../src/bibletime_init.cpp" line="237"/>
         <source>Configure your bookshelf and install/update/remove/index works</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
+        <location filename="../../src/bibletime_init.cpp" line="244"/>
         <source>Open BibleTime&apos;s handbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&amp;Tip of the day...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
+        <location filename="../../src/bibletime_init.cpp" line="263"/>
         <source>Show tips about BibleTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
+        <location filename="../../src/bibletime_init.cpp" line="402"/>
         <source>Toggle visibility of the bookshelf window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
+        <location filename="../../src/bibletime_init.cpp" line="406"/>
         <source>Toggle visibility of the bookmarks window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
+        <location filename="../../src/bibletime_init.cpp" line="410"/>
         <source>Toggle visibility of the mag window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
+        <location filename="../../src/bibletime_init.cpp" line="735"/>
         <source>Main toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
+        <location filename="../../src/bibletime_init.cpp" line="736"/>
         <source>Navigation toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
+        <location filename="../../src/bibletime_init.cpp" line="737"/>
         <source>Works toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
+        <location filename="../../src/bibletime_init.cpp" line="738"/>
         <source>Tools toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
+        <location filename="../../src/bibletime_init.cpp" line="739"/>
         <source>Format toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
+        <location filename="../../src/bibletime_init.cpp" line="777"/>
         <source>Show main toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
+        <location filename="../../src/bibletime_init.cpp" line="780"/>
         <source>Show navigation bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
+        <location filename="../../src/bibletime_init.cpp" line="783"/>
         <source>Show works toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
+        <location filename="../../src/bibletime_init.cpp" line="786"/>
         <source>Show tools toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
+        <location filename="../../src/bibletime_init.cpp" line="789"/>
         <source>Show formatting toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
+        <location filename="../../src/bibletime_init.cpp" line="792"/>
         <source>Show bookshelf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
+        <location filename="../../src/bibletime_init.cpp" line="795"/>
         <source>Show bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
+        <location filename="../../src/bibletime_init.cpp" line="798"/>
         <source>Show mag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
+        <location filename="../../src/bibletime_init.cpp" line="743"/>
         <source>Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <location filename="../../src/bibletime_init.cpp" line="774"/>
         <source>Show toolbars in text windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
+        <location filename="../../src/bibletime_init.cpp" line="801"/>
         <source>Show parallel text headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
+        <location filename="../../src/bibletime_init.cpp" line="747"/>
         <source>O&amp;pen windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show &quot;Whats this widget&quot; dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
+        <location filename="../../src/bibletime_init.cpp" line="954"/>
         <source>Whats this widget?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
+        <location filename="../../src/bibletime_init.cpp" line="126"/>
         <source>Search in all works that are currently open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
+        <location filename="../../src/bibletime_init.cpp" line="133"/>
         <source>Search in the standard Bible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
+        <location filename="../../src/bibletime_slots.cpp" line="532"/>
         <source>New Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
+        <location filename="../../src/bibletime.cpp" line="77"/>
         <source>Initializing the SWORD engine...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
+        <location filename="../../src/bibletime.cpp" line="85"/>
         <source>Creating BibleTime&apos;s user interface...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
+        <location filename="../../src/bibletime.cpp" line="92"/>
         <source>Initializing menu- and toolbars...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Unlock Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Enter the unlock key for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
+        <location filename="../../src/bibletime.cpp" line="214"/>
         <source>Warning: Invalid unlock key!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
+        <location filename="../../src/bibletime.cpp" line="215"/>
         <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
+        <location filename="../../src/bibletime_init.cpp" line="255"/>
         <source>&amp;About BibleTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
+        <location filename="../../src/bibletime_init.cpp" line="733"/>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
+        <location filename="../../src/bibletime_init.cpp" line="734"/>
         <source>Mag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -475,7 +480,8 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTimeApp</name>
     <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
+        <location filename="../../src/bibletimeapp.cpp" line="59"/>
+        <location filename="../../src/mobile/bibletimeapp.cpp" line="63"/>
         <source>Fatal error!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -483,7 +489,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtAboutDialog</name>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
         <source>BibleTime is an easy to use but powerful Bible study tool.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -498,52 +504,47 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="109"/>
         <source>About BibleTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="121"/>
         <source>&amp;BibleTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="126"/>
         <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="137"/>
         <source>&amp;Contributors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="148"/>
         <source>The following people contributed to BibleTime:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="150"/>
         <source>documentation and translation manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="172"/>
         <source>project manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>tester</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>usability expert</source>
         <translation type="unfinished"></translation>
     </message>
@@ -583,52 +584,57 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
         <source>designer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="130"/>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="139"/>
         <source>developer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
         <source>project founder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="157"/>
         <source>packager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="158"/>
         <source>creator of The Sword Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
         <source>domain sponsor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
         <source>howto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="141"/>
         <source>artist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="173"/>
         <source>documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="188"/>
         <source>The following people translated BibleTime into their language:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -656,37 +662,37 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBibleKeyWidget</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="110"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
         <source>Next book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
         <source>Previous book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="117"/>
         <source>Next chapter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
         <source>Previous chapter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="122"/>
         <source>Next verse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
         <source>Previous verse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -765,27 +771,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfGroupingMenu</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
         <source>Category/Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
         <source>Language/Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="105"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="108"/>
         <source>No grouping</source>
         <translation type="unfinished"></translation>
     </message>
@@ -793,7 +799,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfModel</name>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
+        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="78"/>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
@@ -801,23 +807,23 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfWidget</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="157"/>
         <source>Fi&amp;lter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="158"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
         <source>Grouping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="159"/>
         <source>Change the grouping of items in the bookshelf.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
         <source>Show/hide works</source>
         <translation type="unfinished"></translation>
     </message>
@@ -831,69 +837,130 @@ This file is distributed under the same license as the Bibetime package.</transl
     </message>
 </context>
 <context>
+    <name>BtConfig</name>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="46"/>
+        <source>Old testament</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="47"/>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="48"/>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="49"/>
+        <source>Prophets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="50"/>
+        <source>New testament</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="51"/>
+        <source>Gospels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="52"/>
+        <source>Letters/Epistles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="53"/>
+        <source>Paul&apos;s Epistles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="89"/>
+        <source>Error loading configuration!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="90"/>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BtConfigCore</name>
+    <message>
+        <location filename="../../src/backend/config/btconfigcore.cpp" line="62"/>
+        <source>Default Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtDisplaySettingsButton</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="103"/>
         <source>Use linebreaks after each verse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
         <source>Show verse numbers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
         <source>Show headings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
         <source>Highlight words of Jesus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
         <source>Show Hebrew vowel points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
         <source>Show Hebrew cantillation marks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
         <source>Show Greek accents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
         <source>Use alternative textual variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
         <source>Show scripture cross-references</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
         <source>Show footnotes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
         <source>Show morph segmentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="120"/>
         <source>Display settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="123"/>
         <source>Display settings: No options available</source>
         <translation type="unfinished"></translation>
     </message>
@@ -901,27 +968,45 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtEditBookmarkDialog</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="71"/>
         <source>Edit Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>BtFindWidget</name>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="28"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="29"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="74"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtFontChooserWidget</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
@@ -942,27 +1027,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="151"/>
         <source>&amp;Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
         <source>The font selection below will apply to all texts in this language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
         <source>Use custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
         <source>Optionally specify a custom font for each language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="150"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -970,67 +1055,67 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtIndexPage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="124"/>
         <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
         <source>Automatically delete orphaned indexes when BibleTime starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="127"/>
         <source>Delete the selected indexes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="130"/>
         <source>Create new indexes for the selected works</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Index size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="107"/>
         <source>%1 KiB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="114"/>
         <source>0 KiB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="122"/>
         <source>Search Indexes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="91"/>
         <source>Indexed Works</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="96"/>
         <source>Unindexed Works</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
         <source>Create...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1056,17 +1141,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallModuleChooserDialogModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="88"/>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="89"/>
         <source>Installation source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="90"/>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1159,12 +1244,12 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="388"/>
         <source>Delete Source?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="389"/>
         <source>Do you really want to delete this source?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1177,17 +1262,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPageModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="75"/>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="76"/>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="77"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1203,99 +1288,99 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPathDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="35"/>
         <source>Bookshelf Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
         <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="45"/>
         <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="48"/>
         <source>Configure bookshelf folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="53"/>
         <source>Configuration file for the folders is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="61"/>
         <source>Folders where new works can be installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
         <source>Read-only folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="66"/>
         <source>Nonexistent folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="80"/>
         <source>&amp;Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="81"/>
         <source>Add new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="86"/>
         <source>&amp;Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="87"/>
         <source>Edit the selected folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="92"/>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="93"/>
         <source>Remove the selected folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="167"/>
         <source>This default folder in your home directory can&apos;t be removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="194"/>
         <source>Choose Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>Use Folder?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1303,52 +1388,42 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallProgressDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="60"/>
         <source>Stop All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="55"/>
         <source>Waiting for turn...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="113"/>
         <source>Preparing install...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="37"/>
         <source>Install Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1356,17 +1431,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
         <source>Language for names of Bible books:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="136"/>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="133"/>
         <source>Languages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1416,7 +1491,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtModuleManagerDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="57"/>
         <source>Bookshelf Manager</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1424,7 +1499,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkAction</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="103"/>
         <source>&amp;Open work</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1432,12 +1507,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkActionMenu</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="42"/>
         <source>&amp;Grouping order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="43"/>
         <source>Sets the grouping order for the items in this menu.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1473,47 +1548,47 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtRemovePage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="100"/>
         <source>Select &amp;works to uninstall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&amp;Remove...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="98"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="111"/>
         <source>Start removal of %1 works:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="114"/>
         <source>Start removal:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="145"/>
         <source>You selected the following work(s): </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="149"/>
         <source>Do you really want to remove them from your system?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
         <source>Remove the selected works</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="151"/>
         <source>Remove Works?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1534,12 +1609,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtSearchModuleChooserDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="47"/>
         <source>Works to Search in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="49"/>
         <source>Select the works which should be searched.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1620,24 +1695,165 @@ shortcut</source>
     </message>
 </context>
 <context>
+    <name>BtStandardWorksTab</name>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="169"/>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="174"/>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="178"/>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="182"/>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="186"/>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="190"/>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="194"/>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="198"/>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="202"/>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BtTextFiltersTab</name>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="74"/>
+        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="78"/>
+        <source>Insert line break after each verse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
+        <source>Show verse numbers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
+        <source>Show section headings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
+        <source>Show scripture cross-references</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="82"/>
+        <source>Show Greek accents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="83"/>
+        <source>Show Hebrew vowel points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="84"/>
+        <source>Show Hebrew cantillation marks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="85"/>
+        <source>Show morph segmentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="86"/>
+        <source>Use textual variants</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
         <source>Add/remove/replace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
         <source>Replace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1645,87 +1861,87 @@ shortcut</source>
 <context>
     <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="69"/>
         <source>Tip Of The Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="83"/>
         <source>Show tips at startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="94"/>
         <source>Next Tip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
         <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
         <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="134"/>
         <source>To learn more about the BibleTime project please go to our web site.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="137"/>
         <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
         <source>Select the icon again to stop the synchronization.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="142"/>
         <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="147"/>
         <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="151"/>
         <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="154"/>
         <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="157"/>
         <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="163"/>
         <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="178"/>
         <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="168"/>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
         <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1741,48 +1957,48 @@ shortcut</source>
 <context>
     <name>CAcceleratorSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="128"/>
         <source>Choose action group:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="130"/>
         <source>Main Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
         <source>All text windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="132"/>
         <source>Bible windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
         <source>Commentary windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="134"/>
         <source>Lexicon windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
         <source>Book windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
         <source>
    &quot;%1&quot; in the &quot;%2&quot; group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
         <source>Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1790,95 +2006,95 @@ shortcut</source>
 <context>
     <name>CBibleReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="64"/>
         <source>Next book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="68"/>
         <source>Previous book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="72"/>
         <source>Next chapter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="76"/>
         <source>Previous chapter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="80"/>
         <source>Next verse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="84"/>
         <source>Previous verse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="89"/>
         <source>Copy chapter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="92"/>
         <source>Save chapter as plain text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="95"/>
         <source>Save chapter as HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="98"/>
         <source>Print chapter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="110"/>
         <source>Text of reference</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
         <source>Reference with text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="253"/>
         <source>Bible window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="263"/>
         <source>Copy...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="274"/>
         <source>Save...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="287"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="371"/>
         <source>Copying</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="390"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="408"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1886,7 +2102,7 @@ shortcut</source>
 <context>
     <name>CBookReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
+        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="70"/>
         <source>Toggle tree view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1894,93 +2110,93 @@ shortcut</source>
 <context>
     <name>CBookmarkIndex</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="92"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="583"/>
         <source>New folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
         <source>Rename folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
         <source>Delete Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="704"/>
         <source>Do you really want to delete the selected items and child-items?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="814"/>
         <source>The work to which the bookmark points to is not installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
         <source>Print bookmarks...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="103"/>
         <source>Remove selected items...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
         <source>Import to folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
         <source>Edit bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
         <source>Sort folder bookmarks...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
         <source>Sort all bookmarks...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="100"/>
         <source>Export from folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="393"/>
         <source>Can drop only bookmarks or one folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="398"/>
         <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="406"/>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="467"/>
         <source>Drag references from text views to this view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1988,42 +2204,42 @@ shortcut</source>
 <context>
     <name>CCommentaryReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="31"/>
         <source>Next book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="35"/>
         <source>Previous book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="39"/>
         <source>Next chapter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="43"/>
         <source>Previous chapter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="47"/>
         <source>Next verse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="51"/>
         <source>Previous verse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="56"/>
         <source>Synchronize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="59"/>
         <source>Synchronize the displayed entry of this work with the active Bible window</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2031,7 +2247,7 @@ shortcut</source>
 <context>
     <name>CConfigurationDialog</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="41"/>
         <source>Configure BibleTime</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2039,67 +2255,67 @@ shortcut</source>
 <context>
     <name>CDisplaySettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
         <source>Display templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
         <source>Available display styles:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="113"/>
         <source>Style preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="131"/>
         <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="138"/>
         <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="145"/>
         <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="155"/>
         <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="160"/>
         <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="106"/>
         <source>Display templates define how text is displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="110"/>
         <source>Show the BibleTime logo on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
         <source>Show startup logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="150"/>
         <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="101"/>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2107,62 +2323,62 @@ shortcut</source>
 <context>
     <name>CDisplayWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="215"/>
         <source>Back in history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="223"/>
         <source>Forward in history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="192"/>
         <source>Select all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="196"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="200"/>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="204"/>
         <source>Change location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="209"/>
         <source>Search with works of this window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="393"/>
         <source>Work chooser buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="403"/>
         <source>Text area header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="453"/>
         <source>Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="459"/>
         <source>Tool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="465"/>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2170,61 +2386,61 @@ shortcut</source>
 <context>
     <name>CHTMLWriteDisplay</name>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="60"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="67"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="79"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="84"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="94"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="99"/>
         <source>Center</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="104"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="231"/>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="243"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="255"/>
         <source>Font color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="89"/>
         <source>Align left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="109"/>
         <source>Align right</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2232,17 +2448,17 @@ shortcut</source>
 <context>
     <name>CHTMLWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="122"/>
         <source>Module not writable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="124"/>
         <source>Module is not writable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="125"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2250,22 +2466,22 @@ shortcut</source>
 <context>
     <name>CLexiconKeyChooser</name>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
         <source>Entries of the current work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
         <source>Next entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="49"/>
         <source>Previous entry</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2273,70 +2489,70 @@ shortcut</source>
 <context>
     <name>CLexiconReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="47"/>
         <source>Next entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="51"/>
         <source>Previous entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="55"/>
         <source>Copy reference only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
         <source>Save entry as HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
         <source>Print reference only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
         <source>Strong&apos;s Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
         <source>Entry with text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="134"/>
         <source>Entry as plain text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="265"/>
         <source>Lexicon window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="272"/>
         <source>Copy...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="281"/>
         <source>Save...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="297"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="340"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="364"/>
         <source>Saving</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2344,91 +2560,112 @@ shortcut</source>
 <context>
     <name>CPlainWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="235"/>
         <source>Sync with active Bible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="245"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="249"/>
         <source>Save text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="254"/>
         <source>Delete current entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="263"/>
         <source>Restore original text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="163"/>
         <source>Module not writable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="165"/>
         <source>Module is not writable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="166"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="240"/>
         <source>Synchronize (show the same verse) with the active Bible window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="258"/>
         <source>Delete current entry (no undo)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="267"/>
         <source>Restore original text, new text will be lost</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save Text?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <source>Save text before closing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save changed text?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="232"/>
         <source>Save Search Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="243"/>
+        <source>BibleTime Search Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
-        <source>BibleTime Search Analysis</source>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="234"/>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="259"/>
+        <source>Search text:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="263"/>
+        <source>Results by work and book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="265"/>
         <source>Book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="293"/>
         <source>Total hits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="303"/>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2436,168 +2673,168 @@ shortcut</source>
 <context>
     <name>CSwordModuleInfo</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="763"/>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="766"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="774"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="771"/>
         <source>Markup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="782"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="787"/>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="792"/>
         <source>LCSH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="796"/>
         <source>Writable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>no</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="801"/>
         <source>Unlock key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="822"/>
         <source>Features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="830"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="834"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="856"/>
         <source>Distribution license</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="857"/>
         <source>Distribution source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="858"/>
         <source>Distribution notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="859"/>
         <source>Text source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="860"/>
         <source>Copyright notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
         <source>Copyright holder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
         <source>Copyright date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
         <source>Copyright contact name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
         <source>Copyright contact address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
         <source>Copyright contact email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="956"/>
         <source>Bibles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="958"/>
         <source>Commentaries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="960"/>
         <source>Books</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="962"/>
         <source>Cults/Unorthodox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="964"/>
         <source>Maps and Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="966"/>
         <source>Daily Devotionals</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="968"/>
         <source>Lexicons and Dictionaries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="970"/>
         <source>Glossaries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="972"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2605,17 +2842,17 @@ shortcut</source>
 <context>
     <name>CSwordSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="43"/>
         <source>Standard works</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="44"/>
         <source>Text filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="41"/>
         <source>Desk</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2623,177 +2860,158 @@ shortcut</source>
 <context>
     <name>CSwordSetupInstallSourcesDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="47"/>
         <source>Caption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="68"/>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="91"/>
         <source>Get list...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="92"/>
         <source>Download a list of sources from CrossWire server and add sources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
         <source>Please provide a caption.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
         <source>A source with this caption already exists. Please provide a different caption.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
         <source>Please provide a server name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
         <source>Please provide a valid, readable path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Please provide a path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="160"/>
         <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
 
 Do you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
         <source>Get source list from remote server?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="167"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="168"/>
         <source>Downloading List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="178"/>
         <source>Connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="197"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="198"/>
         <source>Refreshing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="39"/>
         <source>New  Installation Source</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="178"/>
         <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="194"/>
         <source>Abbreviation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="203"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="290"/>
         <source>Cross references</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="343"/>
         <source>Footnote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="374"/>
         <source>Strongs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="451"/>
         <source>Morphology</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="472"/>
         <source>Word lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="60"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
         <source>Select all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="80"/>
         <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2801,28 +3019,28 @@ Do you want to continue?</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="412"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="422"/>
         <source>Indexing aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="413"/>
         <source>An internal error occurred while building the index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="423"/>
         <source>An internal error occurred while building the index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="522"/>
         <source>Search aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="523"/>
         <source>An internal error occurred while executing your search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2863,7 +3081,7 @@ Do you want to continue?</source>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="122"/>
         <source>Bibles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2880,740 +3098,740 @@ Do you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="390"/>
         <source>Added text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="143"/>
         <source>Names of languages</source>
         <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
         <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="148"/>
         <source>Afrikaans</source>
         <extracomment>Language name af</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="151"/>
         <source>Amuzgo, Guerrero</source>
         <extracomment>Language name amu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="153"/>
         <source>English, Old (ca.450-1100)</source>
         <extracomment>Language name ang</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="155"/>
         <source>Arabic</source>
         <extracomment>Language name ar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="158"/>
         <source>Azerbaijani</source>
         <extracomment>Language name az</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="160"/>
         <source>Azerbaijani, South</source>
         <extracomment>Language name azb</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="165"/>
         <source>Belarusian</source>
         <extracomment>Language name be</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="167"/>
         <source>Bulgarian</source>
         <extracomment>Language name bg</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="173"/>
         <source>Breton</source>
         <extracomment>Language name br</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="175"/>
         <source>Bosnian</source>
         <extracomment>Language name bs</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="177"/>
         <source>Catalan</source>
         <extracomment>Language name ca</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="180"/>
         <source>Chinantec, Comaltepec</source>
         <extracomment>Language name cco</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="182"/>
         <source>Cebuano</source>
         <extracomment>Language name ceb</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
         <source>Chamorro</source>
         <extracomment>Language name ch</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
         <source>Chontal, Highland Oaxaca</source>
         <extracomment>Language name chd</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
         <source>Chinantec, Quiotepec</source>
         <extracomment>Language name chq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="190"/>
         <source>Chinantec, Ozumacu00edn</source>
         <extracomment>Language name chz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="193"/>
         <source>Cakchiquel, Western</source>
         <extracomment>Language name ckw</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="195"/>
         <source>Chinantec, Lalana</source>
         <extracomment>Language name cnl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="197"/>
         <source>Chinantec, Tepetotutla</source>
         <extracomment>Language name cnt</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="199"/>
         <source>Coptic</source>
         <extracomment>Language name cop</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
         <source>Czech</source>
         <extracomment>Language name cs</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
         <source>Chinantec, Sochiapan</source>
         <extracomment>Language name cso</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
         <source>Chol, Tila</source>
         <extracomment>Language name cti</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
         <source>Chatino, Western Highland</source>
         <extracomment>Language name ctp</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
         <source>Church Slavic</source>
         <extracomment>Language name cu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="212"/>
         <source>Welsh</source>
         <extracomment>Language name cy</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
         <source>Danish</source>
         <extracomment>Language name da</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
         <source>German</source>
         <extracomment>Language name de</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
         <source>Duruma</source>
         <extracomment>Language name dug</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="221"/>
         <source>Greek, Modern (1453-)</source>
         <extracomment>Language name el</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
         <source>English</source>
         <extracomment>Language name en</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="225"/>
         <source>American English</source>
         <extracomment>Language name en_US</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="227"/>
         <source>English, Middle (1100-1500)</source>
         <extracomment>Language name enm</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="229"/>
         <source>Esperanto</source>
         <extracomment>Language name eo</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="231"/>
         <source>Spanish</source>
         <extracomment>Language name es</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
         <source>Estonian</source>
         <extracomment>Language name et</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
         <source>Basque</source>
         <extracomment>Language name eu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
         <source>Persian</source>
         <extracomment>Language name fa</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
         <source>Finnish</source>
         <extracomment>Language name fi</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="243"/>
         <source>French</source>
         <extracomment>Language name fr</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="245"/>
         <source>Frisian</source>
         <extracomment>Language name fy</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="247"/>
         <source>Irish</source>
         <extracomment>Language name ga</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="249"/>
         <source>Gaelic (Scots)</source>
         <extracomment>Language name gd</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="251"/>
         <source>Geez</source>
         <extracomment>Language name gez</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
         <source>Gothic</source>
         <extracomment>Language name got</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
         <source>Manx</source>
         <extracomment>Language name gv</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
         <source>Greek, Ancient (to 1453)</source>
         <extracomment>Language name grc</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="262"/>
         <source>Hebrew</source>
         <extracomment>Language name he</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
         <source>Hausa</source>
         <extracomment>Language name hau</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
         <source>Hawaiian</source>
         <extracomment>Language name haw</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
         <source>Hindi</source>
         <extracomment>Language name hi</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="271"/>
         <source>Croatian</source>
         <extracomment>Language name hr</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="275"/>
         <source>Hungarian</source>
         <extracomment>Language name hu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
         <source>Huave, San Mateo Del Mar</source>
         <extracomment>Language name huv</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
         <source>Armenian</source>
         <extracomment>Language name hy</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
         <source>Indonesian</source>
         <extracomment>Language name id</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
         <source>Icelandic</source>
         <extracomment>Language name is</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
         <source>Italian</source>
         <extracomment>Language name it</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="291"/>
         <source>Itzu00e1</source>
         <extracomment>Language name itz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="293"/>
         <source>Ixil, San Juan Cotzal</source>
         <extracomment>Language name ixl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
         <source>Japanese</source>
         <extracomment>Language name ja</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
         <source>Jacalteco, Eastern</source>
         <extracomment>Language name jac</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
         <source>Javanese, Caribbean</source>
         <extracomment>Language name jvn</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="302"/>
         <source>Georgian</source>
         <extracomment>Language name ka</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
         <source>Korean</source>
         <extracomment>Language name ko</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="315"/>
         <source>Kurdish</source>
         <extracomment>Language name ku</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
         <source>Kirghiz</source>
         <extracomment>Language name ky</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
         <source>Latin</source>
         <extracomment>Language name la</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
         <source>Lacandon</source>
         <extracomment>Language name lac</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
         <source>Lithuanian</source>
         <extracomment>Language name lt</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="332"/>
         <source>Latvian</source>
         <extracomment>Language name lv</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="334"/>
         <source>Malagasy</source>
         <extracomment>Language name mg</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="337"/>
         <source>Maori</source>
         <extracomment>Language name mi</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="339"/>
         <source>Mixe, Isthmus</source>
         <extracomment>Language name mir</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="341"/>
         <source>Mixtec, Coatzospan</source>
         <extracomment>Language name miz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="343"/>
         <source>Macedonian</source>
         <extracomment>Language name mk</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="345"/>
         <source>Mixtec, Silacayoapan</source>
         <extracomment>Language name mks</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="350"/>
         <source>More</source>
         <extracomment>Language name mos</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
         <source>Malay</source>
         <extracomment>Language name ms</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
         <source>Maltese</source>
         <extracomment>Language name mt</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="375"/>
         <source>Low German; Low Saxon</source>
         <extracomment>Language name nds</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="377"/>
         <source>Nepali</source>
         <extracomment>Language name ne</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="379"/>
         <source>Nahuatl, Guerrero</source>
         <extracomment>Language name ngu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
         <source>Nahuatl, Northern Oaxaca</source>
         <extracomment>Language name nhy</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
         <source>Dutch</source>
         <extracomment>Language name nl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
         <source>Norwegian Nynorsk</source>
         <extracomment>Language name nn</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
         <source>Norwegian</source>
         <extracomment>Language name no</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="397"/>
         <source>Otomi, Queru00e9taro</source>
         <extracomment>Language name otq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
         <source>Papiamento</source>
         <extracomment>Language name pap</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
         <source>Polish</source>
         <extracomment>Language name pl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="411"/>
         <source>Persian (Dari)</source>
         <extracomment>Language name prs</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="415"/>
         <source>Portuguese</source>
         <extracomment>Language name pt</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
         <source>Brasilian Portuguese</source>
         <extracomment>Language name pt_BR</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
         <source>Quichu00e9, West Central</source>
         <extracomment>Language name qut</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
         <source>Romanian</source>
         <extracomment>Language name ro</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
         <source>Russian</source>
         <extracomment>Language name ru</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="431"/>
         <source>Scots</source>
         <extracomment>Language name sco</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="437"/>
         <source>Slovak</source>
         <extracomment>Language name sk</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="439"/>
         <source>Slovenian</source>
         <extracomment>Language name sl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="443"/>
         <source>Somali</source>
         <extracomment>Language name so</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
         <source>Albanian</source>
         <extracomment>Language name sq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="453"/>
         <source>Swedish</source>
         <extracomment>Language name sv</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="455"/>
         <source>Swahili</source>
         <extracomment>Language name sw</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="457"/>
         <source>Syriac</source>
         <extracomment>Language name syr</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="459"/>
         <source>Tamil</source>
         <extracomment>Language name ta</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="463"/>
         <source>Thai</source>
         <extracomment>Language name th</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
         <source>Tagalog</source>
         <extracomment>Language name tl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="470"/>
         <source>Tswana</source>
         <extracomment>Language name tn</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="472"/>
         <source>Turkish</source>
         <extracomment>Language name tr</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
         <source>Tektiteko</source>
         <extracomment>Language name ttc</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="479"/>
         <source>Tahitian</source>
         <extracomment>Language name ty</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="481"/>
         <source>Tzotzil, Zinacantu00e1n</source>
         <extracomment>Language name tzz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
         <source>Ukrainian</source>
         <extracomment>Language name uk</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
         <source>Orya</source>
         <extracomment>Language name ury</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
         <source>Uspanteco</source>
         <extracomment>Language name usp</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="492"/>
         <source>Vietnamese</source>
         <extracomment>Language name vi</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="496"/>
         <source>Xhosa</source>
         <extracomment>Language name xh</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="163"/>
         <source>Bavarian</source>
         <extracomment>Language name bar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="326"/>
         <source>Lombard</source>
         <extracomment>Language name lmo</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="403"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
         <source>Uma</source>
         <extracomment>Language name ppk
 ----------
@@ -3621,441 +3839,421 @@ Language name ppk</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="448"/>
         <source>Sranan</source>
         <extracomment>Language name srn</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
         <source>Yiddish</source>
         <extracomment>Language name yi</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
         <source>Zapotec, San Juan Guelavu00eda</source>
         <extracomment>Language name zab</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="507"/>
         <source>Zapotec, Mitla</source>
         <extracomment>Language name zaw</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="509"/>
         <source>Chinese</source>
         <extracomment>Language name zh</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="511"/>
         <source>Zapotec, Amatlu00e1n</source>
         <extracomment>Language name zpo</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
         <source>Zapotec, Zoogocho</source>
         <extracomment>Language name zpq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="515"/>
         <source>Zapotec, Yalu00e1lag</source>
         <extracomment>Language name zpu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
         <source>Zapotec, Chichicapan</source>
         <extracomment>Language name zpv</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
         <source>Zapotec, Southern Rincon</source>
         <extracomment>Language name zsr</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
         <source>Zapotec, Quioquitani-Quieru00ed</source>
         <extracomment>Language name ztq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
         <source>Zapotec, Yatee</source>
         <extracomment>Language name zty</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="525"/>
         <source>Zulu</source>
         <extracomment>Language name zu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="314"/>
         <source>Footnotes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="316"/>
         <source>Strong&apos;s numbers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="318"/>
         <source>Headings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="320"/>
         <source>Morphological tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="322"/>
         <source>Lemmas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="324"/>
         <source>Hebrew vowel points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="326"/>
         <source>Hebrew cantillation marks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="328"/>
         <source>Greek accents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="330"/>
         <source>Red letter words</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="332"/>
         <source>Textual variants</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="334"/>
         <source>Scripture cross-references</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="336"/>
         <source>Morph segmentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
         <source>Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
+        <source>Remote FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="32"/>
+        <source>Remote SFTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="33"/>
+        <source>Remote HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="34"/>
+        <source>Remote HTTPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
         <source>HTML files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="438"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>Text files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="444"/>
         <source>Save file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="130"/>
         <source>Save document ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
         <source>BibleTime bookmark files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="127"/>
         <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="60"/>
         <source>New folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
+        <location filename="../../src/util/tool.cpp" line="48"/>
         <source>The file already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
+        <location filename="../../src/util/tool.cpp" line="49"/>
         <source>Do you want to overwrite it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
+        <location filename="../../src/util/tool.cpp" line="69"/>
+        <location filename="../../src/util/tool.cpp" line="75"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
+        <location filename="../../src/util/tool.cpp" line="78"/>
         <source>Please check permissions etc.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
+        <location filename="../../src/util/tool.cpp" line="197"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
+        <location filename="../../src/util/tool.cpp" line="218"/>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
+        <location filename="../../src/util/tool.cpp" line="207"/>
         <source>Encrypted - needs unlock key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
+        <location filename="../../src/util/tool.cpp" line="71"/>
+        <source>Error while writing to file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="72"/>
+        <source>Please check that enough disk space is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="77"/>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="231"/>
         <source>Double click for more information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
+        <location filename="../../src/util/tool.cpp" line="213"/>
         <source>Updated version available!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
+        <location filename="../../src/util/tool.cpp" line="226"/>
         <source>Installed version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="273"/>
         <source>Haitian Creole</source>
         <extracomment>Language name ht</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
         <source>Kekchu00ed</source>
         <comment>kek</comment>
         <extracomment>Language name kek</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="357"/>
         <source>(Multiple languages)</source>
         <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="359"/>
         <source>Mam, Central</source>
         <extracomment>Language name mvc</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
         <source>Mam, Todos Santos Cuchumatu00e1n</source>
         <extracomment>Language name mvj</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="363"/>
         <source>Mixe, Juquila</source>
         <extracomment>Language name mxq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="365"/>
         <source>Mixtec, Jamiltepec</source>
         <extracomment>Language name mxt</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="367"/>
         <source>Burmese</source>
         <extracomment>Language name my</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="370"/>
         <source>Norwegian Bokmu00e5l</source>
         <extracomment>Language name nb</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="372"/>
         <source>Nahuatl, Michoacu00e1n</source>
         <extracomment>Language name ncl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
         <source>Potawatomi</source>
         <extracomment>Language name pot</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="468"/>
         <source>Klingon</source>
         <extracomment>Language name tlh</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="498"/>
         <source>Mixtec, Diuxi-Tilantongo</source>
         <extracomment>Language name xtd</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
         <source>Yoryba</source>
         <extracomment>Language name yo</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="407"/>
         <source>Verb tense changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>Can&apos;t write file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>The Sword config file can&apos;t be written!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="39"/>
         <source>Export Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="50"/>
         <source>Import bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
+        <location filename="../../src/util/tool.cpp" line="46"/>
         <source>Overwrite File?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="276"/>
         <source>Parsing Strong&apos;s Numbers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="154"/>
         <source>This shortcut conflicts with the shortcut for the following actions:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
         <source>Do you want to clear the conflicting shortcuts and continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="23"/>
         <source>Indexed works</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="24"/>
         <source>Unindexed works</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4100,17 +4298,17 @@ Language name ppk</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="57"/>
         <source>CSS base template not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="74"/>
         <source>Default template &quot;%1&quot; not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="113"/>
         <source>Replace</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4118,91 +4316,91 @@ Language name ppk</extracomment>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="58"/>
         <source>OK</source>
         <comment>Dialog Button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="59"/>
         <source>Open</source>
         <comment>Dialog Button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="60"/>
         <source>Save</source>
         <comment>Dialog Button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="61"/>
         <source>Cancel</source>
         <comment>Dialog Button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="62"/>
         <source>Close</source>
         <comment>Dialog Button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="63"/>
         <source>Discard</source>
         <comment>Dialog Button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="64"/>
         <source>Apply</source>
         <comment>Dialog Button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="65"/>
         <source>Reset</source>
         <comment>Dialog Button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="66"/>
         <source>Restore defaults</source>
         <comment>Dialog Button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="67"/>
         <source>Help</source>
         <comment>Dialog Button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="68"/>
         <source>Save All</source>
         <comment>Dialog Button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="69"/>
         <source>Yes</source>
         <comment>Dialog Button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="70"/>
         <source>Yes to all</source>
         <comment>Dialog Button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="71"/>
         <source>No</source>
         <comment>Dialog Button</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="72"/>
         <source>No to all</source>
         <comment>Dialog Button</comment>
         <translation type="unfinished"></translation>
@@ -4211,102 +4409,102 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchOptionsArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="97"/>
         <source>Search for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="104"/>
         <source>&amp;Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="106"/>
         <source>Start to search the text in the chosen works</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="109"/>
         <source>Ch&amp;oose...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="111"/>
         <source>Choose works for the search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="114"/>
         <source>S&amp;etup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="133"/>
         <source>All of the words (AND is added between the words)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="137"/>
         <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="148"/>
         <source>Scope:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="169"/>
         <source>The text you want to search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="173"/>
         <source>Works:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="346"/>
         <source>No search scope</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="128"/>
         <source>All words</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="116"/>
         <source>Configure predefined scopes for search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="130"/>
         <source>Some words</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
         <source>Free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
         <source>Some of the words (OR is added between the words)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
         <source>Full lucene syntax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
         <source>Click the link to get help for search syntax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="159"/>
         <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4314,17 +4512,17 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchResultArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="85"/>
         <source>Text of the selected search result item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="88"/>
         <source>Select all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="92"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4332,242 +4530,242 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchSyntaxHelpDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="47"/>
         <source>Search Syntax Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="94"/>
         <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
         <source>Which words to find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="101"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
         <source>Grouping and order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="103"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
         <source>Wildcards (partial words)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
         <source>Text fields (different parts of text)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="208"/>
         <source>Other syntax features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
         <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
         <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="119"/>
         <source>jesus AND god</source>
         <comment>Do not translate &quot;AND&quot;.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="121"/>
         <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="123"/>
         <source>jesus OR god</source>
         <comment>Do not translate &quot;OR&quot;.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="125"/>
         <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="127"/>
         <source>jesus NOT god</source>
         <comment>Do not translate &quot;NOT&quot;.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="133"/>
         <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="131"/>
         <source>+jesus -god</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
         <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
         <source>(a AND b) OR c</source>
         <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
         <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="145"/>
         <source>&quot;says lord&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="149"/>
         <source>&quot;says the lord&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="151"/>
         <source>Finds all verses with &apos;says the LORD&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
         <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="160"/>
         <source>a*</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="162"/>
         <source>All words beginning with &apos;a&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="164"/>
         <source>a*a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="166"/>
         <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="168"/>
         <source>a?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="170"/>
         <source>&apos;at&apos; and &apos;an&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="172"/>
         <source>a??a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="174"/>
         <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
         <source>Available text fields:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="181"/>
         <source>Searches headings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="183"/>
         <source>Searches footnotes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="185"/>
         <source>Searches Strong&apos;s numbers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="187"/>
         <source>Searches morphology codes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="189"/>
         <source>Examples:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="191"/>
         <source>heading:Jesus</source>
         <comment>Do not translate &quot;heading:&quot;.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="193"/>
         <source>Finds headings with &apos;Jesus&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="195"/>
         <source>footnote:Jesus AND footnote:said</source>
         <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
         <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
         <source>strong:G846</source>
         <comment>Do not translate &quot;strong:&quot;.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="202"/>
         <source>Finds verses with Strong&apos;s Greek number 846</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="204"/>
         <source>morph:&quot;N-NSF&quot;</source>
         <comment>Do not translate &quot;morph:&quot;.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="206"/>
         <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="210"/>
         <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4613,19 +4811,19 @@ Language name ppk</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="231"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="241"/>
         <source>Copying search result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="250"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="259"/>
         <source>Saving search result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="268"/>
         <source>Printing search result</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4711,42 +4909,42 @@ Language name ppk</extracomment>
 <context>
     <name>Search::CSearchDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="130"/>
         <source>Missing indices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="87"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="131"/>
         <source>The following modules need to be indexed before they can be searched in:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="132"/>
         <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="236"/>
         <source>Drag any verse reference onto an open Bible window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="241"/>
         <source>&amp;Analyze results...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="242"/>
         <source>Show a graphical analysis of the search result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="248"/>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4787,19 +4985,19 @@ Language name ppk</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="164"/>
         <source>Printing search result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="192"/>
         <source>Saving search result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="210"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="228"/>
         <source>Copying search result</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4810,196 +5008,90 @@ Language name ppk</extracomment>
     </message>
 </context>
 <context>
-    <name>StandardWorksTab</name>
+    <name>btm::InstallProgress</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="81"/>
+        <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="84"/>
+        <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="90"/>
+        <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TextFiltersTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>btm::InstallSources</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
+        <location filename="../../src/mobile/bookshelfmanager/installsources.cpp" line="63"/>
+        <source>Failed to refresh source %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="59"/>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="62"/>
+        <source>The text you want to search for</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
+        <location filename="../../src/mobile/qml/main.qml" line="135"/>
+        <source>New Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
+        <location filename="../../src/mobile/qml/main.qml" line="136"/>
+        <source>View Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
+        <location filename="../../src/mobile/qml/main.qml" line="137"/>
+        <source>Text Font Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
+        <location filename="../../src/mobile/qml/main.qml" line="138"/>
+        <source>User Interface Font Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
+        <location filename="../../src/mobile/qml/main.qml" line="141"/>
+        <source>Bookshelf Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
+        <location filename="../../src/mobile/qml/main.qml" line="187"/>
+        <source>Single</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
+        <location filename="../../src/mobile/qml/main.qml" line="188"/>
+        <source>Tabbed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
+        <location filename="../../src/mobile/qml/main.qml" line="189"/>
+        <source>Auto-tile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
+        <location filename="../../src/mobile/qml/main.qml" line="190"/>
+        <source>Auto-tile horizontally</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
+        <location filename="../../src/mobile/qml/main.qml" line="191"/>
+        <source>Auto-tile vertically</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/messages/bibletime_ui_ar.ts b/i18n/messages/bibletime_ui_ar.ts
index d144b1e..e875910 100644
--- a/i18n/messages/bibletime_ui_ar.ts
+++ b/i18n/messages/bibletime_ui_ar.ts
@@ -6,7 +6,7 @@
     <message>
         <source></source>
         <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
 This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation>بيبل تايم</translation>
     </message>
@@ -22,452 +22,457 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTime</name>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
+        <location filename="../../src/bibletime_init.cpp" line="741"/>
         <source>&amp;File</source>
         <translation>&amp;مل�</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&amp;View</source>
         <translation>&amp;عرض</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&amp;Search</source>
         <translation>&amp;بحث</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&amp;Window</source>
         <translation>&amp;نا�ذة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&amp;ttings</source>
         <translation>إع&amp;دادات</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&amp;Help</source>
         <translation>م&amp;ساعدة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&amp;Show toolbar</source>
         <translation>&amp;إظهار شريط الأدوات</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&amp;Fullscreen mode</source>
         <translation>&amp;نمط ملء الشاشة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&amp;Quit</source>
         <translation>&amp;خروج</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
+        <location filename="../../src/bibletime_init.cpp" line="251"/>
         <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
         <translation>�تح كي�ية دراسة الكتاب المقدس ببيبل تايم.&lt;br/&gt;هذا المل� عبارة عن مقدمة �ي كي�ية دراسة الكتاب المقدس بطريقة �عالة.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
+        <location filename="../../src/bibletime_init.cpp" line="256"/>
         <source>Information about the BibleTime program</source>
         <translation>معلومات عن برنامج بيبل تايم</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation type="unfinished">&amp;ح�ظ جلسة</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>&amp;تحميل جلسة</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&amp;Delete session</source>
         <translation>ح&amp;ذ� جلسة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&amp;Arrangement mode</source>
         <translation>&amp;نمط الترتيب</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&amp;Manual mode</source>
         <translation>ال&amp;نمط اليدوي</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &amp;vertically</source>
         <translation>ترتيب &amp;عمودي تلقائي</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &amp;horizontally</source>
         <translation>ترتيب &amp;أ�قي تلقائي</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&amp;cascade</source>
         <translation>ت&amp;دريج تلقائي</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&amp;Cascade</source>
         <translation>ت&amp;دريج</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &amp;vertically</source>
         <translation>ترتيب &amp;عمودي</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &amp;horizontally</source>
         <translation>ترتيب &amp;أ�قي</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&amp;ose all windows</source>
         <translation>إغلاق &amp;كل النوا�ذ</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
+        <location filename="../../src/bibletime_init.cpp" line="224"/>
         <source>Close all open windows inside BibleTime</source>
         <translation>إغلاق كل النوا�ذ الم�توحة داخل بيبل تايم</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
+        <location filename="../../src/bibletime_init.cpp" line="241"/>
         <source>&amp;Handbook</source>
         <translation>&amp;دليل الإستخدام</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&amp;Bible Study Howto</source>
         <translation>&amp;كي�ية دراسة الكتاب المقدس</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
+        <location filename="../../src/bibletime_slots.cpp" line="533"/>
         <source>Please enter a name for the new session.</source>
         <translation>رجاءاً أدخل اسماً للجلسة الجديدة.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
+        <location filename="../../src/bibletime_slots.cpp" line="541"/>
+        <source>Session already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_slots.cpp" line="542"/>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="107"/>
         <source>Quit BibleTime</source>
         <translation>الخروج من بيبل تايم</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
+        <location filename="../../src/bibletime_init.cpp" line="114"/>
         <source>Toggle fullscreen mode of the main window</source>
         <translation>تبديل نمط ملء الشاشة للنا�ذة الرئيسية</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
+        <location filename="../../src/bibletime_init.cpp" line="123"/>
         <source>Search in &amp;open works...</source>
         <translation>ابحث �ي الكتب ال&amp;م�توحة...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &amp;Bible...</source>
         <translation>ابحث �ي ترجمة ال&amp;كتاب المقدس الإ�تراضية...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &amp;new session...</source>
         <translation>ح�ظ كجلسة &amp;جديدة...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
+        <location filename="../../src/bibletime_init.cpp" line="140"/>
         <source>Create and save a new session</source>
         <translation>إنشاء وح�ظ جلسة جديدة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
+        <location filename="../../src/bibletime_init.cpp" line="147"/>
         <source>Manually arrange the open windows</source>
         <translation>ترتيب يدوي للنوا�ذ الم�توحة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
+        <location filename="../../src/bibletime_init.cpp" line="154"/>
         <source>Automatically tile the open windows vertically (arrange side by side)</source>
         <translation>ترتيب تلقائي للنوا�ذ الم�توحة عمودياً (ترتيب جنباً إلى جنب)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
+        <location filename="../../src/bibletime_init.cpp" line="161"/>
         <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
         <translation>ترتيب تلقائي للنوا�ذ الم�توحة أ�قياً (ترتيب على رأس بعضهم بعضاً)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
+        <location filename="../../src/bibletime_init.cpp" line="165"/>
         <source>Auto-&amp;tile</source>
         <translation>ت&amp;رتيب تلقائي</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
+        <location filename="../../src/bibletime_init.cpp" line="168"/>
         <source>Automatically tile the open windows</source>
         <translation>ترتيب النوا�ذ الم�توحة تلقائياً</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
+        <location filename="../../src/bibletime_init.cpp" line="172"/>
         <source>Ta&amp;bbed</source>
         <translation>وضع الأ&amp;لسنة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
+        <location filename="../../src/bibletime_init.cpp" line="175"/>
         <source>Automatically tab the open windows</source>
         <translation>وضع الألسنة تلقائي للنوا�ذ الم�توحة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
+        <location filename="../../src/bibletime_init.cpp" line="182"/>
         <source>Automatically cascade the open windows</source>
         <translation>تدريج تلقائي للنوا�ذ الم�توحة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
+        <location filename="../../src/bibletime_init.cpp" line="189"/>
         <source>Cascade the open windows</source>
         <translation>تدريج النوا�ذ الم�توحة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
+        <location filename="../../src/bibletime_init.cpp" line="193"/>
         <source>&amp;Tile</source>
         <translation>&amp;ترتيب</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
+        <location filename="../../src/bibletime_init.cpp" line="196"/>
         <source>Tile the open windows</source>
         <translation>ترتيب النوا�ذ الم�توحة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
+        <location filename="../../src/bibletime_init.cpp" line="203"/>
         <source>Vertically tile (arrange side by side) the open windows</source>
         <translation>رتب عمودياً (جنباً إلى جنب) النوا�ذ الم�توحة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
+        <location filename="../../src/bibletime_init.cpp" line="210"/>
         <source>Horizontally tile (arrange on top of each other) the open windows</source>
         <translation>رتب أ�قياً (على رأس بعض) النوا�ذ الم�توحة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
+        <location filename="../../src/bibletime_init.cpp" line="214"/>
         <source>Close &amp;window</source>
         <translation>إ&amp;غلاق النا�ذة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
+        <location filename="../../src/bibletime_init.cpp" line="217"/>
         <source>Close the current open window</source>
         <translation>اغلق النا�ذة الم�توحة حالياً</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
+        <location filename="../../src/bibletime_init.cpp" line="228"/>
         <source>&amp;Configure BibleTime...</source>
         <translation>&amp;ضبط بيبل تايم...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime&apos;s preferences</source>
         <translation>ضبط ت�ضيلات بيبل تايم</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
+        <location filename="../../src/bibletime_init.cpp" line="234"/>
         <source>Bookshelf &amp;Manager...</source>
         <translation>مدير &amp;ر� الكتب...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
+        <location filename="../../src/bibletime_init.cpp" line="237"/>
         <source>Configure your bookshelf and install/update/remove/index works</source>
         <translation>ضبط إعدادات ر� الكتب وتثبيت/تحديث/إزالة/�هرسة الكتب</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
+        <location filename="../../src/bibletime_init.cpp" line="244"/>
         <source>Open BibleTime&apos;s handbook</source>
         <translation>�تح دليل إستخدام بيبل تايم</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&amp;Tip of the day...</source>
         <translation>&amp;تلميح اليوم...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
+        <location filename="../../src/bibletime_init.cpp" line="263"/>
         <source>Show tips about BibleTime</source>
         <translation>عرض تلميحات عن بيبل تايم</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
+        <location filename="../../src/bibletime_init.cpp" line="402"/>
         <source>Toggle visibility of the bookshelf window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
+        <location filename="../../src/bibletime_init.cpp" line="406"/>
         <source>Toggle visibility of the bookmarks window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
+        <location filename="../../src/bibletime_init.cpp" line="410"/>
         <source>Toggle visibility of the mag window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
+        <location filename="../../src/bibletime_init.cpp" line="735"/>
         <source>Main toolbar</source>
         <translation>شريط الأدوات الرئيسي</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
+        <location filename="../../src/bibletime_init.cpp" line="736"/>
         <source>Navigation toolbar</source>
         <translation>شريط التص�ح</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
+        <location filename="../../src/bibletime_init.cpp" line="737"/>
         <source>Works toolbar</source>
         <translation>شريط الكتب</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
+        <location filename="../../src/bibletime_init.cpp" line="738"/>
         <source>Tools toolbar</source>
         <translation>شريط أدوات</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
+        <location filename="../../src/bibletime_init.cpp" line="739"/>
         <source>Format toolbar</source>
         <translation>شريط تنسيق</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
+        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <source>Sw&amp;itch session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="777"/>
         <source>Show main toolbar</source>
         <translation>إظهار شريط الأدوات الرئيسي</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
+        <location filename="../../src/bibletime_init.cpp" line="780"/>
         <source>Show navigation bar</source>
         <translation>إظهار شريط التص�ح</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
+        <location filename="../../src/bibletime_init.cpp" line="783"/>
         <source>Show works toolbar</source>
         <translation>إظهار شريط الكتب</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
+        <location filename="../../src/bibletime_init.cpp" line="786"/>
         <source>Show tools toolbar</source>
         <translation>إظهار شريط أدوات</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
+        <location filename="../../src/bibletime_init.cpp" line="789"/>
         <source>Show formatting toolbar</source>
         <translation>إظهار شريط التنسيق</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
+        <location filename="../../src/bibletime_init.cpp" line="792"/>
         <source>Show bookshelf</source>
         <translation>إظهار ر� الكتب</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
+        <location filename="../../src/bibletime_init.cpp" line="795"/>
         <source>Show bookmarks</source>
         <translation>إظهار العلامات</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
+        <location filename="../../src/bibletime_init.cpp" line="798"/>
         <source>Show mag</source>
         <translation>إظهار المكبر</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
+        <location filename="../../src/bibletime_init.cpp" line="743"/>
         <source>Toolbars</source>
         <translation>أشرطة الأدوات</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <location filename="../../src/bibletime_init.cpp" line="774"/>
         <source>Show toolbars in text windows</source>
         <translation>إظهار أشرطة الأدوات �ي النوا�ذ النصية</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
+        <location filename="../../src/bibletime_init.cpp" line="801"/>
         <source>Show parallel text headers</source>
         <translation>إظهار عناوين نصية متوازية</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
+        <location filename="../../src/bibletime_init.cpp" line="747"/>
         <source>O&amp;pen windows</source>
         <translation>&amp;�تح نوا�ذ</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show &quot;Whats this widget&quot; dialog</source>
         <translation>إظهار مربع حوار &quot;ما هذه القطعة&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
+        <location filename="../../src/bibletime_init.cpp" line="954"/>
         <source>Whats this widget?</source>
         <translation>ما هذه القطعة؟</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
+        <location filename="../../src/bibletime_init.cpp" line="126"/>
         <source>Search in all works that are currently open</source>
         <translation>البحث �ي جميع الكتب الم�توحة حالياً</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
+        <location filename="../../src/bibletime_init.cpp" line="133"/>
         <source>Search in the standard Bible</source>
         <translation>البحث �ي ترجمة الكتاب المقدس الإ�تراضية</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
+        <location filename="../../src/bibletime_slots.cpp" line="532"/>
         <source>New Session</source>
         <translation>جلسة جديدة</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
+        <location filename="../../src/bibletime.cpp" line="77"/>
         <source>Initializing the SWORD engine...</source>
         <translation>تهيئة محرك سورد...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
+        <location filename="../../src/bibletime.cpp" line="85"/>
         <source>Creating BibleTime&apos;s user interface...</source>
         <translation>إنشاء واجهة مستخدم بيبل تايم...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
+        <location filename="../../src/bibletime.cpp" line="92"/>
         <source>Initializing menu- and toolbars...</source>
         <translation>تهيئة القائمة وأشرطة الأدوات...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Unlock Work</source>
         <translation>�تح ق�ل الكتاب</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Enter the unlock key for %1.</source>
         <translation>ادخل م�تاح �ك الق�ل %1.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
+        <location filename="../../src/bibletime.cpp" line="214"/>
         <source>Warning: Invalid unlock key!</source>
         <translation>تحذير: الم�تاح غير صالح!</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
+        <location filename="../../src/bibletime.cpp" line="215"/>
         <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
         <translation>الم�تاح الذي أدخلته لم ي�تح ق�ل هذا العنصر. يرجى المحاولة مرة أخرى.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
+        <location filename="../../src/bibletime_init.cpp" line="255"/>
         <source>&amp;About BibleTime</source>
         <translation>&amp;عن بيبل تايم</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
+        <location filename="../../src/bibletime_init.cpp" line="733"/>
         <source>Bookmarks</source>
         <translation>علامات</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
+        <location filename="../../src/bibletime_init.cpp" line="734"/>
         <source>Mag</source>
         <translation>المكبر</translation>
     </message>
@@ -475,7 +480,8 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTimeApp</name>
     <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
+        <location filename="../../src/bibletimeapp.cpp" line="59"/>
+        <location filename="../../src/mobile/bibletimeapp.cpp" line="63"/>
         <source>Fatal error!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -483,7 +489,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtAboutDialog</name>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
         <source>BibleTime is an easy to use but powerful Bible study tool.</source>
         <translation>بيبل تايم هو برنامج قوي وسهل الإستخدام لدراسة الكتاب المقدس.</translation>
     </message>
@@ -498,52 +504,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>الرخصة الكاملة الملزمة قانونياً أدناه.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="109"/>
         <source>About BibleTime</source>
         <translation>عن بيبل تايم</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="121"/>
         <source>&amp;BibleTime</source>
         <translation>&amp;بيبل تايم</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="126"/>
         <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
         <translation>نحن نبحث عن مطورين ومترجمين. إذا كنت تود الإنضمام إلى �ريقنا، يرجى إرسال رسالة إلكترونية إلى %1.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation>(c)1999-2013, �ريق بيبل تايم</translation>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="130"/>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished">(c)1999-2014, �ريق بيبل تايم</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="137"/>
         <source>&amp;Contributors</source>
         <translation>ال&amp;مساهمون</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="148"/>
         <source>The following people contributed to BibleTime:</source>
         <translation>الأشخاص التالي أسماءهم قدموا إسهامات لبيبل تايم:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="150"/>
         <source>documentation and translation manager</source>
         <translation>مدير الترجمة والتوثيق</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="172"/>
         <source>project manager</source>
         <translation>مدير المشروع</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>tester</source>
         <translation>مختبر</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>usability expert</source>
         <translation>خبير سهولة إستخدام</translation>
     </message>
@@ -583,52 +589,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>ال&amp;رخصة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
         <source>designer</source>
         <translation>مصمم</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="139"/>
         <source>developer</source>
         <translation>مطور</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
         <source>project founder</source>
         <translation>مؤسس المشروع</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="157"/>
         <source>packager</source>
         <translation>محزم</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="158"/>
         <source>creator of The Sword Project</source>
         <translation>مبتكر مشروع سورد</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
         <source>domain sponsor</source>
         <translation>راعي النطاق</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
         <source>howto</source>
         <translation>الدليل</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="141"/>
         <source>artist</source>
         <translation>�نان</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="173"/>
         <source>documentation</source>
         <translation>توثيق</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="188"/>
         <source>The following people translated BibleTime into their language:</source>
         <translatorcomment>النسخة العربية ترجمة د. أندرو أل�ي</translatorcomment>
         <translation>الأشخاص التالي اسماءهم قاموا بترجمة بيبل تايم إلى لغتهم:</translation>
@@ -657,37 +663,37 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBibleKeyWidget</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="110"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>قم بتمرير محتويات هذه القائمة. اضغط على الزر وقم بتحريك ال�أرة لر�ع أو خ�ض العنصر.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
         <source>Next book</source>
         <translation>الس�ر التالي</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
         <source>Previous book</source>
         <translation>الس�ر السابق</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="117"/>
         <source>Next chapter</source>
         <translation>الاصحاح التالي</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
         <source>Previous chapter</source>
         <translation>الاصحاح السابق</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="122"/>
         <source>Next verse</source>
         <translation>الآية التالية</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
         <source>Previous verse</source>
         <translation>الآية السابقة</translation>
     </message>
@@ -766,27 +772,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfGroupingMenu</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
         <source>Category/Language</source>
         <translation>�ئة/لغة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
         <source>Category</source>
         <translation>�ئة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
         <source>Language/Category</source>
         <translation>لغة/�ئة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="105"/>
         <source>Language</source>
         <translation>لغة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="108"/>
         <source>No grouping</source>
         <translation>بدون تصني�</translation>
     </message>
@@ -794,7 +800,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfModel</name>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
+        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="78"/>
         <source>Module</source>
         <translation>عنصر</translation>
     </message>
@@ -802,23 +808,23 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfWidget</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="157"/>
         <source>Fi&amp;lter:</source>
         <translation>&amp;�لترة:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="158"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
         <source>Grouping</source>
         <translation>تصني�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="159"/>
         <source>Change the grouping of items in the bookshelf.</source>
         <translation>تغيير تصني� العناصر �ي ر� الكتب.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
         <source>Show/hide works</source>
         <translation>إظهار/إخ�اء الكتب</translation>
     </message>
@@ -832,69 +838,130 @@ This file is distributed under the same license as the Bibetime package.</transl
     </message>
 </context>
 <context>
+    <name>BtConfig</name>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="46"/>
+        <source>Old testament</source>
+        <translation type="unfinished">العهد القديم</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="47"/>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation type="unfinished">أس�ار موسى الخمسة/التوراة</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="48"/>
+        <source>History</source>
+        <translation type="unfinished">التاريخ</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="49"/>
+        <source>Prophets</source>
+        <translation type="unfinished">الأنبياء</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="50"/>
+        <source>New testament</source>
+        <translation type="unfinished">العهد الجديد</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="51"/>
+        <source>Gospels</source>
+        <translation type="unfinished">الأناجيل</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="52"/>
+        <source>Letters/Epistles</source>
+        <translation type="unfinished">الرسائل</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="53"/>
+        <source>Paul&apos;s Epistles</source>
+        <translation type="unfinished">رسائل بولس</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="89"/>
+        <source>Error loading configuration!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="90"/>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BtConfigCore</name>
+    <message>
+        <location filename="../../src/backend/config/btconfigcore.cpp" line="62"/>
+        <source>Default Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtDisplaySettingsButton</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="103"/>
         <source>Use linebreaks after each verse</source>
         <translation>كل آية �ي سطر من�صل</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
         <source>Show verse numbers</source>
         <translation>إظهار رقم الآية (الشاهد)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
         <source>Show headings</source>
         <translation>إظهار العناوين</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
         <source>Highlight words of Jesus</source>
         <translation>تمييز كلمات السيد المسيح</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
         <source>Show Hebrew vowel points</source>
         <translation>إظهار نقاط الحرو� المتحركة �ي العبرية</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
         <source>Show Hebrew cantillation marks</source>
         <translation>إظهار علامات cantillation �ي العبرية</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
         <source>Show Greek accents</source>
         <translation>إظهار accents �ي اليونانية</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
         <source>Use alternative textual variant</source>
         <translation>إستخدام خيار نصي بديل</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
         <source>Show scripture cross-references</source>
         <translation>إظهار المراجع ذات الصلة بالنص</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
         <source>Show footnotes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
         <source>Show morph segmentation</source>
         <translation>إظهار التجزئة الصر�ية</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="120"/>
         <source>Display settings</source>
         <translation>عرض الإعدادات</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="123"/>
         <source>Display settings: No options available</source>
         <translation>عرض الإعدادات: لا خيارات متاحة</translation>
     </message>
@@ -902,27 +969,45 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtEditBookmarkDialog</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="71"/>
         <source>Edit Bookmark</source>
         <translation>تحرير علامة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
         <source>Location:</source>
         <translation>المكان:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
         <source>Title:</source>
         <translation>العنوان:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
         <source>Description:</source>
         <translation>الوص�:</translation>
     </message>
 </context>
 <context>
+    <name>BtFindWidget</name>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="28"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="29"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="74"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtFontChooserWidget</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
@@ -943,31 +1028,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <source>You can specify a custom font for each language.</source>
-        <translation type="obsolete">تستطيع تخصيص خط محدد لكل لغة.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="151"/>
         <source>&amp;Language:</source>
         <translation>ال&amp;لغة:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
         <source>The font selection below will apply to all texts in this language</source>
         <translation>خيار الخط أدناه سيتم تطبيقه على جميع النصوص �ي هذه اللغة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
         <source>Use custom font</source>
         <translation>استخدام خط مخصص</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
         <source>Optionally specify a custom font for each language:</source>
         <translation>تحديد خط مخصص لكل لغة (إختياري):</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="150"/>
         <source>Fonts</source>
         <translation>خطوط</translation>
     </message>
@@ -975,75 +1056,67 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtIndexPage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="107"/>
         <source>%1 KiB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="114"/>
         <source>0 KiB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="124"/>
         <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
         <translation>إذا تم الإختيار، �ال�هارس التي لا تحتوي على كتب مقابلة سيتم حذ�ها مع بداية بيبل تايم</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
         <source>Automatically delete orphaned indexes when BibleTime starts</source>
         <translation>حذ� تلقائي لل�هارس ال�ارغة مع بداية بيبل تايم</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="127"/>
         <source>Delete the selected indexes</source>
         <translation>حذ� ال�هارس المختارة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
         <source>Delete</source>
         <translation>حذ�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="130"/>
         <source>Create new indexes for the selected works</source>
         <translation>إنشاء �هارس جديدة للكتب المختارة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Work</source>
         <translation>كتب</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Index size</source>
         <translation>حجم ال�هرس</translation>
     </message>
     <message>
-        <source>Create new search indexes and delete created indexes for the installed works.</source>
-        <translation type="obsolete">إنشاء �هرس بحث جديد وحذ� ال�هارس المنشأة للكتب المثبتة.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="122"/>
         <source>Search Indexes</source>
         <translation>بحث ال�هارس</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="91"/>
         <source>Indexed Works</source>
         <translation>الكتب الم�هرسة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="96"/>
         <source>Unindexed Works</source>
         <translation>الكتب الغير م�هرسة</translation>
     </message>
     <message>
-        <source>KiB</source>
-        <translation type="obsolete">KiB</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
         <source>Create...</source>
         <translation>إنشاء...</translation>
     </message>
@@ -1069,17 +1142,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallModuleChooserDialogModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="88"/>
         <source>Work</source>
         <translation>الكتاب</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="89"/>
         <source>Installation source</source>
         <translation>مصدر التثبيت</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="90"/>
         <source>Version</source>
         <translation>النسخة</translation>
     </message>
@@ -1092,14 +1165,6 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>تثبيت/تحديث</translation>
     </message>
     <message>
-        <source>Install and update works. Add remote or local sources, refresh them, select the works to be installed/updated and click Install.&lt;br/&gt;&lt;b&gt;WARNING:&lt;/b&gt; If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="obsolete">ثبت وحدث الكتب. اض� مصادر خارجية أو من على الجهاز، قم بتحديثهم، اختر الكتب التي تريد تثبيتها/تحديثها واضغط على تثبيت.&lt;br/&gt;&lt;b&gt;تحذير:&lt;/b&gt; إذا كنت تعيش �ي بلد إضطهاد وترغب �ي تجنب مخاطرة الإكتشا� لا تستخدم المصادر الخارجية.</translation>
-    </message>
-    <message>
-        <source>Install folder:</source>
-        <translation type="obsolete">مجلد التثبيت:</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="265"/>
         <source>WARNING!!!</source>
         <translation>تحذير!!!</translation>
@@ -1180,20 +1245,16 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>المجلد الهد� إما لا يقبل الكتابة إليه أو إنه غير موجود. سي�شل التثبيت مالم يتم إصلاح هذا أولاً.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="388"/>
         <source>Delete Source?</source>
         <translation>حذ� المصدر؟</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="389"/>
         <source>Do you really want to delete this source?</source>
         <translation>هل تريد حقاً حذ� هذا المصدر؟</translation>
     </message>
     <message>
-        <source>Install...</source>
-        <translation type="obsolete">تثبيت...</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="281"/>
         <source>Install or update selected works</source>
         <translation>تثبيت أو تحديث الكتب المختارة</translation>
@@ -1202,17 +1263,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPageModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="75"/>
         <source>Work</source>
         <translation>الكتاب</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="76"/>
         <source>Version</source>
         <translation>النسخة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="77"/>
         <source>Description</source>
         <translation>الوص�</translation>
     </message>
@@ -1228,99 +1289,99 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPathDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="35"/>
         <source>Bookshelf Folders</source>
         <translation>مجلدات ر� الكتب</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
         <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
         <translation>يمكن تثبيت الكتب �ي مجلد واحد أو أكثر. بعد إعداد المجلدات هنا يمكنك إختيار أحدهم �ي ص�حة التثبيت.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="45"/>
         <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
         <translation>يجد بيبل تايم ومكتبة سورد الكتب من كل هذه المجلدات.إذا تم إزالة مجلد من هنا يظل موجوداً �ي النظام بكل الكتب التي يحتويها.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="48"/>
         <source>Configure bookshelf folders</source>
         <translation>تعيين مجلدات ر� الكتب</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="53"/>
         <source>Configuration file for the folders is: </source>
         <translation>مل� إعدادت المجلدات هو: </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="61"/>
         <source>Folders where new works can be installed</source>
         <translation>المجلدات حيث يمكن تثبيت الكتب الجديدة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
         <source>Read-only folders</source>
         <translation>مجلدات للقراءة �قط</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="66"/>
         <source>Nonexistent folders</source>
         <translation>مجلدات غير موجودة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="80"/>
         <source>&amp;Add...</source>
         <translation>إضا�ة...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="81"/>
         <source>Add new folder</source>
         <translation>إضا�ة مجلد جديد</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="86"/>
         <source>&amp;Edit...</source>
         <translation>تحرير...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="87"/>
         <source>Edit the selected folder</source>
         <translation>تحرير المجلد المختار</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="92"/>
         <source>&amp;Remove</source>
         <translation>إزالة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="93"/>
         <source>Remove the selected folder</source>
         <translation>إزالة المجلد المختار</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="167"/>
         <source>This default folder in your home directory can&apos;t be removed</source>
         <translation>المجلد الإ�تراضي �ي الدليل الرئيسي لا يمكن إزالته</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="194"/>
         <source>Choose Folder</source>
         <translation>اختر مجلداً</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>Use Folder?</source>
         <translation>استخدم المجلد؟</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
         <translation>غير مسموح بالكتابة إلى هذا المجلد، ولذلك لا يمكن تثبيت الكتب هنا بواسطة بيبل تايم. هل تريد إستخدام هذا المجلد بدلاً من القيمة السابقة؟</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
         <translation>غير مسموح بالكتابة إلى هذا المجلد، ولذلك لا يمكن تثبيت الكتب هنا بواسطة بيبل تايم. هل مازلت تريد إضا�ته إلى قائمة مجلدات ر� الكتب؟</translation>
     </message>
@@ -1328,52 +1389,42 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallProgressDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Work</source>
         <translation>الكتاب</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Progress</source>
         <translation>التقدم</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>إيقا�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="60"/>
         <source>Stop All</source>
         <translation>إيقا� الكل</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Completed</source>
         <translation>إكتمل</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>ألغي</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="55"/>
         <source>Waiting for turn...</source>
         <translation>�ي الإنتظار...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="113"/>
         <source>Preparing install...</source>
         <translation>التحضير للتثبيت...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="37"/>
         <source>Install Progress</source>
         <translation>تقدم التثبيت</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Failed</source>
         <translation>�شل</translation>
     </message>
@@ -1381,21 +1432,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <source>Select the language in which the Biblical book names are displayed.</source>
-        <translation type="obsolete">اختر لغة عرض اسماء أس�ار الكتاب المقدس.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
         <source>Language for names of Bible books:</source>
         <translation>لغة اسماء أس�ار الكتاب المقدس:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation>اللغات المتاح إستخدامها لعرض اسماء أس�ار الكتاب المقدس</translation>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="136"/>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="133"/>
         <source>Languages</source>
         <translation>اللغات</translation>
     </message>
@@ -1445,7 +1492,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtModuleManagerDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="57"/>
         <source>Bookshelf Manager</source>
         <translation>مدير ر� الكتب</translation>
     </message>
@@ -1453,7 +1500,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkAction</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="103"/>
         <source>&amp;Open work</source>
         <translation>&amp;�تح كتاب</translation>
     </message>
@@ -1461,12 +1508,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkActionMenu</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="42"/>
         <source>&amp;Grouping order</source>
         <translation>&amp;ترتيب المجموعات</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="43"/>
         <source>Sets the grouping order for the items in this menu.</source>
         <translation>إعداد ترتيب المجموعات للبنود �ي هذه القائمة.</translation>
     </message>
@@ -1502,59 +1549,47 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtRemovePage</name>
     <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">إزالة</translation>
-    </message>
-    <message>
-        <source>Remove installed works. Select the works and click Remove button.</source>
-        <translation type="obsolete">إزالة الكتب المثبتة. اختر الكتب واضغط على زر إزالة.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="100"/>
         <source>Select &amp;works to uninstall:</source>
         <translation>اختر ال&amp;كتب التي تريد إزالتها:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&amp;Remove...</source>
         <translation>إ&amp;زالة...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="98"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="111"/>
         <source>Start removal of %1 works:</source>
         <translation>بدء إزالة %1 كتاب:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="114"/>
         <source>Start removal:</source>
         <translation>بدء الإزالة:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="145"/>
         <source>You selected the following work(s): </source>
         <translation>لقد قمت بإختيار الكتب التالية: </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="149"/>
         <source>Do you really want to remove them from your system?</source>
         <translation>هل تريد حقاً إزالتها من النظام؟</translation>
     </message>
     <message>
-        <source>Remove...</source>
-        <translation type="obsolete">إزالة...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
         <source>Remove the selected works</source>
         <translation>إزالة الكتب المختارة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="151"/>
         <source>Remove Works?</source>
         <translation>إزالة الكتب؟</translation>
     </message>
@@ -1575,12 +1610,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtSearchModuleChooserDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="47"/>
         <source>Works to Search in</source>
         <translation>الكتب التي يتم البحث بها</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="49"/>
         <source>Select the works which should be searched.</source>
         <translation>اختر الكتب التي تريد أن يتم البحث بها.</translation>
     </message>
@@ -1661,164 +1696,165 @@ shortcut</source>
     </message>
 </context>
 <context>
-    <name>BtSourceArea</name>
-    <message>
-        <source>&amp;Add...</source>
-        <translation type="obsolete">إضا�ة...</translation>
-    </message>
-    <message>
-        <source>Refresh...</source>
-        <translation type="obsolete">تحديث...</translation>
-    </message>
-    <message>
-        <source>Refresh the list of works from this source</source>
-        <translation type="obsolete">تحديث قائمة الكتب من هذا المصدر</translation>
-    </message>
-    <message>
-        <source>&amp;Delete...</source>
-        <translation type="obsolete">حذ�...</translation>
-    </message>
-    <message>
-        <source>Delete this source</source>
-        <translation type="obsolete">حذ� هذا المصدر</translation>
-    </message>
+    <name>BtStandardWorksTab</name>
     <message>
-        <source>Add new source</source>
-        <translation type="obsolete">إضا�ة مصدر جديد</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="169"/>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation type="unfinished">يتم إستخدام الكتب الإ�تراضية حين لايتم تحديد كتاب محدد، على سبيل المثال حينما يتم الضغط على رابط �ي الكتاب المقدس أو الت�سير.</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceAreaModel</name>
     <message>
-        <source>Work</source>
-        <translation type="obsolete">الكتاب</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
+        <translation type="unfinished">الكتاب المقدس:</translation>
     </message>
     <message>
-        <source>Version</source>
-        <translation type="obsolete">النسخة</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="174"/>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation type="unfinished">تستخدم ترجمة الكتاب المقدس الإ�تراضية عندما يتم الضغط على رابط للكتاب المقدس</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">الوص�</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</source>
+        <translation type="unfinished">الت�سير:</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceWidget</name>
     <message>
-        <source>Delete Source?</source>
-        <translation type="obsolete">حذ� المصدر؟</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="178"/>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation type="unfinished">يستخدم الت�سير الإ�تراضي عندما يتم الضغط على رابط لت�سير</translation>
     </message>
     <message>
-        <source>Do you really want to delete this source?</source>
-        <translation type="obsolete">هل تريد حقاً حذ� هذا المصدر؟</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
+        <translation type="unfinished">المعجم:</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">إلغاء</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="182"/>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation type="unfinished">يستخدم المعجم الإ�تراضي عندما يتم الضغط على رابط لمعجم</translation>
     </message>
     <message>
-        <source>Refreshing source</source>
-        <translation type="obsolete">تحديث المصدر</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</source>
+        <translation type="unfinished">التأمل اليومي:</translation>
     </message>
     <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">جار الإتصال...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="186"/>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation type="unfinished">سيتم إستخدام التأمل اليومي الإ�تراضي �ي عرض تأمل قصير �ي البداية</translation>
     </message>
     <message>
-        <source>Refreshing...</source>
-        <translation type="obsolete">جار التحديث...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation type="unfinished">معجم سترونج العبري:</translation>
     </message>
     <message>
-        <source>No sources were found in the SWORD configuration and BibleTime couldn&apos;t create a default source. Check your SWORD configuration and that the configuration path is writable. Then restart the Bookshelf Manager.</source>
-        <translation type="obsolete">لم يعثر على مصادر �ي إعدادات سورد ولم يتمكن بيبل تايم من إنشاء المصدر الإ�تراضي. تأكد من إعدادات سورد وأن مسار الإعدادات قابل للكتابة. ثم أعد تشغيل مدير ر� الكتب.</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="190"/>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation type="unfinished">يستخدم المعجم العبري الإ�تراضي عندما يتم الضغط على رابط لمعجم عبري</translation>
     </message>
     <message>
-        <source>Remote:</source>
-        <translation type="obsolete">خارجي:</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation type="unfinished">معجم سترونج اليوناني:</translation>
     </message>
     <message>
-        <source>Local:</source>
-        <translation type="obsolete">على الجهاز:</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="194"/>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation type="unfinished">يستخدم المعجم اليوناني الإ�تراضي عندما يتم الضغط على رابط لمعجم يوناني</translation>
     </message>
     <message>
-        <source>Not a directory!</source>
-        <translation type="obsolete">ليس مجلداً!</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</source>
+        <translation type="unfinished">المعجم الصر�ي العبري:</translation>
     </message>
     <message>
-        <source>Not readable!</source>
-        <translation type="obsolete">غير قابل للقراءة!</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="198"/>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation type="unfinished">يتم إستخدام المعجم الصر�ي الإ�تراضي للنصوص العبرية عندما يتم الضغط على رابط لوسم صر�ي �ي النص العبري</translation>
     </message>
     <message>
-        <source>Warning</source>
-        <translation type="obsolete">تحذير</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</source>
+        <translation type="unfinished">المعجم الصر�ي اليوناني:</translation>
     </message>
     <message>
-        <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="obsolete">المجلد الهد� إما لا يقبل الكتابة إليه أو إنه غير موجود. سي�شل التثبيت مالم يتم إصلاح هذا أولاً.</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="202"/>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation type="unfinished">يتم إستخدام المعجم الصر�ي الإ�تراضي للنصوص اليونانية عندما يتم الضغط على رابط لوسم صر�ي �ي النص اليوناني</translation>
     </message>
 </context>
 <context>
     <name>BtTextFiltersTab</name>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="74"/>
         <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="obsolete">ال�لاتر تتحكم بمظهر النص. وهنا يمكنك تحديد الإعدادات الإ�تراضية لجميع ال�لاتر. تستطيع أن توق� هذه الإعدادات �ي أي نا�ذة عرض.</translation>
+        <translation type="unfinished">ال�لاتر تتحكم بمظهر النص. وهنا يمكنك تحديد الإعدادات الإ�تراضية لجميع ال�لاتر. تستطيع أن توق� هذه الإعدادات �ي أي نا�ذة عرض.</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="78"/>
         <source>Insert line break after each verse</source>
-        <translation type="obsolete">إضا�ة سطر �اصل بعد كل عدد</translation>
+        <translation type="unfinished">إضا�ة سطر �اصل بعد كل عدد</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
+        <source>Show verse numbers</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
         <source>Show section headings</source>
-        <translation type="obsolete">إظهار عناوين ال�قرات</translation>
+        <translation type="unfinished">إظهار عناوين ال�قرات</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
         <source>Show scripture cross-references</source>
-        <translation type="obsolete">إظهار المراجع ذات الصلة بالنص</translation>
+        <translation type="unfinished">إظهار المراجع ذات الصلة بالنص</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="82"/>
         <source>Show Greek accents</source>
-        <translation type="obsolete">إظهار accents �ي اليونانية</translation>
+        <translation type="unfinished">إظهار accents �ي اليونانية</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="83"/>
         <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">إظهار نقاط الحرو� المتحركة �ي العبرية</translation>
+        <translation type="unfinished">إظهار نقاط الحرو� المتحركة �ي العبرية</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="84"/>
         <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">إظهار علامات cantillation �ي العبرية</translation>
+        <translation type="unfinished">إظهار علامات cantillation �ي العبرية</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="85"/>
         <source>Show morph segmentation</source>
-        <translation type="obsolete">إظهار التجزئة الصر�ية</translation>
+        <translation type="unfinished">إظهار التجزئة الصر�ية</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="86"/>
         <source>Use textual variants</source>
-        <translation type="obsolete">إستخدام تنويعات نصية</translation>
+        <translation type="unfinished">إستخدام تنويعات نصية</translation>
     </message>
 </context>
 <context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
         <source>Add/remove/replace</source>
         <translation>إضا�ة/إزالة/إستبدال</translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">إزالة</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
         <source>Replace</source>
         <translation>إستبدال</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
         <source>Add</source>
         <translation>إضا�ة</translation>
     </message>
@@ -1826,102 +1862,90 @@ shortcut</source>
 <context>
     <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="69"/>
         <source>Tip Of The Day</source>
         <translation>تلميح اليوم</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="83"/>
         <source>Show tips at startup</source>
         <translation>إظهار التلميحات مع بدء التشغيل</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="94"/>
         <source>Next Tip</source>
         <translation>التلميح التالي</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
         <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
         <translation>لعرض أكثر من ترجمة للكتاب المقدس بالتوازي �ي النا�ذة النشطة اختر هذه الأيقونة واختر ترجمة أخرى.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
         <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
         <translation>لعرض أكثر من كتاب ت�سير بالتوازي �ي النا�ذة النشطة اختر هذه الأيقونة واختر كتاباً أخر.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="134"/>
         <source>To learn more about the BibleTime project please go to our web site.</source>
         <translation>لمعر�ة المزيد عن مشروع بيبل تايم يرجى زيارة موقعنا على الشبكة.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="137"/>
         <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
         <translation>لمزامنة نا�ذة الت�سير بنا�ذة الكتاب المقدس النشطة؛ قم بتنشيط نا�ذة الت�اسير واختر هذه الأيقونة.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
         <source>Select the icon again to stop the synchronization.</source>
         <translation>اختر الأيقونة مرة أخرى لإيقا� المزامنة.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="142"/>
         <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
         <translation>لإنشاء علامة قم بسحب الآية من الكتاب المقدس أو الت�سير إلى نا�ذة العلامات. سيظهر سهم يوضح مكان العلامة حينما تقوم بتحرير المؤشر. بالنسبة للكتب الأخرى ستجد إشارة مرجعية �ي الركن الأيسر العلوي يمكنك إستخدامها لإنشاء العلامة.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="147"/>
         <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
         <translation>لتغيير عنوان أو وص� أحد العلامات، أنقر يميناً على العلامة واختر قائمة تحرير علامة. بعد الإنتهاء من التحرير يمكن رؤية الوص� بالمرور بمؤشر ال�أرة على العلامة.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="151"/>
         <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
         <translation>لتحميل عدة مصادر للكتب، اذهب إلى مدير ر� الكتب، اختر زر الإضا�ة، ثم زر إحضار القائمة.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="154"/>
         <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
         <translation>لمعر�ة المزيد من المعلومات عن كتاب ما، اذهب إلى مربع ر� الكتب، أنقر يميناً على الكتاب، واختر قائمة عن.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="157"/>
         <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="163"/>
         <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="178"/>
         <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging theborder between the window and another window.</source>
-        <translation type="obsolete">يمكن تحريك نا�ذة ر� الكتب، العلامات، والمكبر إلى مكان جديد بسحب النا�ذة من ناحية العنوان �ي الأعلى. تستطيع تحريكهم إلى يسار، يمين، أعلى، أو أس�ل نوا�ذ الكتب.تستطيع وضعهم �ي ن�س المكان وستظهر ألسنة لتتمكن من الإختيار بينهم. يمكن تغيير حجم النا�ذة بسحب الحدود بينها وبين نا�ذة أخرى.</translation>
-    </message>
-    <message>
-        <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the sameStrong&apos;s number in other locations of the work.</source>
-        <translation type="obsolete">تستطيع البحث عن أرقام سترونج �ي كتاب ما. ا�تح كتاب يحتوي على أرقام سترونج ومر بمؤشر ال�أرة على أحد الكلمات. أنقر يميناً على الكلمة واستخدم قائمة بحث سترونج. ستظهر لك نا�ذة بحث لتتيح لك إيجاد مواضع أخرى �ي الكتاب تم إستخدام ن�س رقم سترونج �يها.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="168"/>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
         <translation>تستطيع ح�ظ ملاحظاتك الشخصية على مراجع آيات محددة. عليك أولاً تثبيت التعليقات الشخصية.(Personal commentary) ا�تح مدير ر� الكتب، اختر المصدر كروس وير وابحث تحت قسم الت�اسير (Commentary) ثم الإنجليزية (English).استخدم نا�ذة مدير ر� الكتب وأنقر يمينا على التعليقات الشخصية (Personal commentary) إستخدم إما قائمة تحرير نص بسيط أو تحرير نص �ائق HTML ل�تح الكتاب �ي نمط والتحرير.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
         <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
         <translation>تستطيع عرض أرقام سترونج �ي نا�ذة المكبر بالمرور بمؤشر ال�أرة على الكلمة �ي أي من ترجمات الكتاب المقدس التي تحتوي على أرقام سترونج. ستحتاج إلى تثبيت معجم سترونج اليوناني ومعجم سترونج العبري من كروس وير.</translation>
     </message>
-    <message>
-        <source>To change a bookmark title or description, right click on the bookmark and select &quot;Edit Bookmark...&quot;. After finishing the edit the description can be seen by hovering over the bookmark.</source>
-        <translation type="obsolete">لتغيير عنوان أو وص� علامة، انقر بالزر الأيمن على العلامة واختر &quot;تحرير علامة...&quot;. بعد الإنتهاء من التحرير ستتمكن من مشاهدة الوص� عن طريق المرور بالمؤشر على العلامة.</translation>
-    </message>
 </context>
 <context>
     <name>BtVerseDropdownChooserButton</name>
@@ -1934,48 +1958,48 @@ shortcut</source>
 <context>
     <name>CAcceleratorSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="128"/>
         <source>Choose action group:</source>
         <translation>اختر مجموعة:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="130"/>
         <source>Main Window</source>
         <translation>النا�ذة الرئيسية</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
         <source>All text windows</source>
         <translation>كل نوا�ذ النصوص</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="132"/>
         <source>Bible windows</source>
         <translation>نوا�ذ الكتاب المقدس</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
         <source>Commentary windows</source>
         <translation>نوا�ذ الت�اسير</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="134"/>
         <source>Lexicon windows</source>
         <translation>نوا�ذ المعاجم</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
         <source>Book windows</source>
         <translation>نوا�ذ الكتب</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
         <source>
    &quot;%1&quot; in the &quot;%2&quot; group</source>
         <translation>...&quot;%1&quot; �ي مجموعة &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
         <source>Shortcuts</source>
         <translation>إختصارات</translation>
     </message>
@@ -1983,103 +2007,95 @@ shortcut</source>
 <context>
     <name>CBibleReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="64"/>
         <source>Next book</source>
         <translation>الس�ر التالي</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="68"/>
         <source>Previous book</source>
         <translation>الس�ر السابق</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="72"/>
         <source>Next chapter</source>
         <translation>الاصحاح التالي</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="76"/>
         <source>Previous chapter</source>
         <translation>الاصحاح السابق</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="80"/>
         <source>Next verse</source>
         <translation>الآية التالية</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="84"/>
         <source>Previous verse</source>
         <translation>الآية السابقة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="89"/>
         <source>Copy chapter</source>
         <translation>انسخ الاصحاح</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="92"/>
         <source>Save chapter as plain text</source>
         <translation>اح�ظ الاصحاح كنص بسيط</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="95"/>
         <source>Save chapter as HTML</source>
         <translation>اح�ظ الاصحاح كنص �ائق HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="98"/>
         <source>Print chapter</source>
         <translation>اطبع الاصحاح</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="110"/>
         <source>Text of reference</source>
         <translation>نص مرجع</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
         <source>Reference with text</source>
         <translation>المرجع مع النص</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="253"/>
         <source>Bible window</source>
         <translation>نا�ذة الكتاب المقدس</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="263"/>
         <source>Copy...</source>
         <translation>نسخ...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="274"/>
         <source>Save...</source>
         <translation>ح�ظ...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="287"/>
         <source>Print...</source>
         <translation>طباعة...</translation>
     </message>
     <message>
-        <source>Copy chapter to clipboard ...</source>
-        <translation type="obsolete">نسخ الاصحاح إلى الحا�ظة ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="371"/>
         <source>Copying</source>
         <translation>جار النسخ</translation>
     </message>
     <message>
-        <source>Saving chapter ...</source>
-        <translation type="obsolete">جار ح�ظ الاصحاح ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="390"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="408"/>
         <source>Saving</source>
         <translation>جار الح�ظ</translation>
     </message>
@@ -2087,7 +2103,7 @@ shortcut</source>
 <context>
     <name>CBookReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
+        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="70"/>
         <source>Toggle tree view</source>
         <translation>تبديل العرض الشجري</translation>
     </message>
@@ -2095,93 +2111,93 @@ shortcut</source>
 <context>
     <name>CBookmarkIndex</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
         <source>Bookmarks</source>
         <translation>علامات</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="92"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="583"/>
         <source>New folder</source>
         <translation>مجلد جديد</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
         <source>Rename folder</source>
         <translation>إعادة تسمية المجلد</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
         <source>Delete Items</source>
         <translation>حذ� بنود</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="704"/>
         <source>Do you really want to delete the selected items and child-items?</source>
         <translation>هل أنت متأكد حقاً من أنك تريد حذ� البنود والبنود ال�رعية المختارة؟</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="814"/>
         <source>The work to which the bookmark points to is not installed.</source>
         <translation>الكتاب الذي تشير إليه العلامة غير مثبت.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
         <source>Print bookmarks...</source>
         <translation>طباعة العلامات...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="103"/>
         <source>Remove selected items...</source>
         <translation>إزالة البنود المختارة...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
         <source>Import to folder...</source>
         <translation>إستيراد إلى مجلد...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
         <source>Edit bookmark...</source>
         <translation>تحرير علامة...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
         <source>Sort folder bookmarks...</source>
         <translation>�رز علامات المجلد...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
         <source>Sort all bookmarks...</source>
         <translation>�رز كل العلامات...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="100"/>
         <source>Export from folder...</source>
         <translation>تصدير من مجلد...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="393"/>
         <source>Can drop only bookmarks or one folder</source>
         <translation>تستطيع إ�لات العلامات أو مجلد واحد �قط</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="398"/>
         <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
         <translation>لا تستطيع إ�لات المجلد على ن�سه أو أحد مجلداته ال�رعية</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
         <source>Copy</source>
         <translation>نسخ</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="406"/>
         <source>Move</source>
         <translation>نقل</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="467"/>
         <source>Drag references from text views to this view</source>
         <translation>اسحب المراجع من مربع النصوص إلى هذا المربع</translation>
     </message>
@@ -2189,42 +2205,42 @@ shortcut</source>
 <context>
     <name>CCommentaryReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="31"/>
         <source>Next book</source>
         <translation>الس�ر التالي</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="35"/>
         <source>Previous book</source>
         <translation>الس�ر السابق</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="39"/>
         <source>Next chapter</source>
         <translation>الاصحاح التالي</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="43"/>
         <source>Previous chapter</source>
         <translation>الاصحاح السابق</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="47"/>
         <source>Next verse</source>
         <translation>الآية التالية</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="51"/>
         <source>Previous verse</source>
         <translation>الآية السابقة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="56"/>
         <source>Synchronize</source>
         <translation>مزامنة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="59"/>
         <source>Synchronize the displayed entry of this work with the active Bible window</source>
         <translation>مزامنة المدخل المعروض من هذا الكتاب مع نا�ذة الكتاب المقدس النشطة</translation>
     </message>
@@ -2232,7 +2248,7 @@ shortcut</source>
 <context>
     <name>CConfigurationDialog</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="41"/>
         <source>Configure BibleTime</source>
         <translation>ضبط بيبل تايم</translation>
     </message>
@@ -2240,67 +2256,67 @@ shortcut</source>
 <context>
     <name>CDisplaySettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
         <source>Display templates</source>
         <translation>عرض القوالب</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
         <source>Available display styles:</source>
         <translation>أساليب العرض المتاحة:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="113"/>
         <source>Style preview</source>
         <translation>معاينة الأسلوب</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="131"/>
         <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
         <translation>لانه هكذا احب الله العالم حتى بذل ابنه الوحيد لكي لا يهلك كل من يؤمن به بل تكون له الحياة الابدية.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="138"/>
         <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
         <translation>لانه لم يرسل الله ابنه الى العالم ليدين العالم بل ليخلّص به العالم.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="145"/>
         <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
         <translation>الذي يؤمن به لا يدان والذي لا يؤمن قد دين لانه لم يؤمن باسم ابن الله الوحيد.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="155"/>
         <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
         <translation>لان كل من يعمل السيّآت يبغض النور ولا يأتي الى النور لئلا توبخ اعماله.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="160"/>
         <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
         <translation>واما من ي�عل الحق �يقبل الى النور لكي تظهر اعماله انها بالله معمولة.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="106"/>
         <source>Display templates define how text is displayed.</source>
         <translation>من عرض قوالب تستطيع التحكم �ي كي�ية عرض النص.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="110"/>
         <source>Show the BibleTime logo on startup</source>
         <translation>إظهار شعار بيبل تايم مع بداية التشغيل</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
         <source>Show startup logo</source>
         <translation>إظهار شعار بداية التشغيل</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="150"/>
         <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
         <translation>وهذه هي الدينونة ان النور قد جاء الى العالم واحب الناس الظلمة اكثر من النور لان اعمالهم كانت شريرة.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="101"/>
         <source>Display</source>
         <translation>عرض</translation>
     </message>
@@ -2308,147 +2324,124 @@ shortcut</source>
 <context>
     <name>CDisplayWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="215"/>
         <source>Back in history</source>
         <translation>للخل� �ي التاريخ</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="223"/>
         <source>Forward in history</source>
         <translation>للأمام �ي التاريخ</translation>
     </message>
     <message>
-        <source>Zoom in</source>
-        <translation type="obsolete">تكبير</translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation type="obsolete">تصغير</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="192"/>
         <source>Select all</source>
         <translation>إختيار الكل</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="196"/>
         <source>Copy</source>
         <translation>نسخ</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="200"/>
         <source>Find...</source>
         <translation>بحث...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="204"/>
         <source>Change location</source>
         <translation>تغيير المكان</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="209"/>
         <source>Search with works of this window</source>
         <translation>البحث بكتب هذه النا�ذة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="393"/>
         <source>Work chooser buttons</source>
         <translation>زر إختيار الكتاب</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="403"/>
         <source>Text area header</source>
         <translation>رأس منطقة النص</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="453"/>
         <source>Navigation</source>
         <translation>تص�ح</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="459"/>
         <source>Tool</source>
         <translation>أدوات</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="465"/>
         <source>Format</source>
         <translation>تنسيق</translation>
     </message>
 </context>
 <context>
-    <name>CFontChooser</name>
-    <message>
-        <source>Size:</source>
-        <translation type="obsolete">الحجم:</translation>
-    </message>
-    <message>
-        <source>Font name:</source>
-        <translation type="obsolete">اسم الخط:</translation>
-    </message>
-    <message>
-        <source>Font style:</source>
-        <translation type="obsolete">اسلوب الخط:</translation>
-    </message>
-</context>
-<context>
     <name>CHTMLWriteDisplay</name>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
         <source>Bold</source>
         <translation>غامق</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="60"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="67"/>
         <source>Italic</source>
         <translation>مائل</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="79"/>
         <source>Underline</source>
         <translation>تسطير</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="84"/>
         <source>Left</source>
         <translation>يسار</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="94"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="99"/>
         <source>Center</source>
         <translation>توسيط</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="104"/>
         <source>Right</source>
         <translation>يمين</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="231"/>
         <source>Font</source>
         <translation>الخط</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="243"/>
         <source>Font size</source>
         <translation>حجم الخط</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="255"/>
         <source>Font color</source>
         <translation>لون الخط</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="89"/>
         <source>Align left</source>
         <translation>محاذاة يسار</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="109"/>
         <source>Align right</source>
         <translation>محاذاة يمين</translation>
     </message>
@@ -2456,17 +2449,17 @@ shortcut</source>
 <context>
     <name>CHTMLWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="122"/>
         <source>Module not writable</source>
         <translation>عنصر غير قابل للكتابة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="124"/>
         <source>Module is not writable.</source>
         <translation>لا يمكن الكتابة إلى العنصر.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="125"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>إما أن العنصر لايقبل التحرير، أو أنك لا تمتلك تصريح الكتابة.</translation>
     </message>
@@ -2474,22 +2467,22 @@ shortcut</source>
 <context>
     <name>CLexiconKeyChooser</name>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>قم بتمرير محتويات القائمة. اضغط على الزر ثم قم بتحريك ال�أرة للزيادة أو النقص.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
         <source>Entries of the current work</source>
         <translation>محتويات الكتاب الحالي</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
         <source>Next entry</source>
         <translation>المدخل التالي</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="49"/>
         <source>Previous entry</source>
         <translation>المدخل السابق</translation>
     </message>
@@ -2497,74 +2490,70 @@ shortcut</source>
 <context>
     <name>CLexiconReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="47"/>
         <source>Next entry</source>
         <translation>المدخل التالي</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="51"/>
         <source>Previous entry</source>
         <translation>المدخل السابق</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="55"/>
         <source>Copy reference only</source>
         <translation>نسخ المرجع �قط</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
         <source>Save entry as HTML</source>
         <translation>اح�ظ المدخل كنص �ائق HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
         <source>Print reference only</source>
         <translation>طباعة المرجع �قط</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
         <source>Strong&apos;s Search</source>
         <translation>بحث سترونج</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
         <source>Entry with text</source>
         <translation>المدخل مع النص</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="134"/>
         <source>Entry as plain text</source>
         <translation>المدخل كنص بسيط</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="265"/>
         <source>Lexicon window</source>
         <translation>نا�ذة المعاجم</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="272"/>
         <source>Copy...</source>
         <translation>نسخ...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="281"/>
         <source>Save...</source>
         <translation>ح�ظ...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="297"/>
         <source>Print...</source>
         <translation>طباعة...</translation>
     </message>
     <message>
-        <source>Saving entry ...</source>
-        <translation type="obsolete">يح�ظ المدخل...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="340"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="364"/>
         <source>Saving</source>
         <translation>جار الح�ظ</translation>
     </message>
@@ -2572,91 +2561,112 @@ shortcut</source>
 <context>
     <name>CPlainWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="235"/>
         <source>Sync with active Bible</source>
         <translation>مزامنة مع الكتاب المقدس المنشط</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="245"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="249"/>
         <source>Save text</source>
         <translation>ح�ظ نص</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="254"/>
         <source>Delete current entry</source>
         <translation>حذ� المدخل الحالي</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="263"/>
         <source>Restore original text</source>
         <translation>إستعادة النص الأصلي</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="163"/>
         <source>Module not writable</source>
         <translation>العنصر لا يقبل الكتابة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="165"/>
         <source>Module is not writable.</source>
         <translation>العنصر لا يمكن الكتابة إليه.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="166"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>إما أن العنصر لايقبل التحرير، أو أنك لا تمتلك تصريح الكتابة.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="240"/>
         <source>Synchronize (show the same verse) with the active Bible window</source>
         <translation>مزامنة (إظهار ن�س الآية) مع نا�ذة الكتاب المقدس النشطة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="258"/>
         <source>Delete current entry (no undo)</source>
         <translation>حذ� المدخل الحالي (لا يمكن التراجع)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="267"/>
         <source>Restore original text, new text will be lost</source>
         <translation>إستعادة النص الأصلي، النص الجديد سيضيع</translation>
     </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save Text?</source>
+        <translation type="unfinished">ح�ظ النص؟</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <source>Save text before closing?</source>
+        <translation type="unfinished">ح�ظ النص قبل الإغلاق؟</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save changed text?</source>
+        <translation type="unfinished">ح�ظ التغيير �ي النص؟</translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="232"/>
         <source>Save Search Analysis</source>
         <translation>ح�ظ تحليل البحث</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation>مل�ات النص ال�ائق (*.html;*.HTML;*.HTM;*.htm)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="243"/>
         <source>BibleTime Search Analysis</source>
         <translation>تحليل بحث بيبل تايم</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation>بحث نص:</translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="234"/>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="259"/>
+        <source>Search text:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="263"/>
+        <source>Results by work and book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="265"/>
         <source>Book</source>
         <translation>كتاب</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="293"/>
         <source>Total hits</source>
         <translation>إجمالي المرات</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="303"/>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
         <translation>تم الإنشاء بواسطة &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;بيبل تايم&lt;/a&gt;</translation>
     </message>
@@ -2664,168 +2674,168 @@ shortcut</source>
 <context>
     <name>CSwordModuleInfo</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="763"/>
         <source>Version</source>
         <translation>نسخة</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="766"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="774"/>
         <source>unknown</source>
         <translation>غير معرو�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="771"/>
         <source>Markup</source>
         <translation>علامة</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
         <source>Location</source>
         <translation>مكان</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="782"/>
         <source>Language</source>
         <translation>لغة</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="787"/>
         <source>Category</source>
         <translation>�ئة</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="792"/>
         <source>LCSH</source>
         <translation>LCSH</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="796"/>
         <source>Writable</source>
         <translation>قابل للكتابة</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>yes</source>
         <translation>نعم</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>no</source>
         <translation>لا</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="801"/>
         <source>Unlock key</source>
         <translation>م�تاح �ك الق�ل</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="822"/>
         <source>Features</source>
         <translation>خصائص</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="830"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>احذر، هذا الكتاب يحتوي على مواد مشكوك �يها!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="834"/>
         <source>About</source>
         <translation>عن</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="856"/>
         <source>Distribution license</source>
         <translation>رخصة التوزيع</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="857"/>
         <source>Distribution source</source>
         <translation>مصدر التوزيع</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="858"/>
         <source>Distribution notes</source>
         <translation>ملاحظات التوزيع</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="859"/>
         <source>Text source</source>
         <translation>مصدر النص</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="860"/>
         <source>Copyright notes</source>
         <translation>ملاحظات حقوق الطبع</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
         <source>Copyright holder</source>
         <translation>حامل حقوق الطبع</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
         <source>Copyright date</source>
         <translation>تاريخ حقوق الطبع</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
         <source>Copyright contact name</source>
         <translation>الإتصال بحقوق الطبع - الاسم</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
         <source>Copyright contact address</source>
         <translation>الإتصال بحقوق الطبع - العنوان</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
         <source>Copyright contact email</source>
         <translation>الإتصال بحقوق الطبع - البريد الإلكتروني</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="956"/>
         <source>Bibles</source>
         <translation>ترجمات الكتاب المقدس</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="958"/>
         <source>Commentaries</source>
         <translation>ت�اسير</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="960"/>
         <source>Books</source>
         <translation>كتب</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="962"/>
         <source>Cults/Unorthodox</source>
         <translation>بدع/هرطقات</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="964"/>
         <source>Maps and Images</source>
         <translation>خرائط وصور</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="966"/>
         <source>Daily Devotionals</source>
         <translation>تأملات يومية</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="968"/>
         <source>Lexicons and Dictionaries</source>
         <translation>معاجم وقواميس</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="970"/>
         <source>Glossaries</source>
         <translation>مصطلحات</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="972"/>
         <source>Unknown</source>
         <translation>غير معلوم</translation>
     </message>
@@ -2833,17 +2843,17 @@ shortcut</source>
 <context>
     <name>CSwordSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="43"/>
         <source>Standard works</source>
         <translation>كتب قياسية</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="44"/>
         <source>Text filters</source>
         <translation>�لترة نصوص</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="41"/>
         <source>Desk</source>
         <translation>المكتب</translation>
     </message>
@@ -2851,71 +2861,71 @@ shortcut</source>
 <context>
     <name>CSwordSetupInstallSourcesDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="47"/>
         <source>Caption</source>
         <translation>شرح</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
         <source>Type</source>
         <translation>نوع</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
         <source>Server</source>
         <translation>خادوم</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="68"/>
         <source>Path</source>
         <translation>مسار</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="91"/>
         <source>Get list...</source>
         <translation>إحضار القائمة...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="92"/>
         <source>Download a list of sources from CrossWire server and add sources</source>
         <translation>تحميل قائمة بالمصادر من خادوم كروس وير وإضا�ة مصادر</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>خطأ</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
         <source>Please provide a caption.</source>
         <translation>يرجى إدخال شرح.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
         <source>A source with this caption already exists. Please provide a different caption.</source>
         <translation>يوجد مصدر بهذا الشرح بال�عل. الرجاء إدخال شرح مختل�.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
         <source>Please provide a server name.</source>
         <translation>الرجاء إدخال اسم خادوم.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
         <source>Please provide a valid, readable path.</source>
         <translation>الرجاء إدخال مسار صالح قابل للقراءة.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Please provide a path.</source>
         <translation>يرجى إدخال مسار.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="160"/>
         <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
 
 Do you want to continue?</source>
@@ -2924,106 +2934,87 @@ Do you want to continue?</source>
 هل تريد المتابعة؟</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
         <source>Get source list from remote server?</source>
         <translation>إحضار قائمة المصادر من خادوم خارجي؟</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="167"/>
         <source>Cancel</source>
         <translation>إلغاء</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="168"/>
         <source>Downloading List</source>
         <translation>جار تحميل القائمة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="178"/>
         <source>Connecting...</source>
         <translation>جار الإتصال...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="197"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="198"/>
         <source>Refreshing...</source>
         <translation>جار التجديد...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="39"/>
         <source>New  Installation Source</source>
         <translation>مصدر تثبيت جديد</translation>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>ح�ظ النص قبل الإغلاق؟</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>ح�ظ التغيير �ي النص؟</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>ح�ظ النص؟</translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="178"/>
         <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="194"/>
         <source>Abbreviation</source>
         <translation>إختصارات</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="203"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="290"/>
         <source>Cross references</source>
         <translation>مراجع ذات صلة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="343"/>
         <source>Footnote</source>
         <translation>حواشي</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="374"/>
         <source>Strongs</source>
         <translation>سترونج</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="451"/>
         <source>Morphology</source>
         <translation>صر�يات</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="472"/>
         <source>Word lookup</source>
         <translation>بحث عن كلمة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="60"/>
         <source>Copy</source>
         <translation>نسخ</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
         <source>Select all</source>
         <translation>إختيار الكل</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="80"/>
         <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
         <translation>&lt;small&gt;هذه هي منطقة العدسة المكبرة. قم بتمرير المؤشر �وق الروابط أو البنود الأخرى التي تحتوي على معلومات وستظهر المعلومات �ي منطقة المكبر بعد لحظات. قم بتحريك مؤشر ال�أرة إلى منطقة المكبر بسرعة أو ثبت النص بالإستمرار �ي الضغط على م�تاح Shift بينما تقوم بتحريك مؤشر ال�أرة نحو النص.&lt;/small&gt;</translation>
     </message>
@@ -3031,28 +3022,28 @@ Do you want to continue?</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="412"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="422"/>
         <source>Indexing aborted</source>
         <translation>لم تتم ال�هرسة</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="413"/>
         <source>An internal error occurred while building the index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="423"/>
         <source>An internal error occurred while building the index.</source>
         <translation>حدث خطأ داخلي أثناء عملية تكوين ال�هرس.</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="522"/>
         <source>Search aborted</source>
         <translation>لم يتم البحث</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="523"/>
         <source>An internal error occurred while executing your search.</source>
         <translation>حدث خطأ داخلي أثناء تن�يذ عملية البحث.</translation>
     </message>
@@ -3093,7 +3084,7 @@ Do you want to continue?</source>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="122"/>
         <source>Bibles</source>
         <translation>ترجمات الكتاب المقدس</translation>
     </message>
@@ -3110,740 +3101,740 @@ Do you want to continue?</source>
         <translation>كتب</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="390"/>
         <source>Added text</source>
         <translation>نص مضا�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="143"/>
         <source>Names of languages</source>
         <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
         <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="148"/>
         <source>Afrikaans</source>
         <extracomment>Language name af</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="151"/>
         <source>Amuzgo, Guerrero</source>
         <extracomment>Language name amu</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="153"/>
         <source>English, Old (ca.450-1100)</source>
         <extracomment>Language name ang</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="155"/>
         <source>Arabic</source>
         <extracomment>Language name ar</extracomment>
         <translation>Arabic العربية</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="158"/>
         <source>Azerbaijani</source>
         <extracomment>Language name az</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="160"/>
         <source>Azerbaijani, South</source>
         <extracomment>Language name azb</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="165"/>
         <source>Belarusian</source>
         <extracomment>Language name be</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="167"/>
         <source>Bulgarian</source>
         <extracomment>Language name bg</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="173"/>
         <source>Breton</source>
         <extracomment>Language name br</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="175"/>
         <source>Bosnian</source>
         <extracomment>Language name bs</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="177"/>
         <source>Catalan</source>
         <extracomment>Language name ca</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="180"/>
         <source>Chinantec, Comaltepec</source>
         <extracomment>Language name cco</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="182"/>
         <source>Cebuano</source>
         <extracomment>Language name ceb</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
         <source>Chamorro</source>
         <extracomment>Language name ch</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
         <source>Chontal, Highland Oaxaca</source>
         <extracomment>Language name chd</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
         <source>Chinantec, Quiotepec</source>
         <extracomment>Language name chq</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="190"/>
         <source>Chinantec, Ozumacu00edn</source>
         <extracomment>Language name chz</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="193"/>
         <source>Cakchiquel, Western</source>
         <extracomment>Language name ckw</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="195"/>
         <source>Chinantec, Lalana</source>
         <extracomment>Language name cnl</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="197"/>
         <source>Chinantec, Tepetotutla</source>
         <extracomment>Language name cnt</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="199"/>
         <source>Coptic</source>
         <extracomment>Language name cop</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
         <source>Czech</source>
         <extracomment>Language name cs</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
         <source>Chinantec, Sochiapan</source>
         <extracomment>Language name cso</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
         <source>Chol, Tila</source>
         <extracomment>Language name cti</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
         <source>Chatino, Western Highland</source>
         <extracomment>Language name ctp</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
         <source>Church Slavic</source>
         <extracomment>Language name cu</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="212"/>
         <source>Welsh</source>
         <extracomment>Language name cy</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
         <source>Danish</source>
         <extracomment>Language name da</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
         <source>German</source>
         <extracomment>Language name de</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
         <source>Duruma</source>
         <extracomment>Language name dug</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="221"/>
         <source>Greek, Modern (1453-)</source>
         <extracomment>Language name el</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
         <source>English</source>
         <extracomment>Language name en</extracomment>
         <translation>English الإنجليزية</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="225"/>
         <source>American English</source>
         <extracomment>Language name en_US</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="227"/>
         <source>English, Middle (1100-1500)</source>
         <extracomment>Language name enm</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="229"/>
         <source>Esperanto</source>
         <extracomment>Language name eo</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="231"/>
         <source>Spanish</source>
         <extracomment>Language name es</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
         <source>Estonian</source>
         <extracomment>Language name et</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
         <source>Basque</source>
         <extracomment>Language name eu</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
         <source>Persian</source>
         <extracomment>Language name fa</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
         <source>Finnish</source>
         <extracomment>Language name fi</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="243"/>
         <source>French</source>
         <extracomment>Language name fr</extracomment>
         <translation>French ال�رنسية</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="245"/>
         <source>Frisian</source>
         <extracomment>Language name fy</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="247"/>
         <source>Irish</source>
         <extracomment>Language name ga</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="249"/>
         <source>Gaelic (Scots)</source>
         <extracomment>Language name gd</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="251"/>
         <source>Geez</source>
         <extracomment>Language name gez</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
         <source>Gothic</source>
         <extracomment>Language name got</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
         <source>Manx</source>
         <extracomment>Language name gv</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
         <source>Greek, Ancient (to 1453)</source>
         <extracomment>Language name grc</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="262"/>
         <source>Hebrew</source>
         <extracomment>Language name he</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
         <source>Hausa</source>
         <extracomment>Language name hau</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
         <source>Hawaiian</source>
         <extracomment>Language name haw</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
         <source>Hindi</source>
         <extracomment>Language name hi</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="271"/>
         <source>Croatian</source>
         <extracomment>Language name hr</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="275"/>
         <source>Hungarian</source>
         <extracomment>Language name hu</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
         <source>Huave, San Mateo Del Mar</source>
         <extracomment>Language name huv</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
         <source>Armenian</source>
         <extracomment>Language name hy</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
         <source>Indonesian</source>
         <extracomment>Language name id</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
         <source>Icelandic</source>
         <extracomment>Language name is</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
         <source>Italian</source>
         <extracomment>Language name it</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="291"/>
         <source>Itzu00e1</source>
         <extracomment>Language name itz</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="293"/>
         <source>Ixil, San Juan Cotzal</source>
         <extracomment>Language name ixl</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
         <source>Japanese</source>
         <extracomment>Language name ja</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
         <source>Jacalteco, Eastern</source>
         <extracomment>Language name jac</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
         <source>Javanese, Caribbean</source>
         <extracomment>Language name jvn</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="302"/>
         <source>Georgian</source>
         <extracomment>Language name ka</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
         <source>Korean</source>
         <extracomment>Language name ko</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="315"/>
         <source>Kurdish</source>
         <extracomment>Language name ku</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
         <source>Kirghiz</source>
         <extracomment>Language name ky</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
         <source>Latin</source>
         <extracomment>Language name la</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
         <source>Lacandon</source>
         <extracomment>Language name lac</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
         <source>Lithuanian</source>
         <extracomment>Language name lt</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="332"/>
         <source>Latvian</source>
         <extracomment>Language name lv</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="334"/>
         <source>Malagasy</source>
         <extracomment>Language name mg</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="337"/>
         <source>Maori</source>
         <extracomment>Language name mi</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="339"/>
         <source>Mixe, Isthmus</source>
         <extracomment>Language name mir</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="341"/>
         <source>Mixtec, Coatzospan</source>
         <extracomment>Language name miz</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="343"/>
         <source>Macedonian</source>
         <extracomment>Language name mk</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="345"/>
         <source>Mixtec, Silacayoapan</source>
         <extracomment>Language name mks</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="350"/>
         <source>More</source>
         <extracomment>Language name mos</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
         <source>Malay</source>
         <extracomment>Language name ms</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
         <source>Maltese</source>
         <extracomment>Language name mt</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="375"/>
         <source>Low German; Low Saxon</source>
         <extracomment>Language name nds</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="377"/>
         <source>Nepali</source>
         <extracomment>Language name ne</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="379"/>
         <source>Nahuatl, Guerrero</source>
         <extracomment>Language name ngu</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
         <source>Nahuatl, Northern Oaxaca</source>
         <extracomment>Language name nhy</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
         <source>Dutch</source>
         <extracomment>Language name nl</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
         <source>Norwegian Nynorsk</source>
         <extracomment>Language name nn</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
         <source>Norwegian</source>
         <extracomment>Language name no</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="397"/>
         <source>Otomi, Queru00e9taro</source>
         <extracomment>Language name otq</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
         <source>Papiamento</source>
         <extracomment>Language name pap</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
         <source>Polish</source>
         <extracomment>Language name pl</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="411"/>
         <source>Persian (Dari)</source>
         <extracomment>Language name prs</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="415"/>
         <source>Portuguese</source>
         <extracomment>Language name pt</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
         <source>Brasilian Portuguese</source>
         <extracomment>Language name pt_BR</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
         <source>Quichu00e9, West Central</source>
         <extracomment>Language name qut</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
         <source>Romanian</source>
         <extracomment>Language name ro</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
         <source>Russian</source>
         <extracomment>Language name ru</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="431"/>
         <source>Scots</source>
         <extracomment>Language name sco</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="437"/>
         <source>Slovak</source>
         <extracomment>Language name sk</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="439"/>
         <source>Slovenian</source>
         <extracomment>Language name sl</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="443"/>
         <source>Somali</source>
         <extracomment>Language name so</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
         <source>Albanian</source>
         <extracomment>Language name sq</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="453"/>
         <source>Swedish</source>
         <extracomment>Language name sv</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="455"/>
         <source>Swahili</source>
         <extracomment>Language name sw</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="457"/>
         <source>Syriac</source>
         <extracomment>Language name syr</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="459"/>
         <source>Tamil</source>
         <extracomment>Language name ta</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="463"/>
         <source>Thai</source>
         <extracomment>Language name th</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
         <source>Tagalog</source>
         <extracomment>Language name tl</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="470"/>
         <source>Tswana</source>
         <extracomment>Language name tn</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="472"/>
         <source>Turkish</source>
         <extracomment>Language name tr</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
         <source>Tektiteko</source>
         <extracomment>Language name ttc</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="479"/>
         <source>Tahitian</source>
         <extracomment>Language name ty</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="481"/>
         <source>Tzotzil, Zinacantu00e1n</source>
         <extracomment>Language name tzz</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
         <source>Ukrainian</source>
         <extracomment>Language name uk</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
         <source>Orya</source>
         <extracomment>Language name ury</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
         <source>Uspanteco</source>
         <extracomment>Language name usp</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="492"/>
         <source>Vietnamese</source>
         <extracomment>Language name vi</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="496"/>
         <source>Xhosa</source>
         <extracomment>Language name xh</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="163"/>
         <source>Bavarian</source>
         <extracomment>Language name bar</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="326"/>
         <source>Lombard</source>
         <extracomment>Language name lmo</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="403"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
         <source>Uma</source>
         <extracomment>Language name ppk
 ----------
@@ -3851,445 +3842,421 @@ Language name ppk</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="448"/>
         <source>Sranan</source>
         <extracomment>Language name srn</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
         <source>Yiddish</source>
         <extracomment>Language name yi</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
         <source>Zapotec, San Juan Guelavu00eda</source>
         <extracomment>Language name zab</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="507"/>
         <source>Zapotec, Mitla</source>
         <extracomment>Language name zaw</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="509"/>
         <source>Chinese</source>
         <extracomment>Language name zh</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="511"/>
         <source>Zapotec, Amatlu00e1n</source>
         <extracomment>Language name zpo</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
         <source>Zapotec, Zoogocho</source>
         <extracomment>Language name zpq</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="515"/>
         <source>Zapotec, Yalu00e1lag</source>
         <extracomment>Language name zpu</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
         <source>Zapotec, Chichicapan</source>
         <extracomment>Language name zpv</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
         <source>Zapotec, Southern Rincon</source>
         <extracomment>Language name zsr</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
         <source>Zapotec, Quioquitani-Quieru00ed</source>
         <extracomment>Language name ztq</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
         <source>Zapotec, Yatee</source>
         <extracomment>Language name zty</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="525"/>
         <source>Zulu</source>
         <extracomment>Language name zu</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="314"/>
         <source>Footnotes</source>
         <translation>حواشي</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="316"/>
         <source>Strong&apos;s numbers</source>
         <translation>أرقام سترونج</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="318"/>
         <source>Headings</source>
         <translation>عناوين</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="320"/>
         <source>Morphological tags</source>
         <translation>وسوم صر�ية</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="322"/>
         <source>Lemmas</source>
         <translation>مبرهنات</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="324"/>
         <source>Hebrew vowel points</source>
         <translation>نقاط الحرو� المتحركة �ي العبرية</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="326"/>
         <source>Hebrew cantillation marks</source>
         <translation>علامات cantillation العبرية</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="328"/>
         <source>Greek accents</source>
         <translation>accents �ي اليونانية</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="330"/>
         <source>Red letter words</source>
         <translation>كلمات الحر� الأحمر</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="332"/>
         <source>Textual variants</source>
         <translation>تنويعات نصية</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="334"/>
         <source>Scripture cross-references</source>
         <translation>مراجع ذات صلة بالنص</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="336"/>
         <source>Morph segmentation</source>
         <translation>تجزئة صر�ية</translation>
     </message>
     <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation>تصدير</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
         <source>Local</source>
         <translation>على الجهاز</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>خارجي</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>العهد القديم</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>أس�ار موسى الخمسة/التوراة</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>التاريخ</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>الأنبياء</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>العهد الجديد</translation>
+        <source>Remote FTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>الأناجيل</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="32"/>
+        <source>Remote SFTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>الرسائل</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="33"/>
+        <source>Remote HTTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>رسائل بولس</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="34"/>
+        <source>Remote HTTPS</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
         <source>HTML files</source>
         <translation>مل�ات نص �ائق HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="438"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>All files</source>
         <translation>جميع المل�ات</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>Text files</source>
         <translation>مل�ات نصية</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="444"/>
         <source>Save file</source>
         <translation>ح�ظ مل�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="130"/>
         <source>Save document ...</source>
         <translation>ح�ظ وثيقة ...</translation>
     </message>
     <message>
-        <source>Print keys</source>
-        <translation type="obsolete">م�اتيح طباعة</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
         <source>BibleTime bookmark files</source>
         <translation>مل� علامات بيبل تايم</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="127"/>
         <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
         <source>unknown</source>
         <translation>غير معرو�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="60"/>
         <source>New folder</source>
         <translation>مجلد جديد</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
+        <location filename="../../src/util/tool.cpp" line="48"/>
         <source>The file already exists.</source>
         <translation>المل� موجود من قبل.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
+        <location filename="../../src/util/tool.cpp" line="49"/>
         <source>Do you want to overwrite it?</source>
         <translation>هل تريد إستبداله؟</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
+        <location filename="../../src/util/tool.cpp" line="69"/>
+        <location filename="../../src/util/tool.cpp" line="75"/>
         <source>Error</source>
         <translation>خطأ</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>لم يتسنى ح�ظ المل�.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
+        <location filename="../../src/util/tool.cpp" line="78"/>
         <source>Please check permissions etc.</source>
         <translation>الرجاء مراجعة التصاريح إلخ.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
+        <location filename="../../src/util/tool.cpp" line="197"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>يرجى الإنتباه، هذا الكتاب يحتوي على بدع/مواد مشكوك �يها!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
+        <location filename="../../src/util/tool.cpp" line="218"/>
         <source>Version</source>
         <translation>نسخة</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
+        <location filename="../../src/util/tool.cpp" line="207"/>
         <source>Encrypted - needs unlock key</source>
         <translation>مش�ر - �ي حاجة إلى م�تاح �ك الق�ل</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
+        <location filename="../../src/util/tool.cpp" line="71"/>
+        <source>Error while writing to file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="72"/>
+        <source>Please check that enough disk space is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="77"/>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="231"/>
         <source>Double click for more information</source>
         <translation>انقر مرتين لمزيد من المعلومات</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
+        <location filename="../../src/util/tool.cpp" line="213"/>
         <source>Updated version available!</source>
         <translation>يتوا�ر نسخة محدثة!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
+        <location filename="../../src/util/tool.cpp" line="226"/>
         <source>Installed version</source>
         <translation>نسخة مثبتة</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="273"/>
         <source>Haitian Creole</source>
         <extracomment>Language name ht</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
         <source>Kekchu00ed</source>
         <comment>kek</comment>
         <extracomment>Language name kek</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="357"/>
         <source>(Multiple languages)</source>
         <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="359"/>
         <source>Mam, Central</source>
         <extracomment>Language name mvc</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
         <source>Mam, Todos Santos Cuchumatu00e1n</source>
         <extracomment>Language name mvj</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="363"/>
         <source>Mixe, Juquila</source>
         <extracomment>Language name mxq</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="365"/>
         <source>Mixtec, Jamiltepec</source>
         <extracomment>Language name mxt</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="367"/>
         <source>Burmese</source>
         <extracomment>Language name my</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="370"/>
         <source>Norwegian Bokmu00e5l</source>
         <extracomment>Language name nb</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="372"/>
         <source>Nahuatl, Michoacu00e1n</source>
         <extracomment>Language name ncl</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
         <source>Potawatomi</source>
         <extracomment>Language name pot</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="468"/>
         <source>Klingon</source>
         <extracomment>Language name tlh</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="498"/>
         <source>Mixtec, Diuxi-Tilantongo</source>
         <extracomment>Language name xtd</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
         <source>Yoryba</source>
         <extracomment>Language name yo</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="407"/>
         <source>Verb tense changed</source>
         <translation>زمن ال�عل تغير</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>Can&apos;t write file</source>
         <translation>لا يمكن كتابة المل�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>The Sword config file can&apos;t be written!</source>
         <translation>لا يمكن كتابة مل� إعدادات سورد!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="39"/>
         <source>Export Bookmarks</source>
         <translation>تصدير علامات</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="50"/>
         <source>Import bookmarks</source>
         <translation>إستيراد علامات</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
+        <location filename="../../src/util/tool.cpp" line="46"/>
         <source>Overwrite File?</source>
         <translation>إستبدال المل�؟</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="276"/>
         <source>Parsing Strong&apos;s Numbers</source>
         <translation>تحليل أرقام سترونج</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="154"/>
         <source>This shortcut conflicts with the shortcut for the following actions:</source>
         <translation>هذا الإختصار يتعارض مع إختصار الأ�عال الآتية:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
         <source>Do you want to clear the conflicting shortcuts and continue?</source>
         <translation>هل تريد مسح الإختصار المتعارض والمتابعة؟</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="23"/>
         <source>Indexed works</source>
         <translation>كتب م�هرسة</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="24"/>
         <source>Unindexed works</source>
         <translation>كتب غير م�هرسة</translation>
     </message>
@@ -4329,30 +4296,22 @@ Language name ppk</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All command-line arguments not recognized by BibleTime or Qt will be silently ignored.</source>
-        <translation type="obsolete">جميع معطيات سطر الأوامر المجهولة من قبل بيبل تايم أو كيوت يتم تجاهلها �ي صمت.</translation>
-    </message>
-    <message>
-        <source>Error: %1 expects an argument. See --help for details.</source>
-        <translation type="obsolete">خطأ: %1 يتوقع معطى. انظر --مساعدة للت�اصيل.</translation>
-    </message>
-    <message>
         <location filename="../../src/main.cpp" line="111"/>
         <source>Error: Invalid command-line argument: %1</source>
         <translation>خطأ: معطى سطر الأوامر غير صالح: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="57"/>
         <source>CSS base template not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="74"/>
         <source>Default template &quot;%1&quot; not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="113"/>
         <source>Replace</source>
         <translation type="unfinished">إستبدال</translation>
     </message>
@@ -4360,91 +4319,91 @@ Language name ppk</extracomment>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="58"/>
         <source>OK</source>
         <comment>Dialog Button</comment>
         <translation>موا�ق</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="59"/>
         <source>Open</source>
         <comment>Dialog Button</comment>
         <translation>�تح</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="60"/>
         <source>Save</source>
         <comment>Dialog Button</comment>
         <translation>ح�ظ</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="61"/>
         <source>Cancel</source>
         <comment>Dialog Button</comment>
         <translation>إلغاء</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="62"/>
         <source>Close</source>
         <comment>Dialog Button</comment>
         <translation>إغلاق</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="63"/>
         <source>Discard</source>
         <comment>Dialog Button</comment>
         <translation>تجاهل</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="64"/>
         <source>Apply</source>
         <comment>Dialog Button</comment>
         <translation>تطبيق</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="65"/>
         <source>Reset</source>
         <comment>Dialog Button</comment>
         <translation>إعادة ضبط</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="66"/>
         <source>Restore defaults</source>
         <comment>Dialog Button</comment>
         <translation>إستعادة الإ�تراضي</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="67"/>
         <source>Help</source>
         <comment>Dialog Button</comment>
         <translation>مساعدة</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="68"/>
         <source>Save All</source>
         <comment>Dialog Button</comment>
         <translation>ح�ظ الكل</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="69"/>
         <source>Yes</source>
         <comment>Dialog Button</comment>
         <translation>نعم</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="70"/>
         <source>Yes to all</source>
         <comment>Dialog Button</comment>
         <translation>نعم للكل</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="71"/>
         <source>No</source>
         <comment>Dialog Button</comment>
         <translation>لا</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="72"/>
         <source>No to all</source>
         <comment>Dialog Button</comment>
         <translation>لا للكل</translation>
@@ -4453,102 +4412,102 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchOptionsArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="97"/>
         <source>Search for:</source>
         <translation>بحث عن:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="104"/>
         <source>&amp;Search</source>
         <translation>&amp;بحث</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="106"/>
         <source>Start to search the text in the chosen works</source>
         <translation>بدء بحث النص �ي الكتب المختارة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="109"/>
         <source>Ch&amp;oose...</source>
         <translation>ا&amp;ختر...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="111"/>
         <source>Choose works for the search</source>
         <translation>اختر كتباً للبحث</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="114"/>
         <source>S&amp;etup...</source>
         <translation>إ&amp;عداد...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="133"/>
         <source>All of the words (AND is added between the words)</source>
         <translation>جميع الكلمات (تضا� AND بين الكلمات)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="137"/>
         <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
         <translation> (&lt;a href=&apos;syntax_help&apos;&gt;الصيغ جميع&lt;/a&gt;)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="148"/>
         <source>Scope:</source>
         <translation>المجال:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="169"/>
         <source>The text you want to search for</source>
         <translation>النص الذي تريد البحث عنه</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="173"/>
         <source>Works:</source>
         <translation>الكتب:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="346"/>
         <source>No search scope</source>
         <translation>لم يتم تحديد مجال للبحث</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="128"/>
         <source>All words</source>
         <translation>جميع الكلمات</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="116"/>
         <source>Configure predefined scopes for search</source>
         <translation>ضبط المجالات المعدة مسبقاً للبحث</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="130"/>
         <source>Some words</source>
         <translation>بعض الكلمات</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
         <source>Free</source>
         <translation>حر</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
         <source>Some of the words (OR is added between the words)</source>
         <translation>بعض الكلمات (تضا� OR بين الكلمات)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
         <source>Full lucene syntax</source>
         <translation>جميع صيغ lucene</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
         <source>Click the link to get help for search syntax</source>
         <translation>اضغط على الرابط للحصول على مساعدة بصيغ البحث</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="159"/>
         <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
         <translation>اختر مجال البحث (أس�ار/اصحاحات/أعداد). &lt;br /&gt; يستخدم لنسخ الكتاب المقدس والت�اسير.</translation>
     </message>
@@ -4556,17 +4515,17 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchResultArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="85"/>
         <source>Text of the selected search result item</source>
         <translation>نص بند من نتيجة البحث المختار</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="88"/>
         <source>Select all</source>
         <translation>اختر الكل</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="92"/>
         <source>Copy</source>
         <translation>نسخ</translation>
     </message>
@@ -4574,242 +4533,242 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchSyntaxHelpDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="47"/>
         <source>Search Syntax Help</source>
         <translation>مساعدة صيغ البحث</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="94"/>
         <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
         <translation>ص�حة المساعدة هذه مخصصة لخيار &quot;جميع الصيغ&quot;. تتضمن خيارات &apos;جميع الكلمات&apos; و &apos;بعض الكلمات&apos; محدودية �ي الصيغ؛ ��ي الوقت الذي نجد �يه دعماً لكل من &lt;a href=&apos;#wildcards&apos;&gt;حرو� البدل&lt;/a&gt; و &lt;a href=&apos;#fields&apos;&gt;مجالات النص&lt;/a&gt; يظل ممكناً أن ينتج عن إستخدام بعض الصيغ الأخرى نتائج غريبة أو خاطئة مع جميع/بعض الكلمات.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
         <source>Which words to find</source>
         <translation>أي الكلمات تريد البحث عنها</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="101"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
         <source>Grouping and order</source>
         <translation>التصني� والترتيب</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="103"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
         <source>Wildcards (partial words)</source>
         <translation>حرو� البدل (أجزاء الكلمات)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
         <source>Text fields (different parts of text)</source>
         <translation>مجالات النص (أجزاء مختل�ة من النص)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="208"/>
         <source>Other syntax features</source>
         <translation>صيغ أخرى</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
         <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
         <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
         <translation>تكون عناصر البحث م�صولة بالمسا�ات. يمكنك إضا�ة إما &lt;strong&gt;AND&lt;/strong&gt; (جميع الكلمات)، &lt;strong&gt;OR&lt;/strong&gt; (بعض الكلمات) و &lt;strong&gt;NOT&lt;/strong&gt; (لا تتضمن الكلمات الآتية) بين الكلمات. إذا لم تضع شيئاً بين الكلمات �المسا�ات يتم إعتبارها OR بشكل تلقائي.إستخدام &apos;&lt;strong&gt;+&lt;/strong&gt;الكلمة&apos; يعني أن الكلمة يجب ان تكون موجودة �ي النتائج، بينما &apos;&lt;strong&gt;-&lt;/strong&gt;الكلمة&apos; يعني أن الكلمة يجب وألا توجد ضمن النتائج.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="119"/>
         <source>jesus AND god</source>
         <comment>Do not translate &quot;AND&quot;.</comment>
         <translation>يسوع AND الله</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="121"/>
         <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
         <translation>إيجاد الأعداد التي تحتوي على كلاً من يسوع و الله</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="123"/>
         <source>jesus OR god</source>
         <comment>Do not translate &quot;OR&quot;.</comment>
         <translation>يسوع OR الله</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="125"/>
         <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
         <translation>إيجاد الأعداد التي تحتوي على يسوع أو الله</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="127"/>
         <source>jesus NOT god</source>
         <comment>Do not translate &quot;NOT&quot;.</comment>
         <translation>يسوع NOT الله</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="133"/>
         <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
         <translation>إيجاد الأعداد التي تحتوي على يسوع ولكن لا تحتوي على الله</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="131"/>
         <source>+jesus -god</source>
         <translation>+يسوع -الله</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
         <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
         <translation>يمكن تصني� الكلمات �ي مجموعات بإستخدام &lt;strong&gt;الأقواس&lt;/strong&gt;. للحصول على ن�س ترتيب الكلمات بالضبط يتم تحديد العبارة &lt;strong&gt;بعلامات الإقتباس&lt;/strong&gt;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
         <source>(a AND b) OR c</source>
         <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
         <translation>(أ AND ب) OR ج</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
         <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
         <translation>إيجاد الأعداد التي تحتوي على كلاً من &apos;أ&apos; AND &apos;ب&apos; معاً، والأعداد التي تحتوي على &apos;ج&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="145"/>
         <source>&quot;says lord&quot;</source>
         <translation>&quot;يقول الرب&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="149"/>
         <source>&quot;says the lord&quot;</source>
         <translation>&quot;يقول السيد الرب&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="151"/>
         <source>Finds all verses with &apos;says the LORD&apos;</source>
         <translation>إيجاد كل الأعداد التي تحتوي على &apos;يقول السيد الرب&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
         <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
         <translation>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos;تحل محل أي عدد من الحرو� بما �ي ذلك 0، بينما تحل &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; محل حر� واحد. ولا يمكن إستخدام حر� البدل �ي أول الكلمة.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="160"/>
         <source>a*</source>
         <translation>ا*</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="162"/>
         <source>All words beginning with &apos;a&apos;</source>
         <translation>جميع الكلمات التي تبدأ بحر� ا</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="164"/>
         <source>a*a</source>
         <translation>ا*ا</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="166"/>
         <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
         <translation>&apos;اسمها&apos;, &apos;الرضا&apos;, &apos;ابديا&apos; إلخ.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="168"/>
         <source>a?</source>
         <translation>ا؟</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="170"/>
         <source>&apos;at&apos; and &apos;an&apos;</source>
         <translation>اي و ام</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="172"/>
         <source>a??a</source>
         <translation>ا??ا</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="174"/>
         <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
         <translation>&apos;اكلا&apos;, &apos;ايضا&apos;, &apos;ابنا&apos; إلخ.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
         <source>Available text fields:</source>
         <translation>مجالات النص المتاحة:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="181"/>
         <source>Searches headings</source>
         <translation>يبحث العناوين</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="183"/>
         <source>Searches footnotes</source>
         <translation>يبحث الحواشي</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="185"/>
         <source>Searches Strong&apos;s numbers</source>
         <translation>يبحث أرقام سترونج</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="187"/>
         <source>Searches morphology codes</source>
         <translation>يبحث الرموز الصر�ية</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="189"/>
         <source>Examples:</source>
         <translation>أمثلة:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="191"/>
         <source>heading:Jesus</source>
         <comment>Do not translate &quot;heading:&quot;.</comment>
         <translation>heading:يسوع</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="193"/>
         <source>Finds headings with &apos;Jesus&apos;</source>
         <translation>إيجاد العناوين التي تحتوي على يسوع</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="195"/>
         <source>footnote:Jesus AND footnote:said</source>
         <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
         <translation>footnote:يسوع AND footnote:قال</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
         <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
         <translation>إيجاد الحواشي التي تحتوي على &apos;يسوع&apos; و &apos;قال&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
         <source>strong:G846</source>
         <comment>Do not translate &quot;strong:&quot;.</comment>
         <translation>strong:G846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="202"/>
         <source>Finds verses with Strong&apos;s Greek number 846</source>
         <translation>إيجاد الأعداد التي تحتوي على رقم سترونج اليوناني 846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="204"/>
         <source>morph:&quot;N-NSF&quot;</source>
         <comment>Do not translate &quot;morph:&quot;.</comment>
         <translation>morph:&quot;N-NSF&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="206"/>
         <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
         <translation>إيجاد الأعداد التي تحتوي على الرمز الصر�ي &apos;N-NSF&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="210"/>
         <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
         <translation>يستخدم بيبل تايم محرك البحث CLucene. بإمكانك قراءة المزيد على &lt;a href=&apos;%1&apos;&gt;ص�حة صيغ Lucene&lt;/a&gt;.(�ي متص�ح خارجي).</translation>
     </message>
@@ -4855,31 +4814,19 @@ Language name ppk</extracomment>
         <translation>طباعة...</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">نسخ نتيجة البحث...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="231"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="241"/>
         <source>Copying search result</source>
         <translation>جار نسخ نتيجة البحث</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">ح�ظ نتيجة البحث...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="250"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="259"/>
         <source>Saving search result</source>
         <translation>جار ح�ظ نتيجة البحث</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">طباعة نتيجة البحث...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="268"/>
         <source>Printing search result</source>
         <translation>جار طباعة نتيجة البحث</translation>
     </message>
@@ -4927,14 +4874,6 @@ Language name ppk</extracomment>
         <translation>نطاق جديد</translation>
     </message>
     <message>
-        <source>&lt;invalid name of search range&gt;</source>
-        <translation type="obsolete">&lt;invalid name of search range&gt;</translation>
-    </message>
-    <message>
-        <source>Select a scope from the list to edit the search ranges</source>
-        <translation type="obsolete">اختر مجالاً من القائمة لتحديد نطاق البحث</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="140"/>
         <source>&amp;Add new scope</source>
         <translation>إ&amp;ضا�ة مجال جديد</translation>
@@ -4960,10 +4899,6 @@ Language name ppk</extracomment>
         <translation>تغيير اسم مجال البحث المختار</translation>
     </message>
     <message>
-        <source>Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="obsolete">غير نطاق البحث للمجال المختار. إلق نظرة على مجالات البحث المعدة مسبقاً لترى كي�ية ضبط نطاقات البحث.</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="158"/>
         <source>The search ranges which will be used for the search, parsed to the canonical form</source>
         <translation>نطاقات البحث التي سيتم إستخدامها للبحث، طبقاً للشكل الكنسي</translation>
@@ -4977,42 +4912,42 @@ Language name ppk</extracomment>
 <context>
     <name>Search::CSearchDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="130"/>
         <source>Missing indices</source>
         <translation>�هارس غير موجودة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="87"/>
         <source>Search</source>
         <translation>بحث</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="131"/>
         <source>The following modules need to be indexed before they can be searched in:</source>
         <translation>العناصر الآتية �ي حاجة إلى �هرسة قبل أن تتمكن من البحث �يها:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="132"/>
         <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
         <translation>قد تستغرق ال�هرسة وقتاً طويلاً. اضغط على &quot;نعم&quot; ل�هرسة العناصر وبداية البحث، أو &quot;لا&quot; لإلغاء البحث.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="236"/>
         <source>Drag any verse reference onto an open Bible window</source>
         <translation>اسحب مرجع الآية إلى نا�ذة الكتاب المقدس الم�توحة</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="241"/>
         <source>&amp;Analyze results...</source>
         <translation>&amp;تحليل النتائج...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="242"/>
         <source>Show a graphical analysis of the search result</source>
         <translation>إظهار تحليل بياني لنتيجة البحث</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="248"/>
         <source>&amp;Close</source>
         <translation>&amp;إغلاق</translation>
     </message>
@@ -5053,31 +4988,19 @@ Language name ppk</extracomment>
         <translation>طباعة...</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">طباعة نتيجة البحث...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="164"/>
         <source>Printing search result</source>
         <translation>جار طباعة نتيجة البحث</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">ح�ظ نتيجة البحث...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="192"/>
         <source>Saving search result</source>
         <translation>جار ح�ظ نتيجة البحث</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">نسخ نتيجة البحث...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="210"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="228"/>
         <source>Copying search result</source>
         <translation>جار نسخ نتيجة البحث</translation>
     </message>
@@ -5088,197 +5011,91 @@ Language name ppk</extracomment>
     </message>
 </context>
 <context>
-    <name>StandardWorksTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation>يتم إستخدام الكتب الإ�تراضية حين لايتم تحديد كتاب محدد، على سبيل المثال حينما يتم الضغط على رابط �ي الكتاب المقدس أو الت�سير.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>الكتاب المقدس:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>تستخدم ترجمة الكتاب المقدس الإ�تراضية عندما يتم الضغط على رابط للكتاب المقدس</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>الت�سير:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>يستخدم الت�سير الإ�تراضي عندما يتم الضغط على رابط لت�سير</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation>المعجم:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>يستخدم المعجم الإ�تراضي عندما يتم الضغط على رابط لمعجم</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>التأمل اليومي:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>سيتم إستخدام التأمل اليومي الإ�تراضي �ي عرض تأمل قصير �ي البداية</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>معجم سترونج العبري:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>يستخدم المعجم العبري الإ�تراضي عندما يتم الضغط على رابط لمعجم عبري</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>معجم سترونج اليوناني:</translation>
-    </message>
+    <name>btm::InstallProgress</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>يستخدم المعجم اليوناني الإ�تراضي عندما يتم الضغط على رابط لمعجم يوناني</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>المعجم الصر�ي العبري:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>يتم إستخدام المعجم الصر�ي الإ�تراضي للنصوص العبرية عندما يتم الضغط على رابط لوسم صر�ي �ي النص العبري</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="81"/>
+        <source>Failed</source>
+        <translation type="unfinished">�شل</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation>المعجم الصر�ي اليوناني:</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="84"/>
+        <source>Completed</source>
+        <translation type="unfinished">إكتمل</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>يتم إستخدام المعجم الصر�ي الإ�تراضي للنصوص اليونانية عندما يتم الضغط على رابط لوسم صر�ي �ي النص اليوناني</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="90"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">ألغي</translation>
     </message>
 </context>
 <context>
-    <name>TextFiltersTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation type="unfinished">إضا�ة سطر �اصل بعد كل عدد</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">إظهار أعداد الآيات</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation type="unfinished">إظهار عناوين ال�قرات</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">إظهار المراجع ذات الصلة بالنص</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">إظهار accents �ي اليونانية</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">إظهار نقاط الحرو� المتحركة �ي العبرية</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">إظهار علامات cantillation �ي العبرية</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">إظهار التجزئة الصر�ية</translation>
-    </message>
+    <name>btm::InstallSources</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation type="unfinished">إستخدام تنويعات نصية</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installsources.cpp" line="63"/>
+        <source>Failed to refresh source %1</source>
+        <translation type="unfinished">�شل تحديث مصدر %1</translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="unfinished">ال�لاتر تتحكم بمظهر النص. وهنا يمكنك تحديد الإعدادات الإ�تراضية لجميع ال�لاتر. تستطيع أن توق� هذه الإعدادات �ي أي نا�ذة عرض.</translation>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="59"/>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="62"/>
+        <source>The text you want to search for</source>
+        <translation type="unfinished">النص الذي تريد البحث عنه</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation>إيجاد نص</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="135"/>
+        <source>New Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation>النص الذي تريد البحث عنه</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="136"/>
+        <source>View Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation>البحث مع مطابقة حالة الحرو�</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="137"/>
+        <source>Text Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation>&amp;مطابقة حالة الحرو�</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="138"/>
+        <source>User Interface Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation>إيجاد موضع النص السابق</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="141"/>
+        <source>Bookshelf Manager</source>
+        <translation type="unfinished">مدير ر� الكتب</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation>ال&amp;سابق</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="187"/>
+        <source>Single</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation>إيجاد موضع النص التالي</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="188"/>
+        <source>Tabbed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation>ال&amp;تالي</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="189"/>
+        <source>Auto-tile</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation>إغلاق النا�ذة</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="190"/>
+        <source>Auto-tile horizontally</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation>إ&amp;غلاق</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="191"/>
+        <source>Auto-tile vertically</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/messages/bibletime_ui_cs.ts b/i18n/messages/bibletime_ui_cs.ts
index 9e4c480..d70ee5a 100644
--- a/i18n/messages/bibletime_ui_cs.ts
+++ b/i18n/messages/bibletime_ui_cs.ts
@@ -5,6 +5,9 @@
     <name></name>
     <message>
         <source></source>
+        <translatorcomment>Bibletime User Interface translation
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
+This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
 </context>
@@ -50,14 +53,6 @@
         <translation>Celoobrazovkový mód</translation>
     </message>
     <message>
-        <source>&amp;Save session</source>
-        <translation>U&amp;ložit relaci</translation>
-    </message>
-    <message>
-        <source>&amp;Load session</source>
-        <translation>&amp;Otevřít relaci</translation>
-    </message>
-    <message>
         <source>&amp;Delete session</source>
         <translation>S&amp;mazat relaci</translation>
     </message>
@@ -377,6 +372,18 @@
         <source>Toggle visibility of the mag window</source>
         <translation>Zobrazit/skrýt okno �asopisu</translation>
     </message>
+    <message>
+        <source>Sw&amp;itch session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BibleTimeApp</name>
@@ -512,10 +519,6 @@
         <translation>&amp;Licence</translation>
     </message>
     <message>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>&amp;SWORD</source>
         <translation>&amp;SWORD</translation>
     </message>
@@ -523,6 +526,10 @@
         <source>BibleTime is released under the GPL license. You can download and use the program for personal, private, public or commercial purposes without restrictions, but can give away or distribute the program only if you also distribute the corresponding source code.</source>
         <translation>BibleTime je uvolněn pod licencí GPL. Můžete si tento program stáhnout a používat jej pro osobní, privátní, veřejné nebo i komer�ní ú�ely bez omezení. Pokud však program distribuujete dále, musíte spolu s ním distribuovat i jeho zdrojové kódy.</translation>
     </message>
+    <message>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BtBibleKeyWidget</name>
@@ -670,6 +677,56 @@
     </message>
 </context>
 <context>
+    <name>BtConfig</name>
+    <message>
+        <source>Old testament</source>
+        <translation type="unfinished">Stará Smlouva</translation>
+    </message>
+    <message>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation type="unfinished">Mojžíš/Pentateuch/Tóra</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished">Spisy</translation>
+    </message>
+    <message>
+        <source>Prophets</source>
+        <translation type="unfinished">Proroci</translation>
+    </message>
+    <message>
+        <source>New testament</source>
+        <translation type="unfinished">Nová Smlouva</translation>
+    </message>
+    <message>
+        <source>Gospels</source>
+        <translation type="unfinished">Evangelia</translation>
+    </message>
+    <message>
+        <source>Letters/Epistles</source>
+        <translation type="unfinished">Dopisy/Epištoly</translation>
+    </message>
+    <message>
+        <source>Paul&apos;s Epistles</source>
+        <translation type="unfinished">Pavlovy epištoly</translation>
+    </message>
+    <message>
+        <source>Error loading configuration!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BtConfigCore</name>
+    <message>
+        <source>Default Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtDisplaySettingsButton</name>
     <message>
         <source>Use linebreaks after each verse</source>
@@ -744,6 +801,21 @@
     </message>
 </context>
 <context>
+    <name>BtFindWidget</name>
+    <message>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtFontChooserWidget</name>
     <message>
         <source>Font name:</source>
@@ -1061,10 +1133,6 @@
         <translation>Průběh</translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation>Zastavit</translation>
-    </message>
-    <message>
         <source>Stop All</source>
         <translation>Zastavit vše</translation>
     </message>
@@ -1073,10 +1141,6 @@
         <translation>Dokon�eno</translation>
     </message>
     <message>
-        <source>Cancelled</source>
-        <translation>Zrušeno</translation>
-    </message>
-    <message>
         <source>Waiting for turn...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1100,13 +1164,13 @@
         <translation>Jazyk jmen biblických knih:</translation>
     </message>
     <message>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation>Jazyky, které je možno použít pro jména biblických knih</translation>
-    </message>
-    <message>
         <source>Languages</source>
         <translation>Jazyky</translation>
     </message>
+    <message>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BtModuleChooserButton</name>
@@ -1313,6 +1377,120 @@ shortcut</source>
     </message>
 </context>
 <context>
+    <name>BtStandardWorksTab</name>
+    <message>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bible:</source>
+        <translation type="unfinished">Bible:</translation>
+    </message>
+    <message>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation type="unfinished">Standardní Bible je použita, když kliknete na odkaz směřující na Bibli</translation>
+    </message>
+    <message>
+        <source>Commentary:</source>
+        <translation type="unfinished">Kometář:</translation>
+    </message>
+    <message>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation type="unfinished">Standardní komentář je použit, když kliknete na odkaz směřující na komentář</translation>
+    </message>
+    <message>
+        <source>Lexicon:</source>
+        <translation type="unfinished">Lexikon:</translation>
+    </message>
+    <message>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation type="unfinished">Standardní lexikon je použit, když kliknete na odkaz směřující na lexikon</translation>
+    </message>
+    <message>
+        <source>Daily devotional:</source>
+        <translation type="unfinished">Denní zamyšlení:</translation>
+    </message>
+    <message>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation type="unfinished">Standardní zamyšlení bude použito k zobrazení krátkého zamyslení po startu</translation>
+    </message>
+    <message>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation type="unfinished">Hebrejský Strongův lexikon:</translation>
+    </message>
+    <message>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation type="unfinished">Standardní hebrejský lexikon je použit, když kliknete na odkaz směřující na hebrejský lexikon</translation>
+    </message>
+    <message>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation type="unfinished">řecká Strongův lexikon</translation>
+    </message>
+    <message>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation type="unfinished">Standardní řecký lexikon je použit, když kliknete na odkaz směřující na řecký lexikon</translation>
+    </message>
+    <message>
+        <source>Hebrew morphological lexicon:</source>
+        <translation type="unfinished">Hebrejský monografický lexikon:</translation>
+    </message>
+    <message>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation type="unfinished">Standardní monografický lexikon pro hebrejské texty je použit, když kliknete na odkaz monografické zna�ky v hebrejském textu</translation>
+    </message>
+    <message>
+        <source>Greek morphological lexicon:</source>
+        <translation type="unfinished">řecký monografický lexikon:</translation>
+    </message>
+    <message>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation type="unfinished">Standardní monografický lexikon pro řecké texty je použit, když kliknete na odkaz monografické zna�ky v řeckém textu</translation>
+    </message>
+</context>
+<context>
+    <name>BtTextFiltersTab</name>
+    <message>
+        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
+        <translation type="unfinished">Filtry kontrolují vzhled textu. Zde můžete nastavit výchozí hodnoty pro všechny filtry. Toto nastavení můžete v každém zobrazeném okně anulovat.</translation>
+    </message>
+    <message>
+        <source>Insert line break after each verse</source>
+        <translation type="unfinished">Zalomit řádek po každém verši</translation>
+    </message>
+    <message>
+        <source>Show verse numbers</source>
+        <translation type="unfinished">Zobrazit �ísla veršů</translation>
+    </message>
+    <message>
+        <source>Show section headings</source>
+        <translation type="unfinished">Zobrazit nadpisy �ástí</translation>
+    </message>
+    <message>
+        <source>Show scripture cross-references</source>
+        <translation type="unfinished">Ukázat odkaz v Bibli</translation>
+    </message>
+    <message>
+        <source>Show Greek accents</source>
+        <translation type="unfinished">Zobrazit řecké zna�ky přízvuku</translation>
+    </message>
+    <message>
+        <source>Show Hebrew vowel points</source>
+        <translation type="unfinished">Zobrazit hebrejské zna�ky samohlásek</translation>
+    </message>
+    <message>
+        <source>Show Hebrew cantillation marks</source>
+        <translation type="unfinished">Zobrazit hebrejské zna�ky přízvuku</translation>
+    </message>
+    <message>
+        <source>Show morph segmentation</source>
+        <translation type="unfinished">Ukázat morfologické dělení</translation>
+    </message>
+    <message>
+        <source>Use textual variants</source>
+        <translation type="unfinished">Použít textové varianty</translation>
+    </message>
+</context>
+<context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
         <source>Add/remove/replace</source>
@@ -1944,6 +2122,18 @@ shortcut</source>
         <source>Restore original text, new text will be lost</source>
         <translation>Obnovit originální text, nový text bude ztracen</translation>
     </message>
+    <message>
+        <source>Save Text?</source>
+        <translation type="unfinished">Uložit text?</translation>
+    </message>
+    <message>
+        <source>Save text before closing?</source>
+        <translation type="unfinished">Uložit text před ukon�ením?</translation>
+    </message>
+    <message>
+        <source>Save changed text?</source>
+        <translation type="unfinished">Uložit změněný text?</translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
@@ -1952,27 +2142,31 @@ shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
+        <source>BibleTime Search Analysis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>BibleTime Search Analysis</source>
+        <source>Total hits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search text :</source>
+        <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Book</source>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Total hits</source>
+        <source>Search text:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
+        <source>Results by work and book</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2212,21 +2406,6 @@ Do you want to continue?</source>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <source>Save text before closing?</source>
-        <translation>Uložit text před ukon�ením?</translation>
-    </message>
-    <message>
-        <source>Save changed text?</source>
-        <translation>Uložit změněný text?</translation>
-    </message>
-    <message>
-        <source>Save Text?</source>
-        <translation>Uložit text?</translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
         <source>Abbreviation</source>
@@ -3057,50 +3236,10 @@ Language name ppk</extracomment>
         <translation>Morfologické dělení</translation>
     </message>
     <message>
-        <source>Export</source>
-        <translation>Export</translation>
-    </message>
-    <message>
         <source>Local</source>
         <translation>Místní</translation>
     </message>
     <message>
-        <source>Remote</source>
-        <translation>Vzdálený</translation>
-    </message>
-    <message>
-        <source>Old testament</source>
-        <translation>Stará Smlouva</translation>
-    </message>
-    <message>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Mojžíš/Pentateuch/Tóra</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Spisy</translation>
-    </message>
-    <message>
-        <source>Prophets</source>
-        <translation>Proroci</translation>
-    </message>
-    <message>
-        <source>New testament</source>
-        <translation>Nová Smlouva</translation>
-    </message>
-    <message>
-        <source>Gospels</source>
-        <translation>Evangelia</translation>
-    </message>
-    <message>
-        <source>Letters/Epistles</source>
-        <translation>Dopisy/Epištoly</translation>
-    </message>
-    <message>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Pavlovy epištoly</translation>
-    </message>
-    <message>
         <source>HTML files</source>
         <translation>Soubory HTML</translation>
     </message>
@@ -3145,10 +3284,6 @@ Language name ppk</extracomment>
         <translation>Chyba</translation>
     </message>
     <message>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>Soubor nemůže být uložen.</translation>
-    </message>
-    <message>
         <source>Please check permissions etc.</source>
         <translation>Zkontrolujte prosím přístupová práva atd.</translation>
     </message>
@@ -3335,6 +3470,34 @@ Language name ppk</extracomment>
         <source>CSS base template not found!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error while writing to file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please check that enough disk space is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote SFTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote HTTPS</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPushButton</name>
@@ -3891,166 +4054,87 @@ Language name ppk</extracomment>
 <context>
     <name>StandardWorksTab</name>
     <message>
-        <source>Bible:</source>
-        <translation>Bible:</translation>
-    </message>
-    <message>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>Standardní Bible je použita, když kliknete na odkaz směřující na Bibli</translation>
-    </message>
-    <message>
-        <source>Commentary:</source>
-        <translation>Kometář:</translation>
-    </message>
-    <message>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>Standardní komentář je použit, když kliknete na odkaz směřující na komentář</translation>
-    </message>
-    <message>
-        <source>Lexicon:</source>
-        <translation>Lexikon:</translation>
-    </message>
-    <message>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>Standardní lexikon je použit, když kliknete na odkaz směřující na lexikon</translation>
-    </message>
-    <message>
-        <source>Daily devotional:</source>
-        <translation>Denní zamyšlení:</translation>
-    </message>
-    <message>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>Standardní zamyšlení bude použito k zobrazení krátkého zamyslení po startu</translation>
-    </message>
-    <message>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>Hebrejský Strongův lexikon:</translation>
-    </message>
-    <message>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>Standardní hebrejský lexikon je použit, když kliknete na odkaz směřující na hebrejský lexikon</translation>
-    </message>
-    <message>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>řecká Strongův lexikon</translation>
-    </message>
-    <message>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>Standardní řecký lexikon je použit, když kliknete na odkaz směřující na řecký lexikon</translation>
-    </message>
-    <message>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>Hebrejský monografický lexikon:</translation>
-    </message>
-    <message>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>Standardní monografický lexikon pro hebrejské texty je použit, když kliknete na odkaz monografické zna�ky v hebrejském textu</translation>
-    </message>
-    <message>
-        <source>Greek morphological lexicon:</source>
-        <translation>řecký monografický lexikon:</translation>
-    </message>
-    <message>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>Standardní monografický lexikon pro řecké texty je použit, když kliknete na odkaz monografické zna�ky v řeckém textu</translation>
-    </message>
-    <message>
         <source></source>
         <translation></translation>
     </message>
-    <message>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TextFiltersTab</name>
     <message>
-        <source>Insert line break after each verse</source>
-        <translation type="unfinished">Zalomit řádek po každém verši</translation>
-    </message>
-    <message>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">Zobrazit �ísla veršů</translation>
-    </message>
-    <message>
-        <source>Show section headings</source>
-        <translation type="unfinished">Zobrazit nadpisy �ástí</translation>
-    </message>
-    <message>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">Ukázat odkaz v Bibli</translation>
-    </message>
-    <message>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">Zobrazit řecké zna�ky přízvuku</translation>
-    </message>
-    <message>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Zobrazit hebrejské zna�ky samohlásek</translation>
+        <source></source>
+        <translation></translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallProgress</name>
     <message>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Zobrazit hebrejské zna�ky přízvuku</translation>
+        <source>Failed</source>
+        <translation type="unfinished">Selhalo</translation>
     </message>
     <message>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">Ukázat morfologické dělení</translation>
+        <source>Completed</source>
+        <translation type="unfinished">Dokon�eno</translation>
     </message>
     <message>
-        <source>Use textual variants</source>
-        <translation type="unfinished">Použít textové varianty</translation>
+        <source>Cancelled</source>
+        <translation type="unfinished">Zrušeno</translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallSources</name>
     <message>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="unfinished">Filtry kontrolují vzhled textu. Zde můžete nastavit výchozí hodnoty pro všechny filtry. Toto nastavení můžete v každém zobrazeném okně anulovat.</translation>
+        <source>Failed to refresh source %1</source>
+        <translation type="unfinished">Chyba při aktualizaci zdroje %1</translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <source></source>
-        <translation></translation>
+        <source>The text you want to search for</source>
+        <translation type="unfinished">Text, který chcete hledat</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <source>Find Text</source>
-        <translation>Najíd text</translation>
+        <source>New Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The text you want to search for</source>
-        <translation>Text, který chcete hledat</translation>
+        <source>Bookshelf Manager</source>
+        <translation type="unfinished">Správce knihovny</translation>
     </message>
     <message>
-        <source>Case &amp;sensitive</source>
-        <translation>&amp;Rozlišovat velikost písmen</translation>
+        <source>Single</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find the previous location of the text</source>
-        <translation>Najít předchozí umístění textu</translation>
+        <source>Tabbed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Previous</source>
-        <translation>&amp;Předchozí</translation>
+        <source>Auto-tile</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find the next location of the text</source>
-        <translation>Najít další umístění textu</translation>
+        <source>Auto-tile horizontally</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Next</source>
-        <translation>&amp;Další</translation>
+        <source>Auto-tile vertically</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close the dialog</source>
-        <translation>Uzavře dialog</translation>
+        <source>View Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Zavřít</translation>
+        <source>Text Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search with case sensitivity</source>
-        <translation>Rozlišovat velikost písmen</translation>
+        <source>User Interface Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/messages/bibletime_ui_da.ts b/i18n/messages/bibletime_ui_da.ts
index f453d8c..62e1c60 100644
--- a/i18n/messages/bibletime_ui_da.ts
+++ b/i18n/messages/bibletime_ui_da.ts
@@ -6,7 +6,7 @@
     <message>
         <source></source>
         <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
 This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
@@ -22,452 +22,457 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTime</name>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
+        <location filename="../../src/bibletime_init.cpp" line="741"/>
         <source>&amp;File</source>
         <translation>&amp;Fil</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&amp;View</source>
         <translation>&amp;Vis</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&amp;Search</source>
         <translation>&amp;Søg</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&amp;Window</source>
         <translation>&amp;Vindue</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&amp;ttings</source>
         <translation>Inds&amp;tillinger</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjælp</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&amp;Show toolbar</source>
         <translation>Vis værktøjs&amp;linje</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&amp;Fullscreen mode</source>
         <translation>&amp;Fuldskærm</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&amp;Quit</source>
         <translation>&amp;Afslut</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
+        <location filename="../../src/bibletime_init.cpp" line="251"/>
         <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
         <translation>Åben den inkluderede Bibel-studievejledning.&lt;br/&gt;Denne vejledning er en introduktion til at studere Bibelen på en effektiv måde.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
+        <location filename="../../src/bibletime_init.cpp" line="256"/>
         <source>Information about the BibleTime program</source>
         <translation>Information om programmet BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation type="unfinished">&amp;Gem session</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>&amp;Indlæs session</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&amp;Delete session</source>
         <translation>&amp;Slet session</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&amp;Arrangement mode</source>
         <translation>&amp;Placerings tilstand</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&amp;Manual mode</source>
         <translation>&amp;Manuel tilstand</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &amp;vertically</source>
         <translation>Sortér automatisk &amp;vertikalt</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &amp;horizontally</source>
         <translation>Sortér automatisk &amp;horisontalt</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&amp;cascade</source>
         <translation>Læg automatisk &amp;ovenpå hinanden</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&amp;Cascade</source>
         <translation>&amp;Læg ovenpå hinanden</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &amp;vertically</source>
         <translation>Sortér &amp;vertikalt</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &amp;horizontally</source>
         <translation>Sortér &amp;horisontalt</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&amp;ose all windows</source>
         <translation>L&amp;uk alle vinduer</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
+        <location filename="../../src/bibletime_init.cpp" line="224"/>
         <source>Close all open windows inside BibleTime</source>
         <translation>Luk alle åbne vinduer i BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
+        <location filename="../../src/bibletime_init.cpp" line="241"/>
         <source>&amp;Handbook</source>
         <translation>&amp;HÃ¥ndbog</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&amp;Bible Study Howto</source>
         <translation>&amp;Bibel-studievejledning</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
+        <location filename="../../src/bibletime_slots.cpp" line="533"/>
         <source>Please enter a name for the new session.</source>
         <translation>Vælg et navn til den nye session.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
+        <location filename="../../src/bibletime_slots.cpp" line="541"/>
+        <source>Session already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_slots.cpp" line="542"/>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="107"/>
         <source>Quit BibleTime</source>
         <translation>Afslut BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
+        <location filename="../../src/bibletime_init.cpp" line="114"/>
         <source>Toggle fullscreen mode of the main window</source>
         <translation>Skift fuldskærms-tilstand for hovedvinduet</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
+        <location filename="../../src/bibletime_init.cpp" line="123"/>
         <source>Search in &amp;open works...</source>
         <translation>Søg i &amp;åbne værker...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &amp;Bible...</source>
         <translation>Søg i standard &amp;Bibel...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &amp;new session...</source>
         <translation>Gem som &amp;ny session...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
+        <location filename="../../src/bibletime_init.cpp" line="140"/>
         <source>Create and save a new session</source>
         <translation>Opret og gem en ny session</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
+        <location filename="../../src/bibletime_init.cpp" line="147"/>
         <source>Manually arrange the open windows</source>
         <translation>Arrangér de åbne vinduer manuelt</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
+        <location filename="../../src/bibletime_init.cpp" line="154"/>
         <source>Automatically tile the open windows vertically (arrange side by side)</source>
         <translation>Sortér automatisk de åbne vinduer vertikalt</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
+        <location filename="../../src/bibletime_init.cpp" line="161"/>
         <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
         <translation>Sortér automatisk de åbne vinduer horisontalt</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
+        <location filename="../../src/bibletime_init.cpp" line="165"/>
         <source>Auto-&amp;tile</source>
         <translation>Auto-&amp;sortér</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
+        <location filename="../../src/bibletime_init.cpp" line="168"/>
         <source>Automatically tile the open windows</source>
         <translation>Sortér automatisk de åbne vinduer</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
+        <location filename="../../src/bibletime_init.cpp" line="172"/>
         <source>Ta&amp;bbed</source>
         <translation>Fa&amp;ner</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
+        <location filename="../../src/bibletime_init.cpp" line="175"/>
         <source>Automatically tab the open windows</source>
         <translation>Vis automatisk de åbne vinduer i faner</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
+        <location filename="../../src/bibletime_init.cpp" line="182"/>
         <source>Automatically cascade the open windows</source>
         <translation>Læg automatisk alle åbne vinduer oven på hinanden</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
+        <location filename="../../src/bibletime_init.cpp" line="189"/>
         <source>Cascade the open windows</source>
         <translation>Læg alle åbne vinduer oven på hinanden</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
+        <location filename="../../src/bibletime_init.cpp" line="193"/>
         <source>&amp;Tile</source>
         <translation>&amp;Sortér</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
+        <location filename="../../src/bibletime_init.cpp" line="196"/>
         <source>Tile the open windows</source>
         <translation>Sortér de åbne vinduer</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
+        <location filename="../../src/bibletime_init.cpp" line="203"/>
         <source>Vertically tile (arrange side by side) the open windows</source>
         <translation>Sortér de åbne vinduer vertikalt</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
+        <location filename="../../src/bibletime_init.cpp" line="210"/>
         <source>Horizontally tile (arrange on top of each other) the open windows</source>
         <translation>Sortér de åbne vinduer horisontalt</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
+        <location filename="../../src/bibletime_init.cpp" line="214"/>
         <source>Close &amp;window</source>
         <translation>Luk &amp;vindue</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
+        <location filename="../../src/bibletime_init.cpp" line="217"/>
         <source>Close the current open window</source>
         <translation>Luk det nuværende vindue</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
+        <location filename="../../src/bibletime_init.cpp" line="228"/>
         <source>&amp;Configure BibleTime...</source>
         <translation>&amp;Konfigurér BibleTime...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime&apos;s preferences</source>
         <translation>Ændr på BibleTimes indstillinger</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
+        <location filename="../../src/bibletime_init.cpp" line="234"/>
         <source>Bookshelf &amp;Manager...</source>
         <translation>&amp;Boghylden...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
+        <location filename="../../src/bibletime_init.cpp" line="237"/>
         <source>Configure your bookshelf and install/update/remove/index works</source>
         <translation>Konfigurér din boghylde og installér/opdatér/fjern/indeksér værker</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
+        <location filename="../../src/bibletime_init.cpp" line="244"/>
         <source>Open BibleTime&apos;s handbook</source>
         <translation>Åben BibleTimes håndbog</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&amp;Tip of the day...</source>
         <translation>&amp;Dagens gode tip...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
+        <location filename="../../src/bibletime_init.cpp" line="263"/>
         <source>Show tips about BibleTime</source>
         <translation>Vis tip om BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
+        <location filename="../../src/bibletime_init.cpp" line="402"/>
         <source>Toggle visibility of the bookshelf window</source>
         <translation>Ændr på synligheden af boghylde-vinduet</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
+        <location filename="../../src/bibletime_init.cpp" line="406"/>
         <source>Toggle visibility of the bookmarks window</source>
         <translation>Ændr på synligheden af bogmærke-vinduet</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
+        <location filename="../../src/bibletime_init.cpp" line="410"/>
         <source>Toggle visibility of the mag window</source>
         <translation>Ændr på synligheden af forstørrelsesglas-vinduet</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
+        <location filename="../../src/bibletime_init.cpp" line="735"/>
         <source>Main toolbar</source>
         <translation>Hovedværktøjslinje</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
+        <location filename="../../src/bibletime_init.cpp" line="736"/>
         <source>Navigation toolbar</source>
         <translation>Navigationslinje</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
+        <location filename="../../src/bibletime_init.cpp" line="737"/>
         <source>Works toolbar</source>
         <translation>Værklinje</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
+        <location filename="../../src/bibletime_init.cpp" line="738"/>
         <source>Tools toolbar</source>
         <translation>Værktøjslinje</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
+        <location filename="../../src/bibletime_init.cpp" line="739"/>
         <source>Format toolbar</source>
         <translation>Formateringslinje</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
+        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <source>Sw&amp;itch session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="777"/>
         <source>Show main toolbar</source>
         <translation>Vis hovedværktøjslinje</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
+        <location filename="../../src/bibletime_init.cpp" line="780"/>
         <source>Show navigation bar</source>
         <translation>Vis navigationslinje</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
+        <location filename="../../src/bibletime_init.cpp" line="783"/>
         <source>Show works toolbar</source>
         <translation>Vis værklinje</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
+        <location filename="../../src/bibletime_init.cpp" line="786"/>
         <source>Show tools toolbar</source>
         <translation>Vis værktøjslinje</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
+        <location filename="../../src/bibletime_init.cpp" line="789"/>
         <source>Show formatting toolbar</source>
         <translation>Vis formateringslinje</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
+        <location filename="../../src/bibletime_init.cpp" line="792"/>
         <source>Show bookshelf</source>
         <translation>Vis boghylde</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
+        <location filename="../../src/bibletime_init.cpp" line="795"/>
         <source>Show bookmarks</source>
         <translation>Vis bogmærker</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
+        <location filename="../../src/bibletime_init.cpp" line="798"/>
         <source>Show mag</source>
         <translation>Vis forstørrelsesglas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
+        <location filename="../../src/bibletime_init.cpp" line="743"/>
         <source>Toolbars</source>
         <translation>Værktøjslinjer</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <location filename="../../src/bibletime_init.cpp" line="774"/>
         <source>Show toolbars in text windows</source>
         <translation>Vis værktøjslinjer i tekst-vinduer</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
+        <location filename="../../src/bibletime_init.cpp" line="801"/>
         <source>Show parallel text headers</source>
         <translation>Vis parallelle overskrifter</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
+        <location filename="../../src/bibletime_init.cpp" line="747"/>
         <source>O&amp;pen windows</source>
         <translation>Ã…&amp;bne vinduer</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show &quot;Whats this widget&quot; dialog</source>
         <translation>Vis &quot;Hvad er det for en widget&quot; dialogen</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
+        <location filename="../../src/bibletime_init.cpp" line="954"/>
         <source>Whats this widget?</source>
         <translation>Hvad er det for en widget?</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
+        <location filename="../../src/bibletime_init.cpp" line="126"/>
         <source>Search in all works that are currently open</source>
         <translation>Søg i alle de åbne værker</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
+        <location filename="../../src/bibletime_init.cpp" line="133"/>
         <source>Search in the standard Bible</source>
         <translation>Søg i standardbibelen</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
+        <location filename="../../src/bibletime_slots.cpp" line="532"/>
         <source>New Session</source>
         <translation>Ny session</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
+        <location filename="../../src/bibletime.cpp" line="77"/>
         <source>Initializing the SWORD engine...</source>
         <translation>Initialiserer SWORD-motoren...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
+        <location filename="../../src/bibletime.cpp" line="85"/>
         <source>Creating BibleTime&apos;s user interface...</source>
         <translation>Opretter BibleTimes brugerflade...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
+        <location filename="../../src/bibletime.cpp" line="92"/>
         <source>Initializing menu- and toolbars...</source>
         <translation>Initialiserer menu- og værktøjslinjer...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Unlock Work</source>
         <translation>Lås værk op</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Enter the unlock key for %1.</source>
         <translation>Indtast nøglen til %1.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
+        <location filename="../../src/bibletime.cpp" line="214"/>
         <source>Warning: Invalid unlock key!</source>
         <translation>Advarsel: Forkert nøgle!</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
+        <location filename="../../src/bibletime.cpp" line="215"/>
         <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
         <translation>Nøglen du indtastede kunne ikke låse modulet op. Prøv igen.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
+        <location filename="../../src/bibletime_init.cpp" line="255"/>
         <source>&amp;About BibleTime</source>
         <translation>&amp;Om BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
+        <location filename="../../src/bibletime_init.cpp" line="733"/>
         <source>Bookmarks</source>
         <translation>Bogmærker</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
+        <location filename="../../src/bibletime_init.cpp" line="734"/>
         <source>Mag</source>
         <translation>Forstørrelsesglas</translation>
     </message>
@@ -475,7 +480,8 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTimeApp</name>
     <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
+        <location filename="../../src/bibletimeapp.cpp" line="59"/>
+        <location filename="../../src/mobile/bibletimeapp.cpp" line="63"/>
         <source>Fatal error!</source>
         <translation>Fatal fejl!</translation>
     </message>
@@ -483,7 +489,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtAboutDialog</name>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
         <source>BibleTime is an easy to use but powerful Bible study tool.</source>
         <translation>BibleTime er et let andvendeligt, men kraftfuldt bibelstudieværktøj.</translation>
     </message>
@@ -498,52 +504,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Den komplette bindende licens er herunder.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="109"/>
         <source>About BibleTime</source>
         <translation>Om BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="121"/>
         <source>&amp;BibleTime</source>
         <translation>&amp;BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="126"/>
         <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
         <translation>Vi søger udviklere og oversættere. Hvis du gerne vil slutte dig til vores hold, så send en email til %1.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation>(c)1999-2013, BibleTime holdet</translation>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="130"/>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished">(c)1999-2014, BibleTime holdet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="137"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Bidragsydere</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="148"/>
         <source>The following people contributed to BibleTime:</source>
         <translation>De følgende personer har bidraget til BibleTime:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="150"/>
         <source>documentation and translation manager</source>
         <translation>dokumentation og oversættelses-bestyrer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="172"/>
         <source>project manager</source>
         <translation>projekt-bestyrer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>tester</source>
         <translation>tester</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>usability expert</source>
         <translation>brugervenligheds-ekspert</translation>
     </message>
@@ -583,52 +589,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>&amp;Licens</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
         <source>designer</source>
         <translation>designer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="139"/>
         <source>developer</source>
         <translation>udvikler</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
         <source>project founder</source>
         <translation>opretter af projektet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="157"/>
         <source>packager</source>
         <translation>pakker</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="158"/>
         <source>creator of The Sword Project</source>
         <translation>opretter af Sword projektet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
         <source>domain sponsor</source>
         <translation>domæne sponsor</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
         <source>howto</source>
         <translation>studie vejledningen</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="141"/>
         <source>artist</source>
         <translation>kunstner</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="173"/>
         <source>documentation</source>
         <translation>dokumentation</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="188"/>
         <source>The following people translated BibleTime into their language:</source>
         <translation>De følgende personer har oversat BibleTime til deres sprog:</translation>
     </message>
@@ -656,37 +662,37 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBibleKeyWidget</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="110"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Rul igennem listens punkter. Tryk knappen og bevæg musen for at bevæge dig op eller ned blandt punkterne.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
         <source>Next book</source>
         <translation>Næste bog</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
         <source>Previous book</source>
         <translation>Forrige bog</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="117"/>
         <source>Next chapter</source>
         <translation>Næste kapitel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
         <source>Previous chapter</source>
         <translation>Forrige kapitel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="122"/>
         <source>Next verse</source>
         <translation>Næste vers</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
         <source>Previous verse</source>
         <translation>Forrige vers</translation>
     </message>
@@ -765,27 +771,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfGroupingMenu</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
         <source>Category/Language</source>
         <translation>Kategori/Sprog</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
         <source>Category</source>
         <translation>Kategori</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
         <source>Language/Category</source>
         <translation>Sprog/Kategori</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="105"/>
         <source>Language</source>
         <translation>Sprog</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="108"/>
         <source>No grouping</source>
         <translation>Ingen gruppering</translation>
     </message>
@@ -793,7 +799,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfModel</name>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
+        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="78"/>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
@@ -801,119 +807,160 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfWidget</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="157"/>
         <source>Fi&amp;lter:</source>
         <translation>Fi&amp;lter:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="158"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
         <source>Grouping</source>
         <translation>Gruppering</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="159"/>
         <source>Change the grouping of items in the bookshelf.</source>
         <translation>Ændr gruperingen af elementer på boghylden.</translation>
     </message>
     <message>
-        <source>Category/Language</source>
-        <translation type="obsolete">Kategori/Sprog</translation>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
+        <source>Show/hide works</source>
+        <translation>Vis/skjul værker</translation>
     </message>
+</context>
+<context>
+    <name>BtChapterDropdownChooserButton</name>
     <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategori</translation>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
+        <source>Select chapter</source>
+        <translation>Vælg kapitel</translation>
     </message>
+</context>
+<context>
+    <name>BtConfig</name>
     <message>
-        <source>Language/Category</source>
-        <translation type="obsolete">Sprog/Kategori</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="46"/>
+        <source>Old testament</source>
+        <translation type="unfinished">Gamle testamente</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation type="obsolete">Sprog</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="47"/>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation type="unfinished">Moses/Pentateuch/Torah</translation>
     </message>
     <message>
-        <source>No grouping</source>
-        <translation type="obsolete">Ingen gruppering</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="48"/>
+        <source>History</source>
+        <translation type="unfinished">Historie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
-        <source>Show/hide works</source>
-        <translation>Vis/skjul værker</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="49"/>
+        <source>Prophets</source>
+        <translation type="unfinished">Profeter</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="50"/>
+        <source>New testament</source>
+        <translation type="unfinished">Nye Testamente</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="51"/>
+        <source>Gospels</source>
+        <translation type="unfinished">Evangelier</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="52"/>
+        <source>Letters/Epistles</source>
+        <translation type="unfinished">Breve</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="53"/>
+        <source>Paul&apos;s Epistles</source>
+        <translation type="unfinished">Paulus&apos; Breve</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="89"/>
+        <source>Error loading configuration!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="90"/>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>BtChapterDropdownChooserButton</name>
+    <name>BtConfigCore</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
-        <source>Select chapter</source>
-        <translation>Vælg kapitel</translation>
+        <location filename="../../src/backend/config/btconfigcore.cpp" line="62"/>
+        <source>Default Session</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BtDisplaySettingsButton</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="103"/>
         <source>Use linebreaks after each verse</source>
         <translation>Brug linjeskift efter hvert vers</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
         <source>Show verse numbers</source>
         <translation>Vis vers-numre</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
         <source>Show headings</source>
         <translation>Vis overskrifter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
         <source>Highlight words of Jesus</source>
         <translation>Marker Jesu ord</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
         <source>Show Hebrew vowel points</source>
         <translation>Vis hebraiske vokal mærker</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
         <source>Show Hebrew cantillation marks</source>
         <translation>Vis hebraiske kantilations-mærker</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
         <source>Show Greek accents</source>
         <translation>Vis græske accenter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
         <source>Use alternative textual variant</source>
         <translation>Brug alternativ tekstural variant</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
         <source>Show scripture cross-references</source>
         <translation>Vis skriftsteds krydsreferencer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
         <source>Show footnotes</source>
         <translation>Vis fodnoter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
         <source>Show morph segmentation</source>
         <translation>Vis morf-segmentering</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="120"/>
         <source>Display settings</source>
         <translation>Visnings-indstillinger</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="123"/>
         <source>Display settings: No options available</source>
         <translation>Visnings-indstillinger: Ingen valgmuligheder tilgængelige</translation>
     </message>
@@ -921,27 +968,45 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtEditBookmarkDialog</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="71"/>
         <source>Edit Bookmark</source>
         <translation>Redigér bogmærke</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
         <source>Location:</source>
         <translation>Placering:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
         <source>Title:</source>
         <translation>Titel:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
         <source>Description:</source>
         <translation>Beskrivelse:</translation>
     </message>
 </context>
 <context>
+    <name>BtFindWidget</name>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="28"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="29"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="74"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtFontChooserWidget</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
@@ -962,31 +1027,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <source>You can specify a custom font for each language.</source>
-        <translation type="obsolete">Du kan vælge en brugerdefineret skrifttype til hvert sprog.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="151"/>
         <source>&amp;Language:</source>
         <translation>&amp;Sprog:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
         <source>The font selection below will apply to all texts in this language</source>
         <translation>Valget af skrifttype herunder vil påvirke alt tekst på dette sprog</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
         <source>Use custom font</source>
         <translation>Benyt en brugerdefineret skrifttype</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
         <source>Optionally specify a custom font for each language:</source>
         <translation>Vælg eventuelt en brugerdefineret skrifttype til hvert sprog:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="150"/>
         <source>Fonts</source>
         <translation>Skrifttyper</translation>
     </message>
@@ -994,75 +1055,67 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtIndexPage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="107"/>
         <source>%1 KiB</source>
         <translation>%1 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="114"/>
         <source>0 KiB</source>
         <translation>0 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="124"/>
         <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
         <translation>Hvis valgt, vil de indeks som ikke har noget tilsvarende værk blive slettet når BibleTime starter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
         <source>Automatically delete orphaned indexes when BibleTime starts</source>
         <translation>Slet automatisk forældreløse indekser når BibleTime starter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="127"/>
         <source>Delete the selected indexes</source>
         <translation>Slet de valgte indeks</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="130"/>
         <source>Create new indexes for the selected works</source>
         <translation>Opret nye indeks for de valgte værker</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Work</source>
         <translation>Værk</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Index size</source>
         <translation>Indeks størrelse</translation>
     </message>
     <message>
-        <source>Create new search indexes and delete created indexes for the installed works.</source>
-        <translation type="obsolete">Opret nye indeks og slet oprettede indeks for de installede værker.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="122"/>
         <source>Search Indexes</source>
         <translation>Søge indekser</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="91"/>
         <source>Indexed Works</source>
         <translation>Indekserede værker</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="96"/>
         <source>Unindexed Works</source>
         <translation>Ikke-indekserede værker</translation>
     </message>
     <message>
-        <source>KiB</source>
-        <translation type="obsolete">KiB</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
         <source>Create...</source>
         <translation>Opret...</translation>
     </message>
@@ -1088,17 +1141,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallModuleChooserDialogModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="88"/>
         <source>Work</source>
         <translation>Værk</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="89"/>
         <source>Installation source</source>
         <translation>Installations kilde</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="90"/>
         <source>Version</source>
         <translation>Udgave</translation>
     </message>
@@ -1111,14 +1164,6 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Installér/opdatér</translation>
     </message>
     <message>
-        <source>Install and update works. Add remote or local sources, refresh them, select the works to be installed/updated and click Install.&lt;br/&gt;&lt;b&gt;WARNING:&lt;/b&gt; If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="obsolete">Installér og opdatér værker. Tilføj fjerne eller lokale kilder, opdatér dem, vælg værkerne som skal installeres/opdateres og tryk installér.&lt;br/&gt;&lt;b&gt;WARNING:&lt;/b&gt; Hvis du lever i et forfulgt land og ikke ønsker at risikere at blive opdaget, så lad være med at bruge fjerne kilder.</translation>
-    </message>
-    <message>
-        <source>Install folder:</source>
-        <translation type="obsolete">Installationsmappe:</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="265"/>
         <source>WARNING!!!</source>
         <translation>ADVARSEL!!!</translation>
@@ -1199,20 +1244,16 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Destinationsmappen er ikke skrivbar eller eksisterer ikke. Installationen vil fejle med mindre dette er blevet ordnet.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="388"/>
         <source>Delete Source?</source>
         <translation>Slet kilde?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="389"/>
         <source>Do you really want to delete this source?</source>
         <translation>Er du sikker på at du vil slette denne kilde?</translation>
     </message>
     <message>
-        <source>Install...</source>
-        <translation type="obsolete">Installér...</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="281"/>
         <source>Install or update selected works</source>
         <translation>Installér eller opdatér valgte værker</translation>
@@ -1221,17 +1262,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPageModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="75"/>
         <source>Work</source>
         <translation>Værk</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="76"/>
         <source>Version</source>
         <translation>Udgave</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="77"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
@@ -1247,99 +1288,99 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPathDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="35"/>
         <source>Bookshelf Folders</source>
         <translation>Boghylde mapper</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
         <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
         <translation>Værker kan installeres i en eller flere mapper. Efter opsætningen af mapper her, kan du vælge en af dem på installationssiden.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="45"/>
         <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
         <translation>BibleTime og SWORD biblioteket finder værker fra alle disse mapper. Hvis en mappe fjernes herfra eksisterer den stadig på systemet med alle værkerne i sig.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="48"/>
         <source>Configure bookshelf folders</source>
         <translation>Konfigurér boghylde-mapper</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="53"/>
         <source>Configuration file for the folders is: </source>
         <translation>Konfigurationsfilen for mapperne er:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="61"/>
         <source>Folders where new works can be installed</source>
         <translation>Mapper hvori nye værker kan installeres</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
         <source>Read-only folders</source>
         <translation>Skrivebeskyttede mapper</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="66"/>
         <source>Nonexistent folders</source>
         <translation>Ikke-eksisterende mapper</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="80"/>
         <source>&amp;Add...</source>
         <translation>&amp;Tilføj...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="81"/>
         <source>Add new folder</source>
         <translation>Tilføj ny mappe</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="86"/>
         <source>&amp;Edit...</source>
         <translation>&amp;Redigér...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="87"/>
         <source>Edit the selected folder</source>
         <translation>Redigér den valgte mappe</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="92"/>
         <source>&amp;Remove</source>
         <translation>&amp;Fjern</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="93"/>
         <source>Remove the selected folder</source>
         <translation>Fjern den valgte mappe</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="167"/>
         <source>This default folder in your home directory can&apos;t be removed</source>
         <translation>Denne standardmappe i din hjemmemappe kan ikke fjernes</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="194"/>
         <source>Choose Folder</source>
         <translation>Vælg mappe</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>Use Folder?</source>
         <translation>Brug mappe?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
         <translation>Denne mappe er ikke skrivbar, så værker kan ikke installeres her med BibleTime. Insisterer du på at bruge denne mappe i stedet for den forrige?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
         <translation>Denne mappe er ikke skrivbar, så værker kan ikke installeres her med BibleTime Insisterer du på at tilføje den til listen over boghylde mapper?</translation>
     </message>
@@ -1347,52 +1388,42 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallProgressDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Work</source>
         <translation>Værk</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Progress</source>
         <translation>Fremskridt</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>Afbryd</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="60"/>
         <source>Stop All</source>
         <translation>Afbryd alle</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Completed</source>
         <translation>Færdig</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>Anulleret</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="55"/>
         <source>Waiting for turn...</source>
         <translation>Venter på tur...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="113"/>
         <source>Preparing install...</source>
         <translation>Forbereder installation...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="37"/>
         <source>Install Progress</source>
         <translation>Installations fremskridt</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Failed</source>
         <translation>Fejlede</translation>
     </message>
@@ -1400,21 +1431,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <source>Select the language in which the Biblical book names are displayed.</source>
-        <translation type="obsolete">Vælg det sprog de bibelske bøgers navne bliver vist på.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
         <source>Language for names of Bible books:</source>
         <translation>Sprog for Bibelens bøgers navne:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation>Sprogene der kan bruges til de bibelske bøgers navne</translation>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="136"/>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="133"/>
         <source>Languages</source>
         <translation>Sprog</translation>
     </message>
@@ -1464,7 +1491,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtModuleManagerDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="57"/>
         <source>Bookshelf Manager</source>
         <translation>Boghylden</translation>
     </message>
@@ -1472,7 +1499,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkAction</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="103"/>
         <source>&amp;Open work</source>
         <translation>&amp;Åben værk</translation>
     </message>
@@ -1480,12 +1507,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkActionMenu</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="42"/>
         <source>&amp;Grouping order</source>
         <translation>&amp;Grupperingsrækkefølge</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="43"/>
         <source>Sets the grouping order for the items in this menu.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1521,59 +1548,47 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtRemovePage</name>
     <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">Fjern</translation>
-    </message>
-    <message>
-        <source>Remove installed works. Select the works and click Remove button.</source>
-        <translation type="obsolete">Fjern installerede værker. Vælg værkerne og tryk på Fjern knappen.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="100"/>
         <source>Select &amp;works to uninstall:</source>
         <translation>Vælg &amp;værker der skal afinstalleres:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&amp;Remove...</source>
         <translation>&amp;Fjern...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="98"/>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="111"/>
         <source>Start removal of %1 works:</source>
         <translation>Begynd fjernelse af %1 værker:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="114"/>
         <source>Start removal:</source>
         <translation>Begynd fjernelse:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="145"/>
         <source>You selected the following work(s): </source>
         <translation>Du har valgt følgende værker: </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="149"/>
         <source>Do you really want to remove them from your system?</source>
         <translation>Er du sikker på at du vil fjerne dem fra dit system?</translation>
     </message>
     <message>
-        <source>Remove...</source>
-        <translation type="obsolete">Fjern...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
         <source>Remove the selected works</source>
         <translation>Fjern valgte værker</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="151"/>
         <source>Remove Works?</source>
         <translation>Fjern værker?</translation>
     </message>
@@ -1594,12 +1609,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtSearchModuleChooserDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="47"/>
         <source>Works to Search in</source>
         <translation>Værker der skal søges i</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="49"/>
         <source>Select the works which should be searched.</source>
         <translation>Vælg de værker der skal søges i.</translation>
     </message>
@@ -1682,168 +1697,165 @@ genvej</translation>
     </message>
 </context>
 <context>
-    <name>BtSourceArea</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">Værk</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="obsolete">Beskrivelse</translation>
-    </message>
-    <message>
-        <source>&amp;Add...</source>
-        <translation type="obsolete">Tilføj...</translation>
-    </message>
-    <message>
-        <source>Refresh...</source>
-        <translation type="obsolete">Opdatér...</translation>
-    </message>
+    <name>BtStandardWorksTab</name>
     <message>
-        <source>Refresh the list of works from this source</source>
-        <translation type="obsolete">Opdatér listen over værker fra denne kilde</translation>
-    </message>
-    <message>
-        <source>&amp;Delete...</source>
-        <translation type="obsolete">Slet...</translation>
-    </message>
-    <message>
-        <source>Delete this source</source>
-        <translation type="obsolete">Slet denne kilde</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="169"/>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation type="unfinished">Standard værker bliver benyttet når intet bestemt værk er angivet, for eksempel når et link til en Bibel eller et leksikon bliver åbnet.</translation>
     </message>
     <message>
-        <source>Add new source</source>
-        <translation type="obsolete">Tilføj ny kilde</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
+        <translation type="unfinished">Bibel:</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceAreaModel</name>
     <message>
-        <source>Work</source>
-        <translation type="obsolete">Værk</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="174"/>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation type="unfinished">Standard-Bibelen der bliver anvendt når der trykkes på et link til en Bibel</translation>
     </message>
     <message>
-        <source>Version</source>
-        <translation type="obsolete">Version</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</source>
+        <translation type="unfinished">Kommentar:</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Beskrivelse</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="178"/>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation type="unfinished">Standard-kommentaren der bliver anvendt når der trykkes på et link til en kommentar</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceWidget</name>
     <message>
-        <source>Delete Source?</source>
-        <translation type="obsolete">Slet kilde?</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
+        <translation type="unfinished">Leksikon:</translation>
     </message>
     <message>
-        <source>Do you really want to delete this source?</source>
-        <translation type="obsolete">Er du sikker på at du vil slette denne kilde?</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="182"/>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation type="unfinished">Standard-leksikonet der bliver anvendt når der trykkes på et link til et leksikon</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Anullér</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</source>
+        <translation type="unfinished">Daglig andagt:</translation>
     </message>
     <message>
-        <source>Refreshing source</source>
-        <translation type="obsolete">Opdaterer kilde</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="186"/>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation type="unfinished">Standard-andagten der bliver anvendt når der trykkes på et hyperlink til en andagt</translation>
     </message>
     <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Forbinder...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation type="unfinished">Hebraisk Strong&apos;s-leksikon:</translation>
     </message>
     <message>
-        <source>Refreshing...</source>
-        <translation type="obsolete">Opdaterer...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="190"/>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation type="unfinished">Det hebraiske standard-leksikon der bliver anvendt når der trykkes på et link til et hebraisk leksikon</translation>
     </message>
     <message>
-        <source>Remote:</source>
-        <translation type="obsolete">Fjern:</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation type="unfinished">Græsk Strong&apos;s-leksikon:</translation>
     </message>
     <message>
-        <source>Local:</source>
-        <translation type="obsolete">Lokal:</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="194"/>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation type="unfinished">Det græske standard-leksikon der bliver anvendt når der trykkes på et link til et græsk leksikon</translation>
     </message>
     <message>
-        <source>Not a directory!</source>
-        <translation type="obsolete">Ikke en mappe!</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</source>
+        <translation type="unfinished">Hebraisk morfologisk leksikon:</translation>
     </message>
     <message>
-        <source>Not readable!</source>
-        <translation type="obsolete">Ikke læsbar!</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="198"/>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation type="unfinished">Det morfologiske standard-leksikon for hebraiske tekster der bliver anvendt når der trykkes på et link til et morfologisk mærke i en hebraisk tekst</translation>
     </message>
     <message>
-        <source>Warning</source>
-        <translation type="obsolete">Advarsel</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</source>
+        <translation type="unfinished">Græsk morfologisk leksikon:</translation>
     </message>
     <message>
-        <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="obsolete">Destinationsmappen er ikke skrivbar eller eksisterer ikke. Installationen vil fejle med mindre dette er blevet ordnet.</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="202"/>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation type="unfinished">Det morfologiske standard-leksikon for græske tekster der bliver anvendt når der trykkes på et link til et morfologisk mærke i en græsk tekst</translation>
     </message>
 </context>
 <context>
     <name>BtTextFiltersTab</name>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="74"/>
         <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="obsolete">Filtre kontrollerer udeseendet af tekst. Her kan du specificere standard-indstillinger for alle filtrene. Du kan overskrive disse indstillinger i hvert visningsvindue.</translation>
+        <translation type="unfinished">Filtre kontrollerer udeseendet af tekst. Her kan du specificere standard-indstillinger for alle filtrene. Du kan overskrive disse indstillinger i hvert visningsvindue.</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="78"/>
         <source>Insert line break after each verse</source>
-        <translation type="obsolete">Indsæt linjeskift efter hvert vers</translation>
+        <translation type="unfinished">Indsæt linjeskift efter hvert vers</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
         <source>Show verse numbers</source>
-        <translation type="obsolete">Vis vers-numre</translation>
+        <translation type="unfinished">Vis vers-numre</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
         <source>Show section headings</source>
-        <translation type="obsolete">Vis afsnits overskrifter</translation>
+        <translation type="unfinished">Vis afsnits overskrifter</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
+        <source>Show scripture cross-references</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="82"/>
         <source>Show Greek accents</source>
-        <translation type="obsolete">Vis græske accenter</translation>
+        <translation type="unfinished">Vis græske accenter</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="83"/>
         <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">Vis hebraiske vokal mærker</translation>
+        <translation type="unfinished">Vis hebraiske vokal mærker</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="84"/>
         <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">Vis hebraiske kantilations-mærker</translation>
+        <translation type="unfinished">Vis hebraiske kantilations-mærker</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="85"/>
         <source>Show morph segmentation</source>
-        <translation type="obsolete">Vis morf-segmentering</translation>
+        <translation type="unfinished">Vis morf-segmentering</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="86"/>
         <source>Use textual variants</source>
-        <translation type="obsolete">Brug teksturale varianter</translation>
+        <translation type="unfinished">Brug teksturale varianter</translation>
     </message>
 </context>
 <context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
         <source>Add/remove/replace</source>
         <translation>Tilføj/fjern/erstat</translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">Fjern</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
         <source>Replace</source>
         <translation>Erstat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
         <source>Add</source>
         <translation>Tilføj</translation>
     </message>
@@ -1851,87 +1863,87 @@ genvej</translation>
 <context>
     <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="69"/>
         <source>Tip Of The Day</source>
         <translation>Dagens gode tip</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="83"/>
         <source>Show tips at startup</source>
         <translation>Vis tips ved opstart</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="94"/>
         <source>Next Tip</source>
         <translation>Næste tip</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
         <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
         <translation>For at tilføje flere parallelle Bibeler i dit aktive bibelvindue, så tryk på dette ikon og vælg en anden Bibel.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
         <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
         <translation>For at tilføje flere parallelle kommentarer i dit aktive kommentarvindue, så tryk på dette ikon og vælg en anden kommentar.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="134"/>
         <source>To learn more about the BibleTime project please go to our web site.</source>
         <translation>For at lære mere om BibleTime-projektet, så gå til vores hjemmeside.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="137"/>
         <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
         <translation>For at synkronisere et kommentarvindue med det aktive bibelvindue, aktiverer du kommentarvinduet og trykker på dette ikon.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
         <source>Select the icon again to stop the synchronization.</source>
         <translation>Vælg ikonet igen for at afbryde synkonisationen.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="142"/>
         <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
         <translation>For at oprette et bogmærke kan du trække en vershenvisning fra en Bibel eller en kommentar ind i bogmærkevinduet. En pil vil indikere hvor bogmærket vil lande når du slipper musen. Andre værker vil have en henvisning i hjørnet øverst til venstre, som kan bruges til at oprette et bogmærke.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="147"/>
         <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
         <translation>Højreklik på et bogmærke og vælg Redigér bogmærke-menuen for at ændre titlen eller beskrivelsen for et bogmærke. Efter redigeringen kan beskrivelsen ses ved at holde musen over bogmærket.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="151"/>
         <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
         <translation>Åben Boghylden og vælg Tilføj-knappen og derefter Hent liste-knappen, for at indlæse flere installationskilder for værker.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="154"/>
         <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
         <translation>For at finde mere information om et værk, så gå til Boghylde-vinduet, højreklik på værket og vælg Om-menuen.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="157"/>
         <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="163"/>
         <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="178"/>
         <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
         <translation>Du kan gemme dine åbne vinduer i en session. Sådan en session kan nemt åbnes senere. Du kan gemme så mange sessioner som du har lyst til. Sessioner administreres i Vindue-menuen.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="168"/>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
         <translation>Du kan gemme personlige noter til specifikke vers-henvisninger. Du er nødt til først at installere den personlige kommentar. Åben Boghylden, vælg Crosswire som kilde og kig under Kommentar og engelsk. Når den er installeret, så brug Boghylde-vinduet og højreklik på Personal commentary. Brug enten &apos;Redigér ren tekst&apos;-menuen eller &apos;Redigér HTML&apos;-menuen for at åbne værket i skrivetilstand.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
         <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
         <translation>Du kan vise Strong&apos;s-nummer information i Forstørrelsesglas-vinduet ved at holde musen over et ord i en Bibel som har Strong&apos;s-numre. Du skal have StrongsGreek og StrongsHebrew leksikaerne installeret før at det virker.</translation>
     </message>
@@ -1947,49 +1959,49 @@ genvej</translation>
 <context>
     <name>CAcceleratorSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="128"/>
         <source>Choose action group:</source>
         <translation>Vælg handlingsgruppe:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="130"/>
         <source>Main Window</source>
         <translation>Hovedvindue</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
         <source>All text windows</source>
         <translation>Alle tekstvinduer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="132"/>
         <source>Bible windows</source>
         <translation>Bibelvinduer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
         <source>Commentary windows</source>
         <translation>Kommentarvinduer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="134"/>
         <source>Lexicon windows</source>
         <translation>Leksikonvinduer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
         <source>Book windows</source>
         <translation>Bogvinduer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
         <source>
    &quot;%1&quot; in the &quot;%2&quot; group</source>
         <translation>
 ...&quot;%1&quot; in den &quot;%2&quot; gruppe</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
         <source>Shortcuts</source>
         <translation>Genveje</translation>
     </message>
@@ -1997,103 +2009,95 @@ genvej</translation>
 <context>
     <name>CBibleReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="64"/>
         <source>Next book</source>
         <translation>Næste bog</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="68"/>
         <source>Previous book</source>
         <translation>Forrige bog</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="72"/>
         <source>Next chapter</source>
         <translation>Næste kapitel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="76"/>
         <source>Previous chapter</source>
         <translation>Forrige kapitel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="80"/>
         <source>Next verse</source>
         <translation>Næste vers</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="84"/>
         <source>Previous verse</source>
         <translation>Forrige vers</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="89"/>
         <source>Copy chapter</source>
         <translation>Kopiér kapitel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="92"/>
         <source>Save chapter as plain text</source>
         <translation>Gem kapitel som ren tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="95"/>
         <source>Save chapter as HTML</source>
         <translation>Gem kapitel som HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="98"/>
         <source>Print chapter</source>
         <translation>Udskriv kapitel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="110"/>
         <source>Text of reference</source>
         <translation>Henvisningens tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
         <source>Reference with text</source>
         <translation>Henvisning med tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="253"/>
         <source>Bible window</source>
         <translation>Bibelvindue</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="263"/>
         <source>Copy...</source>
         <translation>Kopiér...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="274"/>
         <source>Save...</source>
         <translation>Gem...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="287"/>
         <source>Print...</source>
         <translation>Udskriv...</translation>
     </message>
     <message>
-        <source>Copy chapter to clipboard ...</source>
-        <translation type="obsolete">Kopiér kapitel til klippebordet ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="371"/>
         <source>Copying</source>
         <translation>Kopierer</translation>
     </message>
     <message>
-        <source>Saving chapter ...</source>
-        <translation type="obsolete">Gemmer kapitel ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="390"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="408"/>
         <source>Saving</source>
         <translation>Gemmer</translation>
     </message>
@@ -2101,7 +2105,7 @@ genvej</translation>
 <context>
     <name>CBookReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
+        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="70"/>
         <source>Toggle tree view</source>
         <translation>Slå træ-visning til/fra</translation>
     </message>
@@ -2109,97 +2113,93 @@ genvej</translation>
 <context>
     <name>CBookmarkIndex</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
         <source>Bookmarks</source>
         <translation>Bogmærker</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="92"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="583"/>
         <source>New folder</source>
         <translation>Ny mappe</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
         <source>Rename folder</source>
         <translation>Omdøb mappe</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
         <source>Delete Items</source>
         <translation>Slet punkter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="704"/>
         <source>Do you really want to delete the selected items and child-items?</source>
         <translation>Vil du virkelig slette dette punkt og dets underpunkter?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="814"/>
         <source>The work to which the bookmark points to is not installed.</source>
         <translation>Værket som bogmærket henviser til, er ikke installeret.</translation>
     </message>
     <message>
-        <source>Change bookmark description...</source>
-        <translation type="obsolete">Ændr bogmærkets beskrivelse...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
         <source>Print bookmarks...</source>
         <translation>Udskriv bogmærker...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="103"/>
         <source>Remove selected items...</source>
         <translation>Fjern valgte elementer...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
         <source>Import to folder...</source>
         <translation>Importér til mappe...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
         <source>Edit bookmark...</source>
         <translation>Redigér bogmærke...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
         <source>Sort folder bookmarks...</source>
         <translation>Sortér bogmærkemapper...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
         <source>Sort all bookmarks...</source>
         <translation>Sortér alle bogmærker...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="100"/>
         <source>Export from folder...</source>
         <translation>Eksportér fra mappe...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="393"/>
         <source>Can drop only bookmarks or one folder</source>
         <translation>Kan kun flytte bogmærker eller én mappe</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="398"/>
         <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
         <translation>Kan ikke flytte mappe ind i sig selv, eller ind i en af dens undermapper</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
         <source>Copy</source>
         <translation>Kopiér</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="406"/>
         <source>Move</source>
         <translation>Flyt</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="467"/>
         <source>Drag references from text views to this view</source>
         <translation>Træk henvisninger fra tekstvisninger til denne visning</translation>
     </message>
@@ -2207,42 +2207,42 @@ genvej</translation>
 <context>
     <name>CCommentaryReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="31"/>
         <source>Next book</source>
         <translation>Næste bog</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="35"/>
         <source>Previous book</source>
         <translation>Forrige bog</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="39"/>
         <source>Next chapter</source>
         <translation>Næste kapitel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="43"/>
         <source>Previous chapter</source>
         <translation>Forrige kapitel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="47"/>
         <source>Next verse</source>
         <translation>Næste vers</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="51"/>
         <source>Previous verse</source>
         <translation>Forrige vers</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="56"/>
         <source>Synchronize</source>
         <translation>Synkronisér</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="59"/>
         <source>Synchronize the displayed entry of this work with the active Bible window</source>
         <translation>Synkronisér det viste afsnit af dette værk med det aktive bibelvindue</translation>
     </message>
@@ -2250,7 +2250,7 @@ genvej</translation>
 <context>
     <name>CConfigurationDialog</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="41"/>
         <source>Configure BibleTime</source>
         <translation>Konfigurér BibleTime</translation>
     </message>
@@ -2258,67 +2258,67 @@ genvej</translation>
 <context>
     <name>CDisplaySettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
         <source>Display templates</source>
         <translation>Visningsstil</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
         <source>Available display styles:</source>
         <translation>Tilgængelige visningsstile:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="113"/>
         <source>Style preview</source>
         <translation>Stil afprøvning</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="131"/>
         <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
         <translation>For således elskede Gud verden, at han gav sin enbårne søn, for at enhver, som tror på ham, ikke skal fortabes, men have evigt liv.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="138"/>
         <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
         <translation>For Gud sendte ikke sin søn til verden for at dømme verden, men for at verden skal frelses ved ham.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="145"/>
         <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
         <translation>Den, der tror på ham, dømmes ikke; den, der ikke tror, er allerede dømt, fordi han ikke har troet på Guds enbårne søns navn.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="155"/>
         <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
         <translation>For enhver, som øver ondt, hader lyset og kommer ikke til lyset, for at hans gerninger ikke skal afsløres.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="160"/>
         <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
         <translation>Men den, der gør sandheden, kommer til lyset, for at det skal blive åbenbaret, at hans gerninger er gjort i Gud.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="106"/>
         <source>Display templates define how text is displayed.</source>
         <translation>Visnings-skabeloner afgør hvordan teksten bliver vist.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="110"/>
         <source>Show the BibleTime logo on startup</source>
         <translation>Vis BibleTimes logo ved opstart</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
         <source>Show startup logo</source>
         <translation>Vis opstarts logo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="150"/>
         <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
         <translation>Dette er dommen, at lyset er kommet til verden, og menneskene elskede mørket frem for lyset, fordi deres gerninger var onde.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="101"/>
         <source>Display</source>
         <translation>Visning</translation>
     </message>
@@ -2331,147 +2331,124 @@ genvej</translation>
 <context>
     <name>CDisplayWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="215"/>
         <source>Back in history</source>
         <translation>Tilbage i historie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="223"/>
         <source>Forward in history</source>
         <translation>Frem i historie</translation>
     </message>
     <message>
-        <source>Zoom in</source>
-        <translation type="obsolete">Zoom ind</translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation type="obsolete">Zoom ud</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="192"/>
         <source>Select all</source>
         <translation>Vælg alle</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="196"/>
         <source>Copy</source>
         <translation>Kopiér</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="200"/>
         <source>Find...</source>
         <translation>Find...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="204"/>
         <source>Change location</source>
         <translation>Ændr lokation</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="209"/>
         <source>Search with works of this window</source>
         <translation>Søg i dette vindues værker</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="393"/>
         <source>Work chooser buttons</source>
         <translation>Værk-vælger knapper</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="403"/>
         <source>Text area header</source>
         <translation>Tekstområde hoved</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="453"/>
         <source>Navigation</source>
         <translation>Navigation</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="459"/>
         <source>Tool</source>
         <translation>Værktøj</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="465"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
 </context>
 <context>
-    <name>CFontChooser</name>
-    <message>
-        <source>Size:</source>
-        <translation type="obsolete">Størrelse:</translation>
-    </message>
-    <message>
-        <source>Font name:</source>
-        <translation type="obsolete">Skrifttype:</translation>
-    </message>
-    <message>
-        <source>Font style:</source>
-        <translation type="obsolete">Typografi:</translation>
-    </message>
-</context>
-<context>
     <name>CHTMLWriteDisplay</name>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
         <source>Bold</source>
         <translation>Fed</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="60"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="67"/>
         <source>Italic</source>
         <translation>Kursiv</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="79"/>
         <source>Underline</source>
         <translation>Understreget</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="84"/>
         <source>Left</source>
         <translation>Venstre</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="94"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="99"/>
         <source>Center</source>
         <translation>Centreret</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="104"/>
         <source>Right</source>
         <translation>Højre</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="231"/>
         <source>Font</source>
         <translation>Skrifttype</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="243"/>
         <source>Font size</source>
         <translation>Skrift størrelse</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="255"/>
         <source>Font color</source>
         <translation>Skrift farve</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="89"/>
         <source>Align left</source>
         <translation>Venstrejusteret</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="109"/>
         <source>Align right</source>
         <translation>Højrejusteret</translation>
     </message>
@@ -2479,60 +2456,22 @@ genvej</translation>
 <context>
     <name>CHTMLWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="122"/>
         <source>Module not writable</source>
         <translation>Modul ikke skrivbart</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="124"/>
         <source>Module is not writable.</source>
         <translation>Modulet er ikke skrivbart.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="125"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Enten må modulet ikke ændres, eller også har du ikke skriverettigherder til det.</translation>
     </message>
 </context>
 <context>
-    <name>CInputDialog</name>
-    <message>
-        <source>Clear</source>
-        <translation type="obsolete">Ryd</translation>
-    </message>
-</context>
-<context>
-    <name>CKeyReferenceWidget</name>
-    <message>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="obsolete">Rul igennem listens afsnit. Tryk knappen og bevæg musen for at forøge eller formindske afsnittet.</translation>
-    </message>
-    <message>
-        <source>Next book</source>
-        <translation type="obsolete">Næste bog</translation>
-    </message>
-    <message>
-        <source>Previous book</source>
-        <translation type="obsolete">Forrige bog</translation>
-    </message>
-    <message>
-        <source>Next chapter</source>
-        <translation type="obsolete">Næste kapitel</translation>
-    </message>
-    <message>
-        <source>Previous chapter</source>
-        <translation type="obsolete">Forrige kapitel</translation>
-    </message>
-    <message>
-        <source>Next verse</source>
-        <translation type="obsolete">Næste vers</translation>
-    </message>
-    <message>
-        <source>Previous verse</source>
-        <translation type="obsolete">Forrige vers</translation>
-    </message>
-</context>
-<context>
     <name>CLanguageSettingsPage</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/clanguagesettings.cpp" line="297"/>
@@ -2543,22 +2482,22 @@ genvej</translation>
 <context>
     <name>CLexiconKeyChooser</name>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Rul igennem listens punkter. Tryk knappen og bevæg musen for at bevæge dig op eller ned blandt punkterne.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
         <source>Entries of the current work</source>
         <translation>Det nuværende værks afsnit</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Næste punkt</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="49"/>
         <source>Previous entry</source>
         <translation>Forrige punkt</translation>
     </message>
@@ -2566,189 +2505,183 @@ genvej</translation>
 <context>
     <name>CLexiconReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Næste afsnit</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="51"/>
         <source>Previous entry</source>
         <translation>Forgående afsnit</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="55"/>
         <source>Copy reference only</source>
         <translation>Kopiér kun henvisning</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
         <source>Save entry as HTML</source>
         <translation>Gem punkt som HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
         <source>Print reference only</source>
         <translation>Udskriv kun henvisning</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
         <source>Strong&apos;s Search</source>
         <translation>Strong&apos;s søgning</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
         <source>Entry with text</source>
         <translation>Afsnit med tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="134"/>
         <source>Entry as plain text</source>
         <translation>Afsnit som ren tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="265"/>
         <source>Lexicon window</source>
         <translation>Leksikon-vindue</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="272"/>
         <source>Copy...</source>
         <translation>Kopiér...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="281"/>
         <source>Save...</source>
         <translation>Gem...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="297"/>
         <source>Print...</source>
         <translation>Udskriv...</translation>
     </message>
     <message>
-        <source>Saving entry ...</source>
-        <translation type="obsolete">Gemmer afsnit ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="340"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="364"/>
         <source>Saving</source>
         <translation>Gemmer</translation>
     </message>
 </context>
 <context>
-    <name>CModuleIndexDialog</name>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Anullér</translation>
-    </message>
-    <message>
-        <source>Creating indices</source>
-        <translation type="obsolete">Opretter indeks</translation>
-    </message>
-    <message>
-        <source>Creating index for work: %1</source>
-        <translation type="obsolete">Opretter indeks for værk: %1</translation>
-    </message>
-    <message>
-        <source>Indexing Is Cancelled</source>
-        <translation type="obsolete">Indeksering er anulleret</translation>
-    </message>
-    <message>
-        <source>Indexing is cancelled because modules are removed.</source>
-        <translation type="obsolete">Indeksering er anulleret fordi moduler er blevet fjernet.</translation>
-    </message>
-</context>
-<context>
     <name>CPlainWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="235"/>
         <source>Sync with active Bible</source>
         <translation>Synkronisér med aktiv bibel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="245"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="249"/>
         <source>Save text</source>
         <translation>Gem tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="254"/>
         <source>Delete current entry</source>
         <translation>Slet nuværende afsnit</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="263"/>
         <source>Restore original text</source>
         <translation>Gendan original tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="163"/>
         <source>Module not writable</source>
         <translation>Modul ikke skrivbart</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="165"/>
         <source>Module is not writable.</source>
         <translation>Modulet er ikke skrivbart.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="166"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Enten må modulet ikke ændres, eller også har du ikke skriverettigherder til det.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="240"/>
         <source>Synchronize (show the same verse) with the active Bible window</source>
         <translation>Synkronisér (vis det samme vers) med det aktive bibelvindue</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="258"/>
         <source>Delete current entry (no undo)</source>
         <translation>Slet nuværende afsnit (kan ikke gøres om)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="267"/>
         <source>Restore original text, new text will be lost</source>
         <translation>Genopret original tekst, ny tekst vil gå tabt</translation>
     </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save Text?</source>
+        <translation type="unfinished">Gem tekst?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <source>Save text before closing?</source>
+        <translation type="unfinished">Gem tekst før nedlukning?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save changed text?</source>
+        <translation type="unfinished">Skal den ændrede tekst gemmes?</translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="232"/>
         <source>Save Search Analysis</source>
         <translation>Gem søgnings-analyse</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation>HTML filer (*.html;*.HTML;*.HTM;*.htm)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="243"/>
         <source>BibleTime Search Analysis</source>
         <translation>BibleTime søgnings-analyse</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation>Søge-tekst:</translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="234"/>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="259"/>
+        <source>Search text:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="263"/>
+        <source>Results by work and book</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="265"/>
         <source>Book</source>
         <translation>Bog</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="293"/>
         <source>Total hits</source>
         <translation>Samlet antal hits</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="303"/>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
         <translation>Lavet med &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</translation>
     </message>
@@ -2756,168 +2689,168 @@ genvej</translation>
 <context>
     <name>CSwordModuleInfo</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="763"/>
         <source>Version</source>
         <translation>Udgave</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="766"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="774"/>
         <source>unknown</source>
         <translation>ukendt</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="771"/>
         <source>Markup</source>
         <translation>Markup</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
         <source>Location</source>
         <translation>Placering</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="782"/>
         <source>Language</source>
         <translation>Sprog</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="787"/>
         <source>Category</source>
         <translation>Kategori</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="792"/>
         <source>LCSH</source>
         <translation>LSCH</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="796"/>
         <source>Writable</source>
         <translation>Skrivbar</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>yes</source>
         <translation>ja</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>no</source>
         <translation>nej</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="801"/>
         <source>Unlock key</source>
         <translation>Nøgle</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="822"/>
         <source>Features</source>
         <translation>Understøtter</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="830"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Advarsel: dette værk indeholder kultisk/ diskutabelt materiale!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="834"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="856"/>
         <source>Distribution license</source>
         <translation>Distributions licens</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="857"/>
         <source>Distribution source</source>
         <translation>Distributions kilde</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="858"/>
         <source>Distribution notes</source>
         <translation>Distributions noter</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="859"/>
         <source>Text source</source>
         <translation>Tekst kilde</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="860"/>
         <source>Copyright notes</source>
         <translation>Copyright noter</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
         <source>Copyright holder</source>
         <translation>Copyright haver</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
         <source>Copyright date</source>
         <translation>Copyright dato</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
         <source>Copyright contact name</source>
         <translation>Copyright kontakt navn</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
         <source>Copyright contact address</source>
         <translation>Copyright kontakt adresse</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
         <source>Copyright contact email</source>
         <translation>Copyright kontakt email</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="956"/>
         <source>Bibles</source>
         <translation>Bibeler</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="958"/>
         <source>Commentaries</source>
         <translation>Kommentarer</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="960"/>
         <source>Books</source>
         <translation>Bøger</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="962"/>
         <source>Cults/Unorthodox</source>
         <translation>Kultisk/uortodoks</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="964"/>
         <source>Maps and Images</source>
         <translation>Kort og billeder</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="966"/>
         <source>Daily Devotionals</source>
         <translation>Andagter</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="968"/>
         <source>Lexicons and Dictionaries</source>
         <translation>Leksika og ordbøger</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="970"/>
         <source>Glossaries</source>
         <translation>Ordforklaringer</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="972"/>
         <source>Unknown</source>
         <translation>Ukendt</translation>
     </message>
@@ -2925,17 +2858,17 @@ genvej</translation>
 <context>
     <name>CSwordSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="43"/>
         <source>Standard works</source>
         <translation>Standardværker</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="44"/>
         <source>Text filters</source>
         <translation>Tekstfiltre</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="41"/>
         <source>Desk</source>
         <translation>Skrivebord</translation>
     </message>
@@ -2948,32 +2881,32 @@ genvej</translation>
 <context>
     <name>CSwordSetupInstallSourcesDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="47"/>
         <source>Caption</source>
         <translation>Overskrift</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="68"/>
         <source>Path</source>
         <translation>Sti</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="91"/>
         <source>Get list...</source>
         <translation>Hent liste...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="160"/>
         <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
 
 Do you want to continue?</source>
@@ -2982,145 +2915,126 @@ Do you want to continue?</source>
 Er du sikker på at du vil fortsætte?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
         <source>Get source list from remote server?</source>
         <translation>Hent kildeliste fra fjern server?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="167"/>
         <source>Cancel</source>
         <translation>Annullér</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="168"/>
         <source>Downloading List</source>
         <translation>Henter liste</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="178"/>
         <source>Connecting...</source>
         <translation>Forbinder...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="197"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="198"/>
         <source>Refreshing...</source>
         <translation>Opdaterer...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="92"/>
         <source>Download a list of sources from CrossWire server and add sources</source>
         <translation>Hent en liste over kilder fra CrossWires server og tilføj kilder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
         <source>Please provide a caption.</source>
         <translation>Vælg en overskrift.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
         <source>A source with this caption already exists. Please provide a different caption.</source>
         <translation>En kilde med dette navn eksisterer allerede. Vælg venligst et andet navn.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
         <source>Please provide a server name.</source>
         <translation>Vælg et servernavn.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
         <source>Please provide a valid, readable path.</source>
         <translation>Vælg en gyldig, læselig sti.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Please provide a path.</source>
         <translation>Vælg en sti.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="39"/>
         <source>New  Installation Source</source>
         <translation>Ny  installations kilde</translation>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>Gem tekst før nedlukning?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>Skal den ændrede tekst gemmes?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>Gem tekst?</translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="178"/>
         <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
         <translation>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Udgave: %3&lt;/p&gt;&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="194"/>
         <source>Abbreviation</source>
         <translation>Forkortelse</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="203"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="290"/>
         <source>Cross references</source>
         <translation>Krydshenvisninger</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="343"/>
         <source>Footnote</source>
         <translation>Fodnote</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="374"/>
         <source>Strongs</source>
         <translation>Strongs</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="451"/>
         <source>Morphology</source>
         <translation>Morfologi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="472"/>
         <source>Word lookup</source>
         <translation>Ord søgning</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="60"/>
         <source>Copy</source>
         <translation>Kopiér</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
         <source>Select all</source>
         <translation>Vælg alle</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="80"/>
         <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
         <translation>&lt;small&gt;Detter er Forstørrelsesglassets visnings-område. Hold musen over links eller andre punkter som indeholder data, og indholdet bliver derefter vist i Forstørrelsesglasset kort efter. Bevæg musen hurtigt ind i Forstørrelsesglasset, eller lås visningen ved at trykke og holde Shift inde imens musen bevæges.&lt;/small&gt;</translation>
     </message>
@@ -3128,28 +3042,28 @@ Er du sikker på at du vil fortsætte?</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="412"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="422"/>
         <source>Indexing aborted</source>
         <translation>Indeksering afbrudt</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="413"/>
         <source>An internal error occurred while building the index: %1</source>
         <translation>En intern fejl opstod under opbygningen af indekset: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="423"/>
         <source>An internal error occurred while building the index.</source>
         <translation>En intern fejl opstod under opbygning af indekset.</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="522"/>
         <source>Search aborted</source>
         <translation>Søgning afbrudt</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="523"/>
         <source>An internal error occurred while executing your search.</source>
         <translation>En intern fejl opstod under afvikling af din søgning.</translation>
     </message>
@@ -3190,7 +3104,7 @@ Er du sikker på at du vil fortsætte?</translation>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="122"/>
         <source>Bibles</source>
         <translation>Bibeler</translation>
     </message>
@@ -3207,740 +3121,740 @@ Er du sikker på at du vil fortsætte?</translation>
         <translation>Bøger</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="390"/>
         <source>Added text</source>
         <translation>Tilføjet Tekst</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="143"/>
         <source>Names of languages</source>
         <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
         <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="148"/>
         <source>Afrikaans</source>
         <extracomment>Language name af</extracomment>
         <translation>Afrikaans</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="151"/>
         <source>Amuzgo, Guerrero</source>
         <extracomment>Language name amu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="153"/>
         <source>English, Old (ca.450-1100)</source>
         <extracomment>Language name ang</extracomment>
         <translation>Oldengelsk (ca. 450-1100)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="155"/>
         <source>Arabic</source>
         <extracomment>Language name ar</extracomment>
         <translation>Arabisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="158"/>
         <source>Azerbaijani</source>
         <extracomment>Language name az</extracomment>
         <translation>Aserbajdsjansk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="160"/>
         <source>Azerbaijani, South</source>
         <extracomment>Language name azb</extracomment>
         <translation>Aserbajdsjansk, Syd</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="165"/>
         <source>Belarusian</source>
         <extracomment>Language name be</extracomment>
         <translation>Hviderussisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="167"/>
         <source>Bulgarian</source>
         <extracomment>Language name bg</extracomment>
         <translation>Bulgarsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="173"/>
         <source>Breton</source>
         <extracomment>Language name br</extracomment>
         <translation>Bretonsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="175"/>
         <source>Bosnian</source>
         <extracomment>Language name bs</extracomment>
         <translation>Bosnisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="177"/>
         <source>Catalan</source>
         <extracomment>Language name ca</extracomment>
         <translation>Catalansk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="180"/>
         <source>Chinantec, Comaltepec</source>
         <extracomment>Language name cco</extracomment>
         <translation>Chinantekisk, Comaltepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="182"/>
         <source>Cebuano</source>
         <extracomment>Language name ceb</extracomment>
         <translation>Cebuano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
         <source>Chamorro</source>
         <extracomment>Language name ch</extracomment>
         <translation>Chamorro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
         <source>Chontal, Highland Oaxaca</source>
         <extracomment>Language name chd</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
         <source>Chinantec, Quiotepec</source>
         <extracomment>Language name chq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="190"/>
         <source>Chinantec, Ozumacu00edn</source>
         <extracomment>Language name chz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="193"/>
         <source>Cakchiquel, Western</source>
         <extracomment>Language name ckw</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="195"/>
         <source>Chinantec, Lalana</source>
         <extracomment>Language name cnl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="197"/>
         <source>Chinantec, Tepetotutla</source>
         <extracomment>Language name cnt</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="199"/>
         <source>Coptic</source>
         <extracomment>Language name cop</extracomment>
         <translation>Koptisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
         <source>Czech</source>
         <extracomment>Language name cs</extracomment>
         <translation>Sweitzisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
         <source>Chinantec, Sochiapan</source>
         <extracomment>Language name cso</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
         <source>Chol, Tila</source>
         <extracomment>Language name cti</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
         <source>Chatino, Western Highland</source>
         <extracomment>Language name ctp</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
         <source>Church Slavic</source>
         <extracomment>Language name cu</extracomment>
         <translation>Kirkelig Slavisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="212"/>
         <source>Welsh</source>
         <extracomment>Language name cy</extracomment>
         <translation>Walisisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
         <source>Danish</source>
         <extracomment>Language name da</extracomment>
         <translation>Dansk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
         <source>German</source>
         <extracomment>Language name de</extracomment>
         <translation>Tysk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
         <source>Duruma</source>
         <extracomment>Language name dug</extracomment>
         <translation>Duruma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="221"/>
         <source>Greek, Modern (1453-)</source>
         <extracomment>Language name el</extracomment>
         <translation>Græsk, Moderne (1453-)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
         <source>English</source>
         <extracomment>Language name en</extracomment>
         <translation>Engelsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="225"/>
         <source>American English</source>
         <extracomment>Language name en_US</extracomment>
         <translation>Amerikansk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="227"/>
         <source>English, Middle (1100-1500)</source>
         <extracomment>Language name enm</extracomment>
         <translation>Engelsk Mellem (1100-1500)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="229"/>
         <source>Esperanto</source>
         <extracomment>Language name eo</extracomment>
         <translation>Esperanto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="231"/>
         <source>Spanish</source>
         <extracomment>Language name es</extracomment>
         <translation>Spansk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
         <source>Estonian</source>
         <extracomment>Language name et</extracomment>
         <translation>Estisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
         <source>Basque</source>
         <extracomment>Language name eu</extracomment>
         <translation>Baskisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
         <source>Persian</source>
         <extracomment>Language name fa</extracomment>
         <translation>Farsi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
         <source>Finnish</source>
         <extracomment>Language name fi</extracomment>
         <translation>Finsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="243"/>
         <source>French</source>
         <extracomment>Language name fr</extracomment>
         <translation>Fransk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="245"/>
         <source>Frisian</source>
         <extracomment>Language name fy</extracomment>
         <translation>Frisisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="247"/>
         <source>Irish</source>
         <extracomment>Language name ga</extracomment>
         <translation>Irsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="249"/>
         <source>Gaelic (Scots)</source>
         <extracomment>Language name gd</extracomment>
         <translation>Gaelisk (Skotter)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="251"/>
         <source>Geez</source>
         <extracomment>Language name gez</extracomment>
         <translation>Geez</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
         <source>Gothic</source>
         <extracomment>Language name got</extracomment>
         <translation>Gotisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
         <source>Manx</source>
         <extracomment>Language name gv</extracomment>
         <translation>Manx</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
         <source>Greek, Ancient (to 1453)</source>
         <extracomment>Language name grc</extracomment>
         <translation>Græsk, Oldtid (til 1453)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="262"/>
         <source>Hebrew</source>
         <extracomment>Language name he</extracomment>
         <translation>Hebraisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
         <source>Hausa</source>
         <extracomment>Language name hau</extracomment>
         <translation>Hausa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
         <source>Hawaiian</source>
         <extracomment>Language name haw</extracomment>
         <translation>Hawaiiansk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
         <source>Hindi</source>
         <extracomment>Language name hi</extracomment>
         <translation>Hindi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="271"/>
         <source>Croatian</source>
         <extracomment>Language name hr</extracomment>
         <translation>Kroatisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="275"/>
         <source>Hungarian</source>
         <extracomment>Language name hu</extracomment>
         <translation>Ungarsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
         <source>Huave, San Mateo Del Mar</source>
         <extracomment>Language name huv</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
         <source>Armenian</source>
         <extracomment>Language name hy</extracomment>
         <translation>Armensk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
         <source>Indonesian</source>
         <extracomment>Language name id</extracomment>
         <translation>Indonesisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
         <source>Icelandic</source>
         <extracomment>Language name is</extracomment>
         <translation>Islandsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
         <source>Italian</source>
         <extracomment>Language name it</extracomment>
         <translation>Italiensk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="291"/>
         <source>Itzu00e1</source>
         <extracomment>Language name itz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="293"/>
         <source>Ixil, San Juan Cotzal</source>
         <extracomment>Language name ixl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
         <source>Japanese</source>
         <extracomment>Language name ja</extracomment>
         <translation>Japansk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
         <source>Jacalteco, Eastern</source>
         <extracomment>Language name jac</extracomment>
         <translation>Jakaltenansk, Østligt</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
         <source>Javanese, Caribbean</source>
         <extracomment>Language name jvn</extracomment>
         <translation>Javanesisk, Caribisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="302"/>
         <source>Georgian</source>
         <extracomment>Language name ka</extracomment>
         <translation>Georgisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
         <source>Korean</source>
         <extracomment>Language name ko</extracomment>
         <translation>Koreansk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="315"/>
         <source>Kurdish</source>
         <extracomment>Language name ku</extracomment>
         <translation>Kurdisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
         <source>Kirghiz</source>
         <extracomment>Language name ky</extracomment>
         <translation>Kirghisisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
         <source>Latin</source>
         <extracomment>Language name la</extracomment>
         <translation>Latin</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
         <source>Lacandon</source>
         <extracomment>Language name lac</extracomment>
         <translation>Lacandon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
         <source>Lithuanian</source>
         <extracomment>Language name lt</extracomment>
         <translation>Lithaunsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="332"/>
         <source>Latvian</source>
         <extracomment>Language name lv</extracomment>
         <translation>Lettisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="334"/>
         <source>Malagasy</source>
         <extracomment>Language name mg</extracomment>
         <translation>Malagasy</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="337"/>
         <source>Maori</source>
         <extracomment>Language name mi</extracomment>
         <translation>Maori</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="339"/>
         <source>Mixe, Isthmus</source>
         <extracomment>Language name mir</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="341"/>
         <source>Mixtec, Coatzospan</source>
         <extracomment>Language name miz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="343"/>
         <source>Macedonian</source>
         <extracomment>Language name mk</extracomment>
         <translation>Makedonsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="345"/>
         <source>Mixtec, Silacayoapan</source>
         <extracomment>Language name mks</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="350"/>
         <source>More</source>
         <extracomment>Language name mos</extracomment>
         <translation>Mere</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
         <source>Malay</source>
         <extracomment>Language name ms</extracomment>
         <translation>Malayalam</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
         <source>Maltese</source>
         <extracomment>Language name mt</extracomment>
         <translation>Maltesisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="375"/>
         <source>Low German; Low Saxon</source>
         <extracomment>Language name nds</extracomment>
         <translation>Lav Germansk, Lav Saxisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="377"/>
         <source>Nepali</source>
         <extracomment>Language name ne</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="379"/>
         <source>Nahuatl, Guerrero</source>
         <extracomment>Language name ngu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
         <source>Nahuatl, Northern Oaxaca</source>
         <extracomment>Language name nhy</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
         <source>Dutch</source>
         <extracomment>Language name nl</extracomment>
         <translation>Hollandsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
         <source>Norwegian Nynorsk</source>
         <extracomment>Language name nn</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
         <source>Norwegian</source>
         <extracomment>Language name no</extracomment>
         <translation>Norsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="397"/>
         <source>Otomi, Queru00e9taro</source>
         <extracomment>Language name otq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
         <source>Papiamento</source>
         <extracomment>Language name pap</extracomment>
         <translation>Papiamento</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
         <source>Polish</source>
         <extracomment>Language name pl</extracomment>
         <translation>Polsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="411"/>
         <source>Persian (Dari)</source>
         <extracomment>Language name prs</extracomment>
         <translation>Persisk (Dari)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="415"/>
         <source>Portuguese</source>
         <extracomment>Language name pt</extracomment>
         <translation>Portugisisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
         <source>Brasilian Portuguese</source>
         <extracomment>Language name pt_BR</extracomment>
         <translation>Brasiliansk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
         <source>Quichu00e9, West Central</source>
         <extracomment>Language name qut</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
         <source>Romanian</source>
         <extracomment>Language name ro</extracomment>
         <translation>Romænsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
         <source>Russian</source>
         <extracomment>Language name ru</extracomment>
         <translation>Russisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="431"/>
         <source>Scots</source>
         <extracomment>Language name sco</extracomment>
         <translation>Skotsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="437"/>
         <source>Slovak</source>
         <extracomment>Language name sk</extracomment>
         <translation>Slovakisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="439"/>
         <source>Slovenian</source>
         <extracomment>Language name sl</extracomment>
         <translation>Slovensk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="443"/>
         <source>Somali</source>
         <extracomment>Language name so</extracomment>
         <translation>Somalsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
         <source>Albanian</source>
         <extracomment>Language name sq</extracomment>
         <translation>Albansk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="453"/>
         <source>Swedish</source>
         <extracomment>Language name sv</extracomment>
         <translation>Svensk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="455"/>
         <source>Swahili</source>
         <extracomment>Language name sw</extracomment>
         <translation>Swahili</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="457"/>
         <source>Syriac</source>
         <extracomment>Language name syr</extracomment>
         <translation>Syrisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="459"/>
         <source>Tamil</source>
         <extracomment>Language name ta</extracomment>
         <translation>Tamilsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="463"/>
         <source>Thai</source>
         <extracomment>Language name th</extracomment>
         <translation>Taiwanesisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
         <source>Tagalog</source>
         <extracomment>Language name tl</extracomment>
         <translation>Tagalog</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="470"/>
         <source>Tswana</source>
         <extracomment>Language name tn</extracomment>
         <translation>Tswana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="472"/>
         <source>Turkish</source>
         <extracomment>Language name tr</extracomment>
         <translation>Tyrkisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
         <source>Tektiteko</source>
         <extracomment>Language name ttc</extracomment>
         <translation>Tektiteko</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="479"/>
         <source>Tahitian</source>
         <extracomment>Language name ty</extracomment>
         <translation>Tahitisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="481"/>
         <source>Tzotzil, Zinacantu00e1n</source>
         <extracomment>Language name tzz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
         <source>Ukrainian</source>
         <extracomment>Language name uk</extracomment>
         <translation>Ukrainsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
         <source>Orya</source>
         <extracomment>Language name ury</extracomment>
         <translation>Orya</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
         <source>Uspanteco</source>
         <extracomment>Language name usp</extracomment>
         <translation>Uspanteco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="492"/>
         <source>Vietnamese</source>
         <extracomment>Language name vi</extracomment>
         <translation>Vietnamesisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="496"/>
         <source>Xhosa</source>
         <extracomment>Language name xh</extracomment>
         <translation>Xhosa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="163"/>
         <source>Bavarian</source>
         <extracomment>Language name bar</extracomment>
         <translation>Bavariansk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="326"/>
         <source>Lombard</source>
         <extracomment>Language name lmo</extracomment>
         <translation>Lombard</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="403"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
         <source>Uma</source>
         <extracomment>Language name ppk
 ----------
@@ -3948,457 +3862,421 @@ Language name ppk</extracomment>
         <translation>Uma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="448"/>
         <source>Sranan</source>
         <extracomment>Language name srn</extracomment>
         <translation>Sranan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
         <source>Yiddish</source>
         <extracomment>Language name yi</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
         <source>Zapotec, San Juan Guelavu00eda</source>
         <extracomment>Language name zab</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="507"/>
         <source>Zapotec, Mitla</source>
         <extracomment>Language name zaw</extracomment>
         <translation>Zapotekisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="509"/>
         <source>Chinese</source>
         <extracomment>Language name zh</extracomment>
         <translation>Kinesisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="511"/>
         <source>Zapotec, Amatlu00e1n</source>
         <extracomment>Language name zpo</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
         <source>Zapotec, Zoogocho</source>
         <extracomment>Language name zpq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="515"/>
         <source>Zapotec, Yalu00e1lag</source>
         <extracomment>Language name zpu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
         <source>Zapotec, Chichicapan</source>
         <extracomment>Language name zpv</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
         <source>Zapotec, Southern Rincon</source>
         <extracomment>Language name zsr</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
         <source>Zapotec, Quioquitani-Quieru00ed</source>
         <extracomment>Language name ztq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
         <source>Zapotec, Yatee</source>
         <extracomment>Language name zty</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="525"/>
         <source>Zulu</source>
         <extracomment>Language name zu</extracomment>
         <translation>Zulu</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="314"/>
         <source>Footnotes</source>
         <translation>Fodnoter</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="316"/>
         <source>Strong&apos;s numbers</source>
         <translation>Strong&apos;s numre</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="318"/>
         <source>Headings</source>
         <translation>Overskrifter</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="320"/>
         <source>Morphological tags</source>
         <translation>Morfologiske mærker</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="322"/>
         <source>Lemmas</source>
         <translation>Lemmata</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="324"/>
         <source>Hebrew vowel points</source>
         <translation>Hebraiske vokal tegn</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="326"/>
         <source>Hebrew cantillation marks</source>
         <translation>Hebræiske Kantilations-mærker</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="328"/>
         <source>Greek accents</source>
         <translation>Græske accenter</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="330"/>
         <source>Red letter words</source>
         <translation>Jesu ord fremhævet</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="332"/>
         <source>Textual variants</source>
         <translation>Teksturale varianter</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="334"/>
         <source>Scripture cross-references</source>
         <translation>Krydsreferencer</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="336"/>
         <source>Morph segmentation</source>
         <translation>Morf-segmentering</translation>
     </message>
     <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation>Eksport</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
         <source>Local</source>
         <translation>Lokal</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>Online</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Gamle testamente</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Moses/Pentateuch/Torah</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>Historie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Profeter</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>Nye Testamente</translation>
+        <source>Remote FTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Evangelier</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="32"/>
+        <source>Remote SFTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>Breve</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="33"/>
+        <source>Remote HTTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Paulus&apos; Breve</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="34"/>
+        <source>Remote HTTPS</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
         <source>HTML files</source>
         <translation>HTML filer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="438"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>All files</source>
         <translation>Alle filer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>Text files</source>
         <translation>Tekst filer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="444"/>
         <source>Save file</source>
         <translation>Gem fil</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="130"/>
         <source>Save document ...</source>
         <translation>Gem dokument ...</translation>
     </message>
     <message>
-        <source>Print keys</source>
-        <translation type="obsolete">Udskriv nøgler</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
         <source>BibleTime bookmark files</source>
         <translation>BibleTime bogmærke filer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="127"/>
         <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
         <source>unknown</source>
         <translation>ukendt</translation>
     </message>
     <message>
-        <source>Change description ...</source>
-        <translation type="obsolete">Ret beskrivelse ...</translation>
-    </message>
-    <message>
-        <source>Enter a new description for the chosen bookmark.</source>
-        <translation type="obsolete">Skriv en beskrivelse til det valgte bogmærke.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="60"/>
         <source>New folder</source>
         <translation>Ny mappe</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
+        <location filename="../../src/util/tool.cpp" line="48"/>
         <source>The file already exists.</source>
         <translation>Filen eksisterer allerede.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
+        <location filename="../../src/util/tool.cpp" line="49"/>
         <source>Do you want to overwrite it?</source>
         <translation>Vil du overskrive den?</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
+        <location filename="../../src/util/tool.cpp" line="69"/>
+        <location filename="../../src/util/tool.cpp" line="75"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>Filen kunne ikke gemmes.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
+        <location filename="../../src/util/tool.cpp" line="78"/>
         <source>Please check permissions etc.</source>
         <translation>Tjek fil-tilladelser osv.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
+        <location filename="../../src/util/tool.cpp" line="197"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Advarsel: dette værk indeholder kult/ diskutabelt materiale!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
+        <location filename="../../src/util/tool.cpp" line="218"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <source>Settings Migration</source>
-        <translation type="obsolete">Indstillings overførsel</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
+        <location filename="../../src/util/tool.cpp" line="207"/>
         <source>Encrypted - needs unlock key</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
+        <location filename="../../src/util/tool.cpp" line="231"/>
         <source>Double click for more information</source>
         <translation>Dobbelt-klik for mere information</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
+        <location filename="../../src/util/tool.cpp" line="213"/>
         <source>Updated version available!</source>
         <translation>Opdateret version tilgængelig!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
+        <location filename="../../src/util/tool.cpp" line="71"/>
+        <source>Error while writing to file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="72"/>
+        <source>Please check that enough disk space is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="77"/>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="226"/>
         <source>Installed version</source>
         <translation>Indstalleret version</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="273"/>
         <source>Haitian Creole</source>
         <extracomment>Language name ht</extracomment>
         <translation>Haitisk Kreolsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
         <source>Kekchu00ed</source>
         <comment>kek</comment>
         <extracomment>Language name kek</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="357"/>
         <source>(Multiple languages)</source>
         <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="359"/>
         <source>Mam, Central</source>
         <extracomment>Language name mvc</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
         <source>Mam, Todos Santos Cuchumatu00e1n</source>
         <extracomment>Language name mvj</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="363"/>
         <source>Mixe, Juquila</source>
         <extracomment>Language name mxq</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="365"/>
         <source>Mixtec, Jamiltepec</source>
         <extracomment>Language name mxt</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="367"/>
         <source>Burmese</source>
         <extracomment>Language name my</extracomment>
         <translation>Burmesisk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="370"/>
         <source>Norwegian Bokmu00e5l</source>
         <extracomment>Language name nb</extracomment>
         <translation>Norsk Bokmål</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="372"/>
         <source>Nahuatl, Michoacu00e1n</source>
         <extracomment>Language name ncl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
         <source>Potawatomi</source>
         <extracomment>Language name pot</extracomment>
         <translation>Potawatomi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="468"/>
         <source>Klingon</source>
         <extracomment>Language name tlh</extracomment>
         <translation>Klingon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="498"/>
         <source>Mixtec, Diuxi-Tilantongo</source>
         <extracomment>Language name xtd</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
         <source>Yoryba</source>
         <extracomment>Language name yo</extracomment>
         <translation>Yoruba</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="407"/>
         <source>Verb tense changed</source>
         <translation>Verbets tid ændredes</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>Can&apos;t write file</source>
         <translation>Kan ikke skrive fil</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>The Sword config file can&apos;t be written!</source>
         <translation>Swords konfigurationsfil kan ikke skrives!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="39"/>
         <source>Export Bookmarks</source>
         <translation>Eksportér bogmærker</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="50"/>
         <source>Import bookmarks</source>
         <translation>Importer bogmærker</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
+        <location filename="../../src/util/tool.cpp" line="46"/>
         <source>Overwrite File?</source>
         <translation>Overskriv fil?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="276"/>
         <source>Parsing Strong&apos;s Numbers</source>
         <translation>Analyserer Strong&apos;s-numre</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="154"/>
         <source>This shortcut conflicts with the shortcut for the following actions:</source>
         <translation>Denne genvej er i konflikt med genvejen for følgende handlinger:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
         <source>Do you want to clear the conflicting shortcuts and continue?</source>
         <translation>Ønsker du at fjerne den genvej der er konflikt med, og fortsætte?</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="23"/>
         <source>Indexed works</source>
         <translation>Indekserede værker</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="24"/>
         <source>Unindexed works</source>
         <translation>Ikke-indekserede værker</translation>
     </message>
@@ -4443,17 +4321,17 @@ Language name ppk</extracomment>
         <translation>Fejl: Forkert kommandolinje-parameter: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="57"/>
         <source>CSS base template not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="74"/>
         <source>Default template &quot;%1&quot; not found!</source>
         <translation>Standard-skabelon &quot;%1&quot; ikke fundet!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="113"/>
         <source>Replace</source>
         <translation>Erstat</translation>
     </message>
@@ -4461,91 +4339,91 @@ Language name ppk</extracomment>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="58"/>
         <source>OK</source>
         <comment>Dialog Button</comment>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="59"/>
         <source>Open</source>
         <comment>Dialog Button</comment>
         <translation>Ã…ben</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="60"/>
         <source>Save</source>
         <comment>Dialog Button</comment>
         <translation>Gem</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="61"/>
         <source>Cancel</source>
         <comment>Dialog Button</comment>
         <translation>Anullér</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="62"/>
         <source>Close</source>
         <comment>Dialog Button</comment>
         <translation>Luk</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="63"/>
         <source>Discard</source>
         <comment>Dialog Button</comment>
         <translation>Kassér</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="64"/>
         <source>Apply</source>
         <comment>Dialog Button</comment>
         <translation>Anvend</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="65"/>
         <source>Reset</source>
         <comment>Dialog Button</comment>
         <translation>Nulstil</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="66"/>
         <source>Restore defaults</source>
         <comment>Dialog Button</comment>
         <translation>Genopret standard-værdier</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="67"/>
         <source>Help</source>
         <comment>Dialog Button</comment>
         <translation>Hjælp</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="68"/>
         <source>Save All</source>
         <comment>Dialog Button</comment>
         <translation>Gem alle</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="69"/>
         <source>Yes</source>
         <comment>Dialog Button</comment>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="70"/>
         <source>Yes to all</source>
         <comment>Dialog Button</comment>
         <translation>Ja til alle</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="71"/>
         <source>No</source>
         <comment>Dialog Button</comment>
         <translation>Nej</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="72"/>
         <source>No to all</source>
         <comment>Dialog Button</comment>
         <translation>Nej til alle</translation>
@@ -4554,102 +4432,102 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchOptionsArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="97"/>
         <source>Search for:</source>
         <translation>Søg efter:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="104"/>
         <source>&amp;Search</source>
         <translation>&amp;Søg</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="106"/>
         <source>Start to search the text in the chosen works</source>
         <translation>Start søgningen af teksten i de følgende værker</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="109"/>
         <source>Ch&amp;oose...</source>
         <translation>V&amp;ælg...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="111"/>
         <source>Choose works for the search</source>
         <translation>Vælg værker til søgningen</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="114"/>
         <source>S&amp;etup...</source>
         <translation>&amp;Opsætning...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="133"/>
         <source>All of the words (AND is added between the words)</source>
         <translation>Alle ordene (OG bliver tilføjet mellem ordene)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="137"/>
         <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
         <translation> (&lt;a href=&apos;syntax_help&apos;&gt;fuld syntaks&lt;/a&gt;)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="148"/>
         <source>Scope:</source>
         <translation>Omfang:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="169"/>
         <source>The text you want to search for</source>
         <translation>Teksten du vil søge efter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="173"/>
         <source>Works:</source>
         <translation>Værker:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="346"/>
         <source>No search scope</source>
         <translation>Intet søge omfang</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="128"/>
         <source>All words</source>
         <translation>Alle ord</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="116"/>
         <source>Configure predefined scopes for search</source>
         <translation>Konfigurer de foruddefinerede søgningsomfang</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="130"/>
         <source>Some words</source>
         <translation>Nogle ord</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
         <source>Free</source>
         <translation>Fri</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
         <source>Some of the words (OR is added between the words)</source>
         <translation>Nogle af ordene (OR bliver tilføjet mellem ordene)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
         <source>Full lucene syntax</source>
         <translation>Fuld lucene syntaks</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
         <source>Click the link to get help for search syntax</source>
         <translation>Tryk på linket for at få hjælp med søge syntaks</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="159"/>
         <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
         <translation>Vælg omfanget (bøger/kapitler/vers der skal søges i). &lt;br /&gt;Kan bruges med Bibler og kommentarer.</translation>
     </message>
@@ -4657,17 +4535,17 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchResultArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="85"/>
         <source>Text of the selected search result item</source>
         <translation>Teksten fra det valgte søgeresultat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="88"/>
         <source>Select all</source>
         <translation>Vælg alle</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="92"/>
         <source>Copy</source>
         <translation>Kopiér</translation>
     </message>
@@ -4675,242 +4553,242 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchSyntaxHelpDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="47"/>
         <source>Search Syntax Help</source>
         <translation>Søge-syntaks hjælp</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="94"/>
         <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
         <translation>Denne hjælp er hovedsageligt for &apos;Fuld-syntaks&apos;-valgmuligheden. &apos;Alle ord&apos; og&apos;Nogle ord&apos;-valgmulighederne har mere begrænsede syntakser;&lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; og &lt;a href=&apos;#fields&apos;&gt;tekst felter&lt;/a&gt; er understøttede for dem. Nogle andre syntaksmuligheder kan give mærkelige eller forkerte resultater med Alle ord/Nogle ord.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
         <source>Which words to find</source>
         <translation>Hvilke ord der skal søges efter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="101"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
         <source>Grouping and order</source>
         <translation>Gruppering og rækkefølge</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="103"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
         <source>Wildcards (partial words)</source>
         <translation>Wildcards (dele af ord)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
         <source>Text fields (different parts of text)</source>
         <translation>Tekst felter (forskellige dele af tekst)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="208"/>
         <source>Other syntax features</source>
         <translation>Andre syntaks egenskaber</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
         <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
         <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
         <translation>Søgetermerne er adskilt med mellemrum. &lt;strong&gt;AND&lt;/strong&gt; (alle ord), &lt;strong&gt;OR&lt;/strong&gt; (nogle ord) og &lt;strong&gt;NOT&lt;/strong&gt; (ikke det følgende ord) kan tilføjes mellem ordene. Hvis ingen bliver tilføjet eksplicit bruges OR automatisk. &apos;&lt;strong&gt;+&lt;/strong&gt;ord&apos; betyder at ordet skal være i resultaterne, &apos;&lt;strong&gt;-&lt;/strong&gt;ord&apos; betyder at det ikke skal være blandt resultaterne.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="119"/>
         <source>jesus AND god</source>
         <comment>Do not translate &quot;AND&quot;.</comment>
         <translation>jesus AND gud</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="121"/>
         <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
         <translation>Finder vers med både &apos;Jesus&apos; og &apos;Gud&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="123"/>
         <source>jesus OR god</source>
         <comment>Do not translate &quot;OR&quot;.</comment>
         <translation>jesus OR gud</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="125"/>
         <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
         <translation>Finder vers med &apos;Jesus&apos; eller &apos;Gud&apos; eller begge</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="127"/>
         <source>jesus NOT god</source>
         <comment>Do not translate &quot;NOT&quot;.</comment>
         <translation>jesus NOT gud</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="133"/>
         <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
         <translation>Finder vers med &apos;Jesus&apos; men uden &apos;Gud&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="131"/>
         <source>+jesus -god</source>
         <translation>+jesus -gud</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
         <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
         <translation>Ord kan gruppered med &lt;strong&gt;parenteser&lt;/strong&gt;. Rækkefølgen af ord kan defineres med &lt;strong&gt;anførselstegn&lt;/strong&gt;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
         <source>(a AND b) OR c</source>
         <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
         <translation>(a AND b) OR c</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
         <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
         <translation>Finder vers med &apos;a&apos; og &apos;b&apos;, og vers med &apos;c&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="145"/>
         <source>&quot;says lord&quot;</source>
         <translation>&quot;siger herre&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="149"/>
         <source>&quot;says the lord&quot;</source>
         <translation>&quot;siger herren&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="151"/>
         <source>Finds all verses with &apos;says the LORD&apos;</source>
         <translation>Finder alle vers med &apos;siger Herren&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
         <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
         <translation>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matcher alle sammenhænge af 0 eller flere tegn, mens &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matcher ethvert enkelt tegn. Et wildcard kan ikke bruges i begyndelsen af et ord.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="160"/>
         <source>a*</source>
         <translation>a*</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="162"/>
         <source>All words beginning with &apos;a&apos;</source>
         <translation>Alle ord som begynder med &apos;a&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="164"/>
         <source>a*a</source>
         <translation>a*a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="166"/>
         <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
         <translation>&apos;Asa&apos;, &apos;aroma&apos;, &apos;abba&apos; osv.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="168"/>
         <source>a?</source>
         <translation>a?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="170"/>
         <source>&apos;at&apos; and &apos;an&apos;</source>
         <translation>&apos;at&apos;, &apos;af&apos; og &apos;al&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="172"/>
         <source>a??a</source>
         <translation>a??a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="174"/>
         <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
         <translation>&apos;abba&apos;, &apos;alfa&apos;, &apos;Anna&apos; osv.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
         <source>Available text fields:</source>
         <translation>Tilgængelige tekstfelter:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="181"/>
         <source>Searches headings</source>
         <translation>Søger i overskrifter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="183"/>
         <source>Searches footnotes</source>
         <translation>Søger i fodnoter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="185"/>
         <source>Searches Strong&apos;s numbers</source>
         <translation>Søger i Strong numre</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="187"/>
         <source>Searches morphology codes</source>
         <translation>Søger i morfologiske koder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="189"/>
         <source>Examples:</source>
         <translation>Eksempler:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="191"/>
         <source>heading:Jesus</source>
         <comment>Do not translate &quot;heading:&quot;.</comment>
         <translation>heading:Jesus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="193"/>
         <source>Finds headings with &apos;Jesus&apos;</source>
         <translation>Finder overskrifter med &apos;Jesus&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="195"/>
         <source>footnote:Jesus AND footnote:said</source>
         <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
         <translation>footnote:Jesus AND footnote:sagde</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
         <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
         <translation>Finder fodnoter med &apos;Jesus&apos; og &apos;sagde&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
         <source>strong:G846</source>
         <comment>Do not translate &quot;strong:&quot;.</comment>
         <translation>strong:G846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="202"/>
         <source>Finds verses with Strong&apos;s Greek number 846</source>
         <translation>Finder vers med Strong&apos;s Greek nummer 846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="204"/>
         <source>morph:&quot;N-NSF&quot;</source>
         <comment>Do not translate &quot;morph:&quot;.</comment>
         <translation>morph:&quot;N-NSF&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="206"/>
         <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
         <translation>Finder vers med den morfologiske kode &apos;N-NSF&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="210"/>
         <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
         <translation>BibleTime bruger CLucene søgemaskinen. Du kan læse mere på &lt;a href=&apos;%1&apos;&gt;lucene syntaks hjemmesiden&lt;/a&gt; (i ekstern browser).</translation>
     </message>
@@ -4956,31 +4834,19 @@ Language name ppk</extracomment>
         <translation>Udskriv...</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Kopiér søgeresultat...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="231"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="241"/>
         <source>Copying search result</source>
         <translation>Kopierer søgeresultat</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Gem søgeresultat...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="250"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="259"/>
         <source>Saving search result</source>
         <translation>Gemmer søgeresultat</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Udskriv søgeresultat...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="268"/>
         <source>Printing search result</source>
         <translation>Udskriver søgeresultat</translation>
     </message>
@@ -5028,14 +4894,6 @@ Language name ppk</extracomment>
         <translation>Nyt virkefelt</translation>
     </message>
     <message>
-        <source>&lt;invalid name of search range&gt;</source>
-        <translation type="obsolete">&lt;fejlagtigt navn på søgnings virkefelt&gt;</translation>
-    </message>
-    <message>
-        <source>Select a scope from the list to edit the search ranges</source>
-        <translation type="obsolete">Vælg et omfang fra listen for at redigere søgningens virkefelt</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="140"/>
         <source>&amp;Add new scope</source>
         <translation>&amp;Tilføj nyt omfang</translation>
@@ -5061,10 +4919,6 @@ Language name ppk</extracomment>
         <translation>Ændr navnet på det valgte søge omfang</translation>
     </message>
     <message>
-        <source>Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="obsolete">Vælg et andet virkefelt for det valgte søge omfang. Kig på de allerede definerede søge omfang for at få en idé om hvordan virkefelterne konstrueres.</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="158"/>
         <source>The search ranges which will be used for the search, parsed to the canonical form</source>
         <translation>Søge-virkefelterne der vil blive brugt i søgningen, udtrykt på den vedtagne måde</translation>
@@ -5078,48 +4932,42 @@ Language name ppk</extracomment>
 <context>
     <name>Search::CSearchDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="130"/>
         <source>Missing indices</source>
         <translation>Manglende indekser</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="87"/>
         <source>Search</source>
         <translation>Søg</translation>
     </message>
     <message>
-        <source>One or more works need indexing before they can be searched.
-This could take a long time. Proceed with indexing?</source>
-        <translation type="obsolete">Et eller flere værker skal indekseres før de kan blive søgt i.
-Dette kan tage lang tid. Fortsæt med indekserering?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="131"/>
         <source>The following modules need to be indexed before they can be searched in:</source>
         <translation>De følgende moduler skal indekseres før at der er muligt at søge i dem:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="132"/>
         <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
         <translation>Indekseringen kan tage lang tid. Tryk &quot;Ja&quot; for at indeksere modulerne og begynde søgningen, eller &quot;Nej&quot; for at annulere søgningen.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="236"/>
         <source>Drag any verse reference onto an open Bible window</source>
         <translation>Du kan trække enhver vers-reference hen på et åbent Bibel-vindue</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="241"/>
         <source>&amp;Analyze results...</source>
         <translation>&amp;Analysér resultater...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="242"/>
         <source>Show a graphical analysis of the search result</source>
         <translation>Vis en grafisk analyse af søgeresultatet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="248"/>
         <source>&amp;Close</source>
         <translation>&amp;Luk</translation>
     </message>
@@ -5160,31 +5008,19 @@ Dette kan tage lang tid. Fortsæt med indekserering?</translation>
         <translation>Udskriv...</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Udskriv søge-resultat...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="164"/>
         <source>Printing search result</source>
         <translation>Udskriver søge-resultat</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Gem søge-resultat...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="192"/>
         <source>Saving search result</source>
         <translation>Gemmer søge-resultat</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Kopiér søge-resultat...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="210"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="228"/>
         <source>Copying search result</source>
         <translation>Kopierer søge-resultat</translation>
     </message>
@@ -5197,91 +5033,6 @@ Dette kan tage lang tid. Fortsæt med indekserering?</translation>
 <context>
     <name>StandardWorksTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation>Standard værker bliver benyttet når intet bestemt værk er angivet, for eksempel når et link til en Bibel eller et leksikon bliver åbnet.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>Bibel:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>Standard-Bibelen der bliver anvendt når der trykkes på et link til en Bibel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>Kommentar:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>Standard-kommentaren der bliver anvendt når der trykkes på et link til en kommentar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation>Leksikon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>Standard-leksikonet der bliver anvendt når der trykkes på et link til et leksikon</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>Daglig andagt:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>Standard-andagten der bliver anvendt når der trykkes på et hyperlink til en andagt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>Hebraisk Strong&apos;s-leksikon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>Det hebraiske standard-leksikon der bliver anvendt når der trykkes på et link til et hebraisk leksikon</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>Græsk Strong&apos;s-leksikon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>Det græske standard-leksikon der bliver anvendt når der trykkes på et link til et græsk leksikon</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>Hebraisk morfologisk leksikon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>Det morfologiske standard-leksikon for hebraiske tekster der bliver anvendt når der trykkes på et link til et morfologisk mærke i en hebraisk tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation>Græsk morfologisk leksikon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>Det morfologiske standard-leksikon for græske tekster der bliver anvendt når der trykkes på et link til et morfologisk mærke i en græsk tekst</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="62"/>
         <source></source>
         <translation></translation>
@@ -5290,112 +5041,97 @@ Dette kan tage lang tid. Fortsæt med indekserering?</translation>
 <context>
     <name>TextFiltersTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation type="unfinished">Indsæt linjeskift efter hvert vers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">Vis vers-numre</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation type="unfinished">Vis afsnits overskrifter</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">Vis krydsreferencer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">Vis græske accenter</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Vis hebraiske vokal mærker</translation>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
+        <source></source>
+        <translation></translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallProgress</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Vis hebraiske kantilations-mærker</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="81"/>
+        <source>Failed</source>
+        <translation type="unfinished">Fejlede</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">Vis morf-segmentering</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="84"/>
+        <source>Completed</source>
+        <translation type="unfinished">Færdig</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation type="unfinished">Brug teksturale varianter</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="90"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">Anulleret</translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallSources</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="unfinished">Filtre kontrollerer udeseendet af tekst. Her kan du specificere standard-indstillinger for alle filtrene. Du kan overskrive disse indstillinger i hvert visningsvindue.</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installsources.cpp" line="63"/>
+        <source>Failed to refresh source %1</source>
+        <translation type="unfinished">Kunne ikke genindlæse kilde %1</translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source></source>
-        <translation></translation>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="59"/>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="62"/>
+        <source>The text you want to search for</source>
+        <translation type="unfinished">Teksten du vil søge efter</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation>Find tekst</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="135"/>
+        <source>New Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation>Teksten du vil søge efter</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="136"/>
+        <source>View Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation>Søg med forskel på små/store bogstaver</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="137"/>
+        <source>Text Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation>Forskel på små/store &amp;bogstaver</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="138"/>
+        <source>User Interface Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation>Find tekstens forrige position</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="141"/>
+        <source>Bookshelf Manager</source>
+        <translation type="unfinished">Boghylden</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation>&amp;Forrige</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="187"/>
+        <source>Single</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation>Find tekstens næste position</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="188"/>
+        <source>Tabbed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation>&amp;Næste</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="189"/>
+        <source>Auto-tile</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation>Luk dialogen</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="190"/>
+        <source>Auto-tile horizontally</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Luk</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="191"/>
+        <source>Auto-tile vertically</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/messages/bibletime_ui_de.ts b/i18n/messages/bibletime_ui_de.ts
index d2c58a3..e180afd 100644
--- a/i18n/messages/bibletime_ui_de.ts
+++ b/i18n/messages/bibletime_ui_de.ts
@@ -6,7 +6,7 @@
     <message>
         <source></source>
         <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
 This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
@@ -53,14 +53,6 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>&amp;Vollbildmodus</translation>
     </message>
     <message>
-        <source>&amp;Save session</source>
-        <translation>Sitzung &amp;speichern</translation>
-    </message>
-    <message>
-        <source>&amp;Load session</source>
-        <translation>Sitzung &amp;laden</translation>
-    </message>
-    <message>
         <source>&amp;Delete session</source>
         <translation>Sitzung &amp;löschen</translation>
     </message>
@@ -380,6 +372,18 @@ This file is distributed under the same license as the Bibetime package.</transl
         <source>Toggle visibility of the mag window</source>
         <translation>Umschalten der Sichtbarkeit des Lupen-Fensters</translation>
     </message>
+    <message>
+        <source>Sw&amp;itch session</source>
+        <translation>Si&amp;tzung umschalten</translation>
+    </message>
+    <message>
+        <source>Session already exists</source>
+        <translation>Sitzung existiert bereits</translation>
+    </message>
+    <message>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation>Die Sitzung mit dem Namen &quot;%1&quot; existiert bereits. Bitte geben Sie einen anderen Namen an.</translation>
+    </message>
 </context>
 <context>
     <name>BibleTimeApp</name>
@@ -515,8 +519,8 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>&amp;Lizenz</translation>
     </message>
     <message>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation>(c)1999-2013, das BibleTime Team</translation>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished">(c)1999-2014, das BibleTime Team</translation>
     </message>
     <message>
         <source>&amp;SWORD</source>
@@ -661,39 +665,65 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Die Anordnung von Einträgen im Bücherregal verändern.</translation>
     </message>
     <message>
-        <source>Use grouping from bookshelf dock</source>
-        <translation type="obsolete">Gruppierung aus dem Bücherregal verwenden</translation>
+        <source>Show/hide works</source>
+        <translation>Werke anzeigen/verstecken</translation>
     </message>
+</context>
+<context>
+    <name>BtChapterDropdownChooserButton</name>
     <message>
-        <source>Category/Language</source>
-        <translation type="obsolete">Kategorie/Sprache</translation>
+        <source>Select chapter</source>
+        <translation>Kapitel auswählen</translation>
     </message>
+</context>
+<context>
+    <name>BtConfig</name>
     <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <source>Old testament</source>
+        <translation>Altes Testament</translation>
     </message>
     <message>
-        <source>Language/Category</source>
-        <translation type="obsolete">Sprache/Kategorie</translation>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation>Mose/Pentateuch/Torah</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation type="obsolete">Sprache</translation>
+        <source>History</source>
+        <translation>Geschichte</translation>
     </message>
     <message>
-        <source>No grouping</source>
-        <translation type="obsolete">Nicht gruppiert</translation>
+        <source>Prophets</source>
+        <translation>Propheten</translation>
     </message>
     <message>
-        <source>Show/hide works</source>
-        <translation>Werke anzeigen/verstecken</translation>
+        <source>New testament</source>
+        <translation>Neues Testament</translation>
+    </message>
+    <message>
+        <source>Gospels</source>
+        <translation>Evangelien</translation>
+    </message>
+    <message>
+        <source>Letters/Epistles</source>
+        <translation>Briefe/Episteln</translation>
+    </message>
+    <message>
+        <source>Paul&apos;s Epistles</source>
+        <translation>Paulus-Briefe</translation>
+    </message>
+    <message>
+        <source>Error loading configuration!</source>
+        <translation>Fehler beim Laden der Konfiguration!</translation>
+    </message>
+    <message>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation>Die Konfiguration konnte nicht geladen werden, weil sie von einer neueren Version von BibleTime erstellt wurde. Das Laden der Konfiguration kann daher zu Datenverlust führen. Wollen Sie trotzdem fortfahren? Wählen Sie &quot;Nein&quot; um BibleTime sofort zu beenden.</translation>
     </message>
 </context>
 <context>
-    <name>BtChapterDropdownChooserButton</name>
+    <name>BtConfigCore</name>
     <message>
-        <source>Select chapter</source>
-        <translation>Kapitel auswählen</translation>
+        <source>Default Session</source>
+        <translation>Standard-Sitzung</translation>
     </message>
 </context>
 <context>
@@ -771,6 +801,21 @@ This file is distributed under the same license as the Bibetime package.</transl
     </message>
 </context>
 <context>
+    <name>BtFindWidget</name>
+    <message>
+        <source>Previous</source>
+        <translation>Voriger</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Nächster</translation>
+    </message>
+    <message>
+        <source>Match case</source>
+        <translation>Groß-/Kleinbuchstaben berücksichtigen</translation>
+    </message>
+</context>
+<context>
     <name>BtFontChooserWidget</name>
     <message>
         <source>Font name:</source>
@@ -788,10 +833,6 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <source>You can specify a custom font for each language.</source>
-        <translation type="obsolete">Sie können eine angepasste Schrift für jede Sprache angeben.</translation>
-    </message>
-    <message>
         <source>The font selection below will apply to all texts in this language</source>
         <translation>Die untenstehende Schriftauswahl wird für alle Texte in dieser Sprache gelten</translation>
     </message>
@@ -843,18 +884,10 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Indexgröße</translation>
     </message>
     <message>
-        <source>Create new search indexes and delete created indexes for the installed works.</source>
-        <translation type="obsolete">Erstellung neuer Such-Indizes und Löschen erstellter Indizes für installierte Werke.</translation>
-    </message>
-    <message>
         <source>Search Indexes</source>
         <translation>Suchindices</translation>
     </message>
     <message>
-        <source>KiB</source>
-        <translation type="obsolete">KiB</translation>
-    </message>
-    <message>
         <source>Create...</source>
         <translation>Erstelle...</translation>
     </message>
@@ -912,22 +945,10 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Installieren/Updaten</translation>
     </message>
     <message>
-        <source>Install and update works. Add remote or local sources, refresh them, select the works to be installed/updated and click Install.&lt;br/&gt;&lt;b&gt;WARNING:&lt;/b&gt; If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="obsolete">Werke installieren und aktualisieren. Fügen Sie entfernte oder lokale Quellen hinzu, aktualisieren Sie diese, wählen Sie die Werke aus, die installiert/aktualisiert werden sollen und klicken Sie Installieren.&lt;br/&gt;&lt;b&gt;WARNUNG:&lt;/b&gt;Wenn Sie in einem Land mit religiöser Verfolgung leben und es nicht riskieren wollen, entdeckt zu werden, sollten Sie keine entfernten Quellen verwenden.</translation>
-    </message>
-    <message>
-        <source>Install...</source>
-        <translation type="obsolete">Installieren...</translation>
-    </message>
-    <message>
         <source>Install or update selected works</source>
         <translation>Installation oder Aktualisierung ausgewählter Werke</translation>
     </message>
     <message>
-        <source>Install folder:</source>
-        <translation type="obsolete">Installationsverzeichnis:</translation>
-    </message>
-    <message>
         <source>The folder where the new works will be installed</source>
         <translation>Das Verzeichnis in dem die neuen Werke installiert werden</translation>
     </message>
@@ -1112,10 +1133,6 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Fortschritt</translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation>Anhalten</translation>
-    </message>
-    <message>
         <source>Stop All</source>
         <translation>Alle anhalten</translation>
     </message>
@@ -1124,10 +1141,6 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Abgeschlossen</translation>
     </message>
     <message>
-        <source>Cancelled</source>
-        <translation>Abgebrochen</translation>
-    </message>
-    <message>
         <source>Waiting for turn...</source>
         <translation>Warte...</translation>
     </message>
@@ -1147,21 +1160,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <source>Select the language in which the Biblical book names are displayed.</source>
-        <translation type="obsolete">Wählen Sie die Sprache in der die BIbelbücher-Namen angezeigt werden.</translation>
-    </message>
-    <message>
         <source>Language for names of Bible books:</source>
         <translation>Sprache der Bibelbücher-Namen:</translation>
     </message>
     <message>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation>Sprachen, die für die Bibelbücher-Namen verwendet werden können</translation>
-    </message>
-    <message>
         <source>Languages</source>
         <translation>Sprachen</translation>
     </message>
+    <message>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation>Die Sprachen, welche für die Namen der Bibelbücher verwendet werden können. Übersetzungen werden von der Sword-Bibliothek bereitgestellt.</translation>
+    </message>
 </context>
 <context>
     <name>BtModuleChooserButton</name>
@@ -1248,14 +1257,6 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtRemovePage</name>
     <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Entfernen</translation>
-    </message>
-    <message>
-        <source>Remove installed works. Select the works and click Remove button.</source>
-        <translation type="obsolete">Entfernen installierter Werke. Wählen Sie die Werke aus und betätigen Sie die \&quot;Entfernen\&quot;-Schaltfläche.</translation>
-    </message>
-    <message>
         <source>You selected the following work(s): </source>
         <translation>Sie haben folgende Werke ausgewählt:</translation>
     </message>
@@ -1264,10 +1265,6 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Möchten Sie diese wirklich von Ihrem System entfernen?</translation>
     </message>
     <message>
-        <source>Remove...</source>
-        <translation type="obsolete">Entfernen...</translation>
-    </message>
-    <message>
         <source>Remove the selected works</source>
         <translation>Entfernen der ausgewählten Werke</translation>
     </message>
@@ -1380,151 +1377,117 @@ shortcut</source>
     </message>
 </context>
 <context>
-    <name>BtSourceArea</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">Werk</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="obsolete">Beschreibung</translation>
-    </message>
-    <message>
-        <source>&amp;Add...</source>
-        <translation type="obsolete">Hinzufügen...</translation>
-    </message>
-    <message>
-        <source>Refresh...</source>
-        <translation type="obsolete">Auffrischen...</translation>
-    </message>
-    <message>
-        <source>Refresh the list of works from this source</source>
-        <translation type="obsolete">Liste der Werke aus dieser Quelle auffrischen</translation>
-    </message>
+    <name>BtStandardWorksTab</name>
     <message>
-        <source>&amp;Delete...</source>
-        <translation type="obsolete">Löschen...</translation>
-    </message>
-    <message>
-        <source>Delete this source</source>
-        <translation type="obsolete">Diese Quelle löschen</translation>
-    </message>
-    <message>
-        <source>Add new source</source>
-        <translation type="obsolete">Neue Quelle hinzufügen</translation>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation>Standard-Werke werden genutzt, wenn kein bestimmtes Werk festgelegt wurde, zum Beispiel wenn ein Verweis auf eine Bibel oder ein Lexikon angeklickt wurde.</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceAreaModel</name>
     <message>
-        <source>Work</source>
-        <translation type="obsolete">Werk</translation>
+        <source>Bible:</source>
+        <translation>Bibel:</translation>
     </message>
     <message>
-        <source>Version</source>
-        <translation type="obsolete">Version</translation>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation>Die Standard-Bibel wird genutzt, wenn ein Verweis auf eine Bibel betätigt wird</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Beschreibung</translation>
+        <source>Commentary:</source>
+        <translation>Kommentar:</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceWidget</name>
     <message>
-        <source>Delete Source?</source>
-        <translation type="obsolete">Quelle löschen?</translation>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation>Der Standard-Kommentar wird genutzt, wenn ein Verweis auf einen Kommentar betätigt wird</translation>
     </message>
     <message>
-        <source>Do you really want to delete this source?</source>
-        <translation type="obsolete">Möchten Sie diese Quelle wirklich löschen?</translation>
+        <source>Lexicon:</source>
+        <translation>Lexikon:</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Abbrechen</translation>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation>Das Standard-Lexikon wird genutzt, wenn ein Verweis auf ein Lexikon betätigt wird</translation>
     </message>
     <message>
-        <source>Refreshing source</source>
-        <translation type="obsolete">Quelle wird aktualisiert</translation>
+        <source>Daily devotional:</source>
+        <translation>Andachtsbuch:</translation>
     </message>
     <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Verbinde...</translation>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation>Die Standard-Andacht wird für die Anzeige einer kurzen Start-Andacht genutzt</translation>
     </message>
     <message>
-        <source>Refreshing...</source>
-        <translation type="obsolete">Aktualisiere...</translation>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation>Hebräisches Strong-Lexikon:</translation>
     </message>
     <message>
-        <source>Remote:</source>
-        <translation type="obsolete">Entfernt:</translation>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation>Das Standard-Hebräisch-Lexikon wird genutzt, wenn ein Verweis auf ein Hebräisch-Lexikon betätigt wird</translation>
     </message>
     <message>
-        <source>Local:</source>
-        <translation type="obsolete">Lokal:</translation>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation>Griechisches Strong-Lexikon:</translation>
     </message>
     <message>
-        <source>Not a directory!</source>
-        <translation type="obsolete">Kein Verzeichnis!</translation>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation>Das Standard-Griechisch-Lexikon wird genutzt, wenn ein Verweis auf ein Griechisch-Lexikon betätigt wird</translation>
     </message>
     <message>
-        <source>Not readable!</source>
-        <translation type="obsolete">Nicht lesbar!</translation>
+        <source>Hebrew morphological lexicon:</source>
+        <translation>Hebräisches Morphologie-Lexikon:</translation>
     </message>
     <message>
-        <source>Warning</source>
-        <translation type="obsolete">Warnung</translation>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation>Das Standard-Morphologie-Lexikon für hebräische Texte wird genutzt, wenn ein Verweis auf eine morphologische Markierung in einem Hebräisch-Text betätigt wird</translation>
     </message>
     <message>
-        <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="obsolete">Das Zielverzeichnis ist nicht beschreibbar oder existiert nicht. Die Installation wird fehlschlagen, wenn dieser Umstand vorher nicht behoben wird.</translation>
+        <source>Greek morphological lexicon:</source>
+        <translation>Griechisches Morphologie-Lexikon:</translation>
     </message>
     <message>
-        <source>No sources were found in the SWORD configuration and BibleTime couldn&apos;t create a default source. Check your SWORD configuration and that the configuration path is writable. Then restart the Bookshelf Manager.</source>
-        <translation type="obsolete">In der SWORD-Konfiguration wurden keine Quellen gefunden und BibleTime konnte keine Standard-Quelle erstellen. Überprüfen Sie Ihre SWORD-Konfiguration und dass der Konfigurations-Pfad beschreibbar ist. Dann starten Sie die Bücherregal-Verwaltung erneut.</translation>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation>Das Standard-Morphologie-Lexikon für griechische Texte wird genutzt, wenn ein Verweis auf eine morphologische Markierung in einem Griechisch-Text betätigt wird</translation>
     </message>
 </context>
 <context>
     <name>BtTextFiltersTab</name>
     <message>
         <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="obsolete">Filter kontrollieren die Text-Erscheinung. Hier können Sie Standard-Einstellungen für alle Filter spezifizieren. Sie können diese Einstellungen in jedem Anzeige-Fenster übergehen.</translation>
+        <translation>Filter kontrollieren die Text-Erscheinung. Hier können Sie Standard-Einstellungen für alle Filter spezifizieren. Sie können diese Einstellungen in jedem Anzeige-Fenster übergehen.</translation>
     </message>
     <message>
         <source>Insert line break after each verse</source>
-        <translation type="obsolete">Zeilenumbruch nach jedem Vers einfügen</translation>
+        <translation>Zeilenumbruch nach jedem Vers einfügen</translation>
     </message>
     <message>
         <source>Show verse numbers</source>
-        <translation type="obsolete">Versnummern anzeigen</translation>
+        <translation>Versnummern anzeigen</translation>
     </message>
     <message>
         <source>Show section headings</source>
-        <translation type="obsolete">Abschnittsüberschriften anzeigen</translation>
+        <translation>Abschnittsüberschriften anzeigen</translation>
     </message>
     <message>
         <source>Show scripture cross-references</source>
-        <translation type="obsolete">Querverweise auf Bibelstellen anzeigen</translation>
+        <translation>Querverweise auf Bibelstellen anzeigen</translation>
     </message>
     <message>
         <source>Show Greek accents</source>
-        <translation type="obsolete">Griechische Akzente anzeigen</translation>
+        <translation>Griechische Akzente anzeigen</translation>
     </message>
     <message>
         <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">Hebräische Vokalzeichen anzeigen</translation>
+        <translation>Hebräische Vokalzeichen anzeigen</translation>
     </message>
     <message>
         <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">Hebräische Kantillationszeichen anzeigen</translation>
+        <translation>Hebräische Kantillationszeichen anzeigen</translation>
     </message>
     <message>
         <source>Show morph segmentation</source>
-        <translation type="obsolete">Morphologische Segmentierung anzeigen</translation>
+        <translation>Morphologische Segmentierung anzeigen</translation>
     </message>
     <message>
         <source>Use textual variants</source>
-        <translation type="obsolete">Textvarianten verwenden</translation>
+        <translation>Textvarianten verwenden</translation>
     </message>
 </context>
 <context>
@@ -1534,10 +1497,6 @@ shortcut</source>
         <translation>Hinzufügen/entfernen/ersetzen</translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Entfernen</translation>
-    </message>
-    <message>
         <source>Replace</source>
         <translation>Ersetzen</translation>
     </message>
@@ -1601,14 +1560,6 @@ shortcut</source>
         <translation>Um mehr Informationen über ein Werk zu bekommen, gehen Sie zum Bücherregal-Fenster, rechtsklicken Sie auf das Werk, und wählen Sie den Eintrag &quot;Über&quot; aus.</translation>
     </message>
     <message>
-        <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging theborder between the window and another window.</source>
-        <translation type="obsolete">Die Fenster &quot;Bücherregal&quot;, &quot;Lesezeichen&quot; und &quot;Lupe&quot; können an neue Orte bewegt werden, in dem der Titel mit der Maus gezogen wird. Sie können links, rechts, oberhalb oder unterhalb der Werk-Lesefenster angeordnet werden. Wenn man Sie aufeinanderlegt, werden Tabs erscheinen, mit denen jedes Fenster ausgewählt werden kann. Ihre Größe kann angepasst werden, indem man die Grenze zwischen dem Fenster und einem angrenzenden Fenster verschiebt.</translation>
-    </message>
-    <message>
-        <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the sameStrong&apos;s number in other locations of the work.</source>
-        <translation type="obsolete">Sie können nach Strongnummern in einem Werk suchen. Beginnen Sie mit einem Werk, das Strongnummern hat, und bewegen Sie die Maus über ein Wort. Rechtsklicken Sie auf das Wort und nutzen Sie das Menü &quot;Strong-Suche&quot;. Ein Suchdialog wird erscheinen, der Ihnen die Verwendung des Wortes mit derselben Strongnummer an anderen Stellen des Werkes anzeigen wird.</translation>
-    </message>
-    <message>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
         <translation>Sie können persönliche Notizen zu Bibelversen speichern. Dazu müssen Sie zunächst das &quot;Personal&quot;-Kommentarmodul installieren. Öffnen Sie die Bücherregal-Verwaltung, wählen Sie Crosswire als Quelle aus, und suchen Sie das Werk unter &quot;Kommentare&quot; und &quot;Englisch&quot;. Wenn es installiert ist, rechtsklicken Sie auf das &quot;Personal&quot;-Kommentarmodul im Bücherregal. Wählen Sie entweder &quot;Klartext bearbeiten&quot; oder &quot;HTML bearbeiten&quot; aus, um das Modul im Schreibmodus zu öffnen.</translation>
     </message>
@@ -1743,18 +1694,10 @@ shortcut</source>
         <translation>Drucken...</translation>
     </message>
     <message>
-        <source>Copy chapter to clipboard ...</source>
-        <translation type="obsolete">Kapitel in Zwischenablage kopieren...</translation>
-    </message>
-    <message>
         <source>Copying</source>
         <translation>Kopiere</translation>
     </message>
     <message>
-        <source>Saving chapter ...</source>
-        <translation type="obsolete">Speichere das Kapitel ...</translation>
-    </message>
-    <message>
         <source>Saving</source>
         <translation>Speichere</translation>
     </message>
@@ -1793,10 +1736,6 @@ shortcut</source>
         <translation>Das Werk, auf welches das Lesezeichen verweist, ist nicht installiert.</translation>
     </message>
     <message>
-        <source>Change bookmark description...</source>
-        <translation type="obsolete">Die Lesezeichen-Beschreibung verändern...</translation>
-    </message>
-    <message>
         <source>Print bookmarks...</source>
         <translation>Lesezeichen drucken...</translation>
     </message>
@@ -1957,14 +1896,6 @@ shortcut</source>
         <translation>Vorwärts im Verlauf</translation>
     </message>
     <message>
-        <source>Zoom in</source>
-        <translation type="obsolete">Vergrößern</translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation type="obsolete">Verkleinern</translation>
-    </message>
-    <message>
         <source>Select all</source>
         <translation>Alles auswählen</translation>
     </message>
@@ -2006,21 +1937,6 @@ shortcut</source>
     </message>
 </context>
 <context>
-    <name>CFontChooser</name>
-    <message>
-        <source>Size:</source>
-        <translation type="obsolete">Größe:</translation>
-    </message>
-    <message>
-        <source>Font name:</source>
-        <translation type="obsolete">Schriftname:</translation>
-    </message>
-    <message>
-        <source>Font style:</source>
-        <translation type="obsolete">Schriftstil:</translation>
-    </message>
-</context>
-<context>
     <name>CHTMLWriteDisplay</name>
     <message>
         <source>Bold</source>
@@ -2083,44 +1999,6 @@ shortcut</source>
     </message>
 </context>
 <context>
-    <name>CInputDialog</name>
-    <message>
-        <source>Clear</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-</context>
-<context>
-    <name>CKeyReferenceWidget</name>
-    <message>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="obsolete">Durchlaufen Sie die Listeneinträge. Drücken Sie die Taste und bewegen Sie die Maus um nach vorn oder hinten durch die Liste zu laufen.</translation>
-    </message>
-    <message>
-        <source>Next book</source>
-        <translation type="obsolete">Nächstes Buch</translation>
-    </message>
-    <message>
-        <source>Previous book</source>
-        <translation type="obsolete">Vorheriges Buch</translation>
-    </message>
-    <message>
-        <source>Next chapter</source>
-        <translation type="obsolete">Nächstes Kapitel</translation>
-    </message>
-    <message>
-        <source>Previous chapter</source>
-        <translation type="obsolete">Vorheriges Kapitel</translation>
-    </message>
-    <message>
-        <source>Next verse</source>
-        <translation type="obsolete">Nächster Vers</translation>
-    </message>
-    <message>
-        <source>Previous verse</source>
-        <translation type="obsolete">Vorheriger Vers</translation>
-    </message>
-</context>
-<context>
     <name>CLanguageSettingsPage</name>
     <message>
         <source></source>
@@ -2197,38 +2075,11 @@ shortcut</source>
         <translation>Drucken...</translation>
     </message>
     <message>
-        <source>Saving entry ...</source>
-        <translation type="obsolete">Speichere den Eintrag ...</translation>
-    </message>
-    <message>
         <source>Saving</source>
         <translation>Speichere</translation>
     </message>
 </context>
 <context>
-    <name>CModuleIndexDialog</name>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Abbrechen</translation>
-    </message>
-    <message>
-        <source>Creating indices</source>
-        <translation type="obsolete">Erstellung der Indizes</translation>
-    </message>
-    <message>
-        <source>Indexing Is Cancelled</source>
-        <translation type="obsolete">Indizierung abgebrochen</translation>
-    </message>
-    <message>
-        <source>Indexing is cancelled because modules are removed.</source>
-        <translation type="obsolete">Indizierung aufgrund entfernter Module abgebrochen.</translation>
-    </message>
-    <message>
-        <source>Creating index for work: %1</source>
-        <translation type="obsolete">Erstelle Index für Werk: %1</translation>
-    </message>
-</context>
-<context>
     <name>CPlainWriteWindow</name>
     <message>
         <source>Sync with active Bible</source>
@@ -2270,6 +2121,18 @@ shortcut</source>
         <source>Restore original text, new text will be lost</source>
         <translation>Original-Text wiederherstellen, neuer Text geht verloren</translation>
     </message>
+    <message>
+        <source>Save Text?</source>
+        <translation>Text speichern?</translation>
+    </message>
+    <message>
+        <source>Save text before closing?</source>
+        <translation>Den Text vor dem Schließen speichern?</translation>
+    </message>
+    <message>
+        <source>Save changed text?</source>
+        <translation>Geänderten Text speichern?</translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
@@ -2278,18 +2141,10 @@ shortcut</source>
         <translation>Suchanalyse speichern</translation>
     </message>
     <message>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation>HTML-Dateien (*.html;*.HTML;*.HTM;*.htm)</translation>
-    </message>
-    <message>
         <source>BibleTime Search Analysis</source>
         <translation>BibleTime Suchanalyse</translation>
     </message>
     <message>
-        <source>Search text :</source>
-        <translation>Suchtext:</translation>
-    </message>
-    <message>
         <source>Book</source>
         <translation>Buch</translation>
     </message>
@@ -2301,6 +2156,18 @@ shortcut</source>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
         <translation>Erstellt von &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</translation>
     </message>
+    <message>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
+        <translation>XHTML-Dateien (*.html *.HTML *.HTM *.htm);;Alle Dateien (*)</translation>
+    </message>
+    <message>
+        <source>Search text:</source>
+        <translation>Suchtext:</translation>
+    </message>
+    <message>
+        <source>Results by work and book</source>
+        <translation>Ergebnisse nach Werk und Buch</translation>
+    </message>
 </context>
 <context>
     <name>CSwordModuleInfo</name>
@@ -2540,21 +2407,6 @@ Möchten Sie fortfahren?</translation>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <source>Save text before closing?</source>
-        <translation>Den Text vor dem Schließen speichern?</translation>
-    </message>
-    <message>
-        <source>Save changed text?</source>
-        <translation>Geänderten Text speichern?</translation>
-    </message>
-    <message>
-        <source>Save Text?</source>
-        <translation>Text speichern?</translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
         <source>Abbreviation</source>
@@ -3169,50 +3021,10 @@ Language name ppk</extracomment>
         <translation>Morphologische Segmentierung</translation>
     </message>
     <message>
-        <source>Export</source>
-        <translation>Exportieren</translation>
-    </message>
-    <message>
         <source>Local</source>
         <translation>Lokal</translation>
     </message>
     <message>
-        <source>Remote</source>
-        <translation>Internet</translation>
-    </message>
-    <message>
-        <source>Old testament</source>
-        <translation>Altes Testament</translation>
-    </message>
-    <message>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Mose/Pentateuch/Torah</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Geschichte</translation>
-    </message>
-    <message>
-        <source>Prophets</source>
-        <translation>Propheten</translation>
-    </message>
-    <message>
-        <source>New testament</source>
-        <translation>Neues Testament</translation>
-    </message>
-    <message>
-        <source>Gospels</source>
-        <translation>Evangelien</translation>
-    </message>
-    <message>
-        <source>Letters/Epistles</source>
-        <translation>Briefe/Episteln</translation>
-    </message>
-    <message>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Paulus-Briefe</translation>
-    </message>
-    <message>
         <source>HTML files</source>
         <translation>HTML-Dateien</translation>
     </message>
@@ -3233,10 +3045,6 @@ Language name ppk</extracomment>
         <translation>Speichere Dokument ...</translation>
     </message>
     <message>
-        <source>Print keys</source>
-        <translation type="obsolete">Einträge drucken</translation>
-    </message>
-    <message>
         <source>BibleTime bookmark files</source>
         <translation>BibleTime-Lesezeichen</translation>
     </message>
@@ -3245,14 +3053,6 @@ Language name ppk</extracomment>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <source>Change description ...</source>
-        <translation type="obsolete">Beschreibung ändern...</translation>
-    </message>
-    <message>
-        <source>Enter a new description for the chosen bookmark.</source>
-        <translation type="obsolete">Geben Sie eine neue Beschreibung des Lesezeichens ein.</translation>
-    </message>
-    <message>
         <source>New folder</source>
         <translation>Neuer Ordner</translation>
     </message>
@@ -3269,10 +3069,6 @@ Language name ppk</extracomment>
         <translation>Fehler</translation>
     </message>
     <message>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>Die Datei konnte nicht gespeichert werden.</translation>
-    </message>
-    <message>
         <source>Please check permissions etc.</source>
         <translation>Bitte überprüfen Sie die Zugriffsrechte usw.</translation>
     </message>
@@ -3285,14 +3081,6 @@ Language name ppk</extracomment>
         <translation>Version</translation>
     </message>
     <message>
-        <source>Settings Migration</source>
-        <translation type="obsolete">Ãœbernahme von Einstellungen</translation>
-    </message>
-    <message>
-        <source>It appears you have a BibleTime configuration from KDE 3 stored in %1, and you have not migrated it to this version.  Would you like to import it?</source>
-        <translation type="obsolete">Sie haben eine BibleTime-Konfiguration aus KDE3 in %1, und sie haben sie noch nicht in diese Version migriert. Möchten sie diese Konfiguration jetzt importieren?</translation>
-    </message>
-    <message>
         <source>Encrypted - needs unlock key</source>
         <translation>Verschlüsselt - benötigt Schlüssel</translation>
     </message>
@@ -3660,14 +3448,6 @@ Language name ppk</extracomment>
         <translation>Für Kommandozeilenargumente, die vom Qt-Toolkit verarbeitet werden, sehen Sie bitte in %1 nach.</translation>
     </message>
     <message>
-        <source>All command-line arguments not recognized by BibleTime or Qt will be silently ignored.</source>
-        <translation type="obsolete">Alle Kommandozeilenargumente, die nicht von BibleTime oder Qt erkannt werden, können nicht ausgewertet werden.</translation>
-    </message>
-    <message>
-        <source>Error: %1 expects an argument. See --help for details.</source>
-        <translation type="obsolete">Error: %1 erwartet ein Argument. Vgl. --help für Details.</translation>
-    </message>
-    <message>
         <source>Error: Invalid command-line argument: %1</source>
         <translation>Error: Ungültiges Kommandozeilenargument: %1</translation>
     </message>
@@ -3689,7 +3469,35 @@ Language name ppk</extracomment>
     </message>
     <message>
         <source>CSS base template not found!</source>
-        <translation type="unfinished"></translation>
+        <translation>CSS-Basis-Template nicht gefunden!</translation>
+    </message>
+    <message>
+        <source>Error while writing to file.</source>
+        <translation>Fehler beim Schreiben der Datei.</translation>
+    </message>
+    <message>
+        <source>Please check that enough disk space is available.</source>
+        <translation>Bitte prüfen Sie, dass genug Speicherplatz verfügbar ist.</translation>
+    </message>
+    <message>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation>Die Datei konnte nicht zum Speichern geöffnet werden.</translation>
+    </message>
+    <message>
+        <source>Remote FTP</source>
+        <translation>Entferntes FTP</translation>
+    </message>
+    <message>
+        <source>Remote SFTP</source>
+        <translation>Entferntes SFTP</translation>
+    </message>
+    <message>
+        <source>Remote HTTP</source>
+        <translation>Entferntes HTTP</translation>
+    </message>
+    <message>
+        <source>Remote HTTPS</source>
+        <translation>Entferntes HTTPS</translation>
     </message>
 </context>
 <context>
@@ -4094,26 +3902,14 @@ Language name ppk</extracomment>
         <translation>Drucken...</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Suchergebnis kopieren...</translation>
-    </message>
-    <message>
         <source>Copying search result</source>
         <translation>Kopiere Suchergebnis</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Suchergebnis speichern...</translation>
-    </message>
-    <message>
         <source>Saving search result</source>
         <translation>Speichere Suchergebnis</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Suchergebnis drucken...</translation>
-    </message>
-    <message>
         <source>Printing search result</source>
         <translation>Drucke Suchergebnis</translation>
     </message>
@@ -4145,14 +3941,6 @@ Language name ppk</extracomment>
         <translation>Neuer Suchbereich</translation>
     </message>
     <message>
-        <source>&lt;invalid name of search range&gt;</source>
-        <translation type="obsolete">&lt;ungültiger Name des Suchbereiches&gt;</translation>
-    </message>
-    <message>
-        <source>Select a scope from the list to edit the search ranges</source>
-        <translation type="obsolete">Wählen Sie einen Bereich aus der Liste um die Suchgrenzen zu editieren</translation>
-    </message>
-    <message>
         <source>&amp;Add new scope</source>
         <translation>&amp;Neuen Suchbereich hinzufügen</translation>
     </message>
@@ -4173,10 +3961,6 @@ Language name ppk</extracomment>
         <translation>Den Namen des ausgewählten Suchbereichs verändern</translation>
     </message>
     <message>
-        <source>Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="obsolete">Die Suchbereiche des aktuellen Eintrags bearbeiten. Schauen Sie sich die vordefinierten Suchbereiche an, um einen Eindruck davon zu bekommen, wie Suchbereiche aufgebaut sind.</translation>
-    </message>
-    <message>
         <source>The search ranges which will be used for the search, parsed to the canonical form</source>
         <translation>Die Suchgrenzen werden für die Suche genutzt, übertragen auf die kanonische Form</translation>
     </message>
@@ -4204,12 +3988,6 @@ Language name ppk</extracomment>
         <translation>Suche</translation>
     </message>
     <message>
-        <source>One or more works need indexing before they can be searched.
-This could take a long time. Proceed with indexing?</source>
-        <translation type="obsolete">Für ein oder mehrere Werke müssen Indices erstellt werden, bevor darin gesucht werden kann. 
-Das kann eine Weile dauern. Mit der Indizierung fortfahren?</translation>
-    </message>
-    <message>
         <source>&amp;Analyze results...</source>
         <translation>Ergebnisse &amp;analysieren...</translation>
     </message>
@@ -4261,26 +4039,14 @@ Das kann eine Weile dauern. Mit der Indizierung fortfahren?</translation>
         <translation>Drucken...</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Suchergebnis drucken...</translation>
-    </message>
-    <message>
         <source>Printing search result</source>
         <translation>Drucke Suchergebnis</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Suchergebnis speichern...</translation>
-    </message>
-    <message>
         <source>Saving search result</source>
         <translation>Speichere Suchergebnis</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Suchergebnis kopieren...</translation>
-    </message>
-    <message>
         <source>Copying search result</source>
         <translation>Kopiere Suchergebnis</translation>
     </message>
@@ -4292,166 +4058,87 @@ Das kann eine Weile dauern. Mit der Indizierung fortfahren?</translation>
 <context>
     <name>StandardWorksTab</name>
     <message>
-        <source>Bible:</source>
-        <translation>Bibel:</translation>
-    </message>
-    <message>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>Die Standard-Bibel wird genutzt, wenn ein Verweis auf eine Bibel betätigt wird</translation>
-    </message>
-    <message>
-        <source>Commentary:</source>
-        <translation>Kommentar:</translation>
-    </message>
-    <message>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>Der Standard-Kommentar wird genutzt, wenn ein Verweis auf einen Kommentar betätigt wird</translation>
-    </message>
-    <message>
-        <source>Lexicon:</source>
-        <translation>Lexikon:</translation>
-    </message>
-    <message>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>Das Standard-Lexikon wird genutzt, wenn ein Verweis auf ein Lexikon betätigt wird</translation>
-    </message>
-    <message>
-        <source>Daily devotional:</source>
-        <translation>Andachtsbuch:</translation>
-    </message>
-    <message>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>Die Standard-Andacht wird für die Anzeige einer kurzen Start-Andacht genutzt</translation>
-    </message>
-    <message>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>Hebräisches Strong-Lexikon:</translation>
-    </message>
-    <message>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>Das Standard-Hebräisch-Lexikon wird genutzt, wenn ein Verweis auf ein Hebräisch-Lexikon betätigt wird</translation>
-    </message>
-    <message>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>Griechisches Strong-Lexikon:</translation>
-    </message>
-    <message>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>Das Standard-Griechisch-Lexikon wird genutzt, wenn ein Verweis auf ein Griechisch-Lexikon betätigt wird</translation>
-    </message>
-    <message>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>Hebräisches Morphologie-Lexikon:</translation>
-    </message>
-    <message>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>Das Standard-Morphologie-Lexikon für hebräische Texte wird genutzt, wenn ein Verweis auf eine morphologische Markierung in einem Hebräisch-Text betätigt wird</translation>
-    </message>
-    <message>
-        <source>Greek morphological lexicon:</source>
-        <translation>Griechisches Morphologie-Lexikon:</translation>
-    </message>
-    <message>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>Das Standard-Morphologie-Lexikon für griechische Texte wird genutzt, wenn ein Verweis auf eine morphologische Markierung in einem Griechisch-Text betätigt wird</translation>
-    </message>
-    <message>
         <source></source>
         <translation></translation>
     </message>
-    <message>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation>Standard-Werke werden genutzt, wenn kein bestimmtes Werk festgelegt wurde, zum Beispiel wenn ein Verweis auf eine Bibel oder ein Lexikon angeklickt wurde.</translation>
-    </message>
 </context>
 <context>
     <name>TextFiltersTab</name>
     <message>
-        <source>Insert line break after each verse</source>
-        <translation>Zeilenumbruch nach jedem Vers einfügen</translation>
-    </message>
-    <message>
-        <source>Show verse numbers</source>
-        <translation>Versnummern anzeigen</translation>
-    </message>
-    <message>
-        <source>Show section headings</source>
-        <translation>Abschnittsüberschriften anzeigen</translation>
-    </message>
-    <message>
-        <source>Show scripture cross-references</source>
-        <translation>Querverweise auf Bibelstellen anzeigen</translation>
-    </message>
-    <message>
-        <source>Show Greek accents</source>
-        <translation>Griechische Akzente anzeigen</translation>
-    </message>
-    <message>
-        <source>Show Hebrew vowel points</source>
-        <translation>Hebräische Vokalzeichen anzeigen</translation>
+        <source></source>
+        <translation></translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallProgress</name>
     <message>
-        <source>Show Hebrew cantillation marks</source>
-        <translation>Hebräische Kantillationszeichen anzeigen</translation>
+        <source>Failed</source>
+        <translation>Fehlgeschlagen</translation>
     </message>
     <message>
-        <source>Show morph segmentation</source>
-        <translation>Morphologische Segmentierung anzeigen</translation>
+        <source>Completed</source>
+        <translation>Abgeschlossen</translation>
     </message>
     <message>
-        <source>Use textual variants</source>
-        <translation>Textvarianten verwenden</translation>
+        <source>Cancelled</source>
+        <translation>Abgebrochen</translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallSources</name>
     <message>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation>Filter kontrollieren die Text-Erscheinung. Hier können Sie Standard-Einstellungen für alle Filter spezifizieren. Sie können diese Einstellungen in jedem Anzeige-Fenster übergehen.</translation>
+        <source>Failed to refresh source %1</source>
+        <translation>Konnte Quelle %1 nicht aktualisieren</translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <source></source>
-        <translation></translation>
+        <source>The text you want to search for</source>
+        <translation>Ihr Suchtext</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <source>Find Text</source>
-        <translation>Text finden</translation>
+        <source>New Window</source>
+        <translation>Neues Fenster</translation>
     </message>
     <message>
-        <source>The text you want to search for</source>
-        <translation>Der zu suchende Text</translation>
+        <source>Bookshelf Manager</source>
+        <translation>Bücherregal-Verwaltung</translation>
     </message>
     <message>
-        <source>Case &amp;sensitive</source>
-        <translation>Groß-/Kleinschreibung berück&amp;sichtigen</translation>
+        <source>Single</source>
+        <translation>Einzeln</translation>
     </message>
     <message>
-        <source>Find the previous location of the text</source>
-        <translation>Die vorherige Textstelle aufsuchen</translation>
+        <source>Tabbed</source>
+        <translation>Tabs</translation>
     </message>
     <message>
-        <source>&amp;Previous</source>
-        <translation>&amp;Vorherige</translation>
+        <source>Auto-tile</source>
+        <translation>Automatisch kacheln</translation>
     </message>
     <message>
-        <source>Find the next location of the text</source>
-        <translation>Die folgende Textstelle aufsuchen</translation>
+        <source>Auto-tile horizontally</source>
+        <translation>Automatisches Horizontal-Kacheln</translation>
     </message>
     <message>
-        <source>&amp;Next</source>
-        <translation>&amp;Folgende</translation>
+        <source>Auto-tile vertically</source>
+        <translation>Automatisches Vertikal-Kacheln</translation>
     </message>
     <message>
-        <source>Close the dialog</source>
-        <translation>Dialog schließen</translation>
+        <source>View Window</source>
+        <translation>Ansichtsfenster</translation>
     </message>
     <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Schließen</translation>
+        <source>Text Font Size</source>
+        <translation>Text-Schriftgröße</translation>
     </message>
     <message>
-        <source>Search with case sensitivity</source>
-        <translation>Suche mit Unterscheidung von Klein- und Großbuchstaben</translation>
+        <source>User Interface Font Size</source>
+        <translation>Schriftgröße der Benutzeroberfläche</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/messages/bibletime_ui_en_GB.ts b/i18n/messages/bibletime_ui_en_GB.ts
index 0187392..1dbeaa2 100644
--- a/i18n/messages/bibletime_ui_en_GB.ts
+++ b/i18n/messages/bibletime_ui_en_GB.ts
@@ -6,7 +6,7 @@
     <message>
         <source></source>
         <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
 This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
@@ -22,452 +22,457 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTime</name>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
+        <location filename="../../src/bibletime_init.cpp" line="741"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&amp;Search</source>
         <translation>&amp;Search</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&amp;Window</source>
         <translation>&amp;Window</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <source>Sw&amp;itch session</source>
+        <translation>Sw&amp;itch session</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&amp;ttings</source>
         <translation>Se&amp;ttings</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&amp;Show toolbar</source>
         <translation>&amp;Show toolbar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&amp;Fullscreen mode</source>
         <translation>&amp;Fullscreen mode</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quit</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
+        <location filename="../../src/bibletime_init.cpp" line="251"/>
         <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
         <translation>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
+        <location filename="../../src/bibletime_init.cpp" line="256"/>
         <source>Information about the BibleTime program</source>
         <translation>Information about the BibleTime program</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>&amp;Load session</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&amp;Delete session</source>
         <translation>&amp;Delete session</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&amp;Arrangement mode</source>
         <translation>&amp;Arrangement mode</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&amp;Manual mode</source>
         <translation>&amp;Manual mode</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &amp;vertically</source>
         <translation>Auto-tile &amp;vertically</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &amp;horizontally</source>
         <translation>Auto-tile &amp;horizontally</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&amp;cascade</source>
         <translation>Auto-&amp;cascade</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&amp;Cascade</source>
         <translation>&amp;Cascade</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &amp;vertically</source>
         <translation>Tile &amp;vertically</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &amp;horizontally</source>
         <translation>Tile &amp;horizontally</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&amp;ose all windows</source>
         <translation>Cl&amp;ose all windows</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
+        <location filename="../../src/bibletime_init.cpp" line="224"/>
         <source>Close all open windows inside BibleTime</source>
         <translation>Close all open windows inside BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
+        <location filename="../../src/bibletime_init.cpp" line="241"/>
         <source>&amp;Handbook</source>
         <translation>&amp;Handbook</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&amp;Bible Study Howto</source>
         <translation>&amp;Bible Study Howto</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
+        <location filename="../../src/bibletime_slots.cpp" line="533"/>
         <source>Please enter a name for the new session.</source>
         <translation>Please enter a name for the new session.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
+        <location filename="../../src/bibletime_slots.cpp" line="541"/>
+        <source>Session already exists</source>
+        <translation>Session already exists</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_slots.cpp" line="542"/>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation>Session with the name &quot;%1&quot; already exists. Please provide a different name.</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="107"/>
         <source>Quit BibleTime</source>
         <translation>Quit BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
+        <location filename="../../src/bibletime_init.cpp" line="114"/>
         <source>Toggle fullscreen mode of the main window</source>
         <translation>Toggle fullscreen mode of the main window</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
+        <location filename="../../src/bibletime_init.cpp" line="123"/>
         <source>Search in &amp;open works...</source>
         <translation>Search in &amp;open works...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &amp;Bible...</source>
         <translation>Search in standard &amp;Bible...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &amp;new session...</source>
         <translation>Save as &amp;new session...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
+        <location filename="../../src/bibletime_init.cpp" line="140"/>
         <source>Create and save a new session</source>
         <translation>Create and save a new session</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
+        <location filename="../../src/bibletime_init.cpp" line="147"/>
         <source>Manually arrange the open windows</source>
         <translation>Manually arrange the open windows</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
+        <location filename="../../src/bibletime_init.cpp" line="154"/>
         <source>Automatically tile the open windows vertically (arrange side by side)</source>
         <translation>Automatically tile the open windows vertically (arrange side by side)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
+        <location filename="../../src/bibletime_init.cpp" line="161"/>
         <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
         <translation>Automatically tile the open windows horizontally (arrange on top of each other)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
+        <location filename="../../src/bibletime_init.cpp" line="165"/>
         <source>Auto-&amp;tile</source>
         <translation>Auto-&amp;tile</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
+        <location filename="../../src/bibletime_init.cpp" line="168"/>
         <source>Automatically tile the open windows</source>
         <translation>Automatically tile the open windows</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
+        <location filename="../../src/bibletime_init.cpp" line="172"/>
         <source>Ta&amp;bbed</source>
         <translation>Ta&amp;bbed</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
+        <location filename="../../src/bibletime_init.cpp" line="175"/>
         <source>Automatically tab the open windows</source>
         <translation>Automatically tab the open windows</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
+        <location filename="../../src/bibletime_init.cpp" line="182"/>
         <source>Automatically cascade the open windows</source>
         <translation>Automatically cascade the open windows</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
+        <location filename="../../src/bibletime_init.cpp" line="189"/>
         <source>Cascade the open windows</source>
         <translation>Cascade the open windows</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
+        <location filename="../../src/bibletime_init.cpp" line="193"/>
         <source>&amp;Tile</source>
         <translation>&amp;Tile</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
+        <location filename="../../src/bibletime_init.cpp" line="196"/>
         <source>Tile the open windows</source>
         <translation>Tile the open windows</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
+        <location filename="../../src/bibletime_init.cpp" line="203"/>
         <source>Vertically tile (arrange side by side) the open windows</source>
         <translation>Vertically tile (arrange side by side) the open windows</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
+        <location filename="../../src/bibletime_init.cpp" line="210"/>
         <source>Horizontally tile (arrange on top of each other) the open windows</source>
         <translation>Horizontally tile (arrange on top of each other) the open windows</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
+        <location filename="../../src/bibletime_init.cpp" line="214"/>
         <source>Close &amp;window</source>
         <translation>Close &amp;window</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
+        <location filename="../../src/bibletime_init.cpp" line="217"/>
         <source>Close the current open window</source>
         <translation>Close the current open window</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
+        <location filename="../../src/bibletime_init.cpp" line="228"/>
         <source>&amp;Configure BibleTime...</source>
         <translation>&amp;Configure BibleTime...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime&apos;s preferences</source>
         <translation>Set BibleTime&apos;s preferences</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
+        <location filename="../../src/bibletime_init.cpp" line="234"/>
         <source>Bookshelf &amp;Manager...</source>
         <translation>Bookshelf &amp;Manager...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
+        <location filename="../../src/bibletime_init.cpp" line="237"/>
         <source>Configure your bookshelf and install/update/remove/index works</source>
         <translation>Configure your bookshelf and install/update/remove/index works</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
+        <location filename="../../src/bibletime_init.cpp" line="244"/>
         <source>Open BibleTime&apos;s handbook</source>
         <translation>Open BibleTime&apos;s handbook</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&amp;Tip of the day...</source>
         <translation>&amp;Tip of the day...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
+        <location filename="../../src/bibletime_init.cpp" line="263"/>
         <source>Show tips about BibleTime</source>
         <translation>Show tips about BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
+        <location filename="../../src/bibletime_init.cpp" line="402"/>
         <source>Toggle visibility of the bookshelf window</source>
         <translation>Toggle visibility of the bookshelf window</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
+        <location filename="../../src/bibletime_init.cpp" line="406"/>
         <source>Toggle visibility of the bookmarks window</source>
         <translation>Toggle visibility of the bookmarks window</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
+        <location filename="../../src/bibletime_init.cpp" line="410"/>
         <source>Toggle visibility of the mag window</source>
         <translation>Toggle visibility of the mag window</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
+        <location filename="../../src/bibletime_init.cpp" line="735"/>
         <source>Main toolbar</source>
         <translation>Main toolbar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
+        <location filename="../../src/bibletime_init.cpp" line="736"/>
         <source>Navigation toolbar</source>
         <translation>Navigation toolbar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
+        <location filename="../../src/bibletime_init.cpp" line="737"/>
         <source>Works toolbar</source>
         <translation>Works toolbar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
+        <location filename="../../src/bibletime_init.cpp" line="738"/>
         <source>Tools toolbar</source>
         <translation>Tools toolbar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
+        <location filename="../../src/bibletime_init.cpp" line="739"/>
         <source>Format toolbar</source>
         <translation>Format toolbar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation>&amp;Save session</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
+        <location filename="../../src/bibletime_init.cpp" line="777"/>
         <source>Show main toolbar</source>
         <translation>Show main toolbar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
+        <location filename="../../src/bibletime_init.cpp" line="780"/>
         <source>Show navigation bar</source>
         <translation>Show navigation bar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
+        <location filename="../../src/bibletime_init.cpp" line="783"/>
         <source>Show works toolbar</source>
         <translation>Show works toolbar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
+        <location filename="../../src/bibletime_init.cpp" line="786"/>
         <source>Show tools toolbar</source>
         <translation>Show tools toolbar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
+        <location filename="../../src/bibletime_init.cpp" line="789"/>
         <source>Show formatting toolbar</source>
         <translation>Show formatting toolbar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
+        <location filename="../../src/bibletime_init.cpp" line="792"/>
         <source>Show bookshelf</source>
         <translation>Show bookshelf</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
+        <location filename="../../src/bibletime_init.cpp" line="795"/>
         <source>Show bookmarks</source>
         <translation>Show bookmarks</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
+        <location filename="../../src/bibletime_init.cpp" line="798"/>
         <source>Show mag</source>
         <translation>Show mag</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
+        <location filename="../../src/bibletime_init.cpp" line="743"/>
         <source>Toolbars</source>
         <translation>Toolbars</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <location filename="../../src/bibletime_init.cpp" line="774"/>
         <source>Show toolbars in text windows</source>
         <translation>Show toolbars in text windows</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
+        <location filename="../../src/bibletime_init.cpp" line="801"/>
         <source>Show parallel text headers</source>
         <translation>Show parallel text headers</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
+        <location filename="../../src/bibletime_init.cpp" line="747"/>
         <source>O&amp;pen windows</source>
         <translation>O&amp;pen windows</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show &quot;Whats this widget&quot; dialog</source>
         <translation>Show &quot;Whats this widget&quot; dialogue</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
+        <location filename="../../src/bibletime_init.cpp" line="954"/>
         <source>Whats this widget?</source>
         <translation>Whats this widget?</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
+        <location filename="../../src/bibletime_init.cpp" line="126"/>
         <source>Search in all works that are currently open</source>
         <translation>Search in all works that are currently open</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
+        <location filename="../../src/bibletime_init.cpp" line="133"/>
         <source>Search in the standard Bible</source>
         <translation>Search in the standard Bible</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
+        <location filename="../../src/bibletime_slots.cpp" line="532"/>
         <source>New Session</source>
         <translation>New Session</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
+        <location filename="../../src/bibletime.cpp" line="77"/>
         <source>Initializing the SWORD engine...</source>
         <translation>Initialising the SWORD engine...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
+        <location filename="../../src/bibletime.cpp" line="85"/>
         <source>Creating BibleTime&apos;s user interface...</source>
         <translation>Creating BibleTime&apos;s user interface...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
+        <location filename="../../src/bibletime.cpp" line="92"/>
         <source>Initializing menu- and toolbars...</source>
         <translation>Initialising menu- and toolbars...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Unlock Work</source>
         <translation>Unlock Work</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Enter the unlock key for %1.</source>
         <translation>Enter the unlock key for %1.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
+        <location filename="../../src/bibletime.cpp" line="214"/>
         <source>Warning: Invalid unlock key!</source>
         <translation>Warning: Invalid unlock key!</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
+        <location filename="../../src/bibletime.cpp" line="215"/>
         <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
         <translation>The unlock key you provided did not properly unlock this module. Please try again.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
+        <location filename="../../src/bibletime_init.cpp" line="255"/>
         <source>&amp;About BibleTime</source>
         <translation>&amp;About BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
+        <location filename="../../src/bibletime_init.cpp" line="733"/>
         <source>Bookmarks</source>
         <translation>Bookmarks</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
+        <location filename="../../src/bibletime_init.cpp" line="734"/>
         <source>Mag</source>
         <translation>Mag</translation>
     </message>
@@ -475,7 +480,8 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTimeApp</name>
     <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
+        <location filename="../../src/bibletimeapp.cpp" line="59"/>
+        <location filename="../../src/mobile/bibletimeapp.cpp" line="63"/>
         <source>Fatal error!</source>
         <translation>Fatal error!</translation>
     </message>
@@ -483,7 +489,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtAboutDialog</name>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
         <source>BibleTime is an easy to use but powerful Bible study tool.</source>
         <translation>BibleTime is an easy to use but powerful Bible study tool.</translation>
     </message>
@@ -498,52 +504,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>The complete legally binding license is below.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="109"/>
         <source>About BibleTime</source>
         <translation>About BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="121"/>
         <source>&amp;BibleTime</source>
         <translation>&amp;BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="126"/>
         <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
         <translation>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation>(c)1999-2013, The BibleTime Team</translation>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="130"/>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished">(c)1999-2014, The BibleTime Team</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="137"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Contributors</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="148"/>
         <source>The following people contributed to BibleTime:</source>
         <translation>The following people contributed to BibleTime:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="150"/>
         <source>documentation and translation manager</source>
         <translation>documentation and translation manager</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="172"/>
         <source>project manager</source>
         <translation>project manager</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>tester</source>
         <translation>tester</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>usability expert</source>
         <translation>usability expert</translation>
     </message>
@@ -583,52 +589,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>&amp;License</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
         <source>designer</source>
         <translation>designer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="139"/>
         <source>developer</source>
         <translation>developer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
         <source>project founder</source>
         <translation>project founder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="157"/>
         <source>packager</source>
         <translation>packager</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="158"/>
         <source>creator of The Sword Project</source>
         <translation>creator of The Sword Project</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
         <source>domain sponsor</source>
         <translation>domain sponsor</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
         <source>howto</source>
         <translation>howto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="141"/>
         <source>artist</source>
         <translation>artist</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="173"/>
         <source>documentation</source>
         <translation>documentation</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="188"/>
         <source>The following people translated BibleTime into their language:</source>
         <translation>The following people translated BibleTime into their language:</translation>
     </message>
@@ -656,37 +662,37 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBibleKeyWidget</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="110"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
         <source>Next book</source>
         <translation>Next book</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
         <source>Previous book</source>
         <translation>Previous book</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="117"/>
         <source>Next chapter</source>
         <translation>Next chapter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
         <source>Previous chapter</source>
         <translation>Previous chapter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="122"/>
         <source>Next verse</source>
         <translation>Next verse</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
         <source>Previous verse</source>
         <translation>Previous verse</translation>
     </message>
@@ -765,27 +771,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfGroupingMenu</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
         <source>Category/Language</source>
         <translation>Category/Language</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
         <source>Category</source>
         <translation>Category</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
         <source>Language/Category</source>
         <translation>Language/Category</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="105"/>
         <source>Language</source>
         <translation>Language</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="108"/>
         <source>No grouping</source>
         <translation>No grouping</translation>
     </message>
@@ -793,7 +799,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfModel</name>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
+        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="78"/>
         <source>Module</source>
         <translation>Module</translation>
     </message>
@@ -801,23 +807,23 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfWidget</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="157"/>
         <source>Fi&amp;lter:</source>
         <translation>Fi&amp;lter:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="158"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
         <source>Grouping</source>
         <translation>Grouping</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="159"/>
         <source>Change the grouping of items in the bookshelf.</source>
         <translation>Change the grouping of items in the bookshelf.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
         <source>Show/hide works</source>
         <translation>Show/hide works</translation>
     </message>
@@ -831,69 +837,130 @@ This file is distributed under the same license as the Bibetime package.</transl
     </message>
 </context>
 <context>
+    <name>BtConfig</name>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="46"/>
+        <source>Old testament</source>
+        <translation>Old testament</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="47"/>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation>Moses/Pentateuch/Torah</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="48"/>
+        <source>History</source>
+        <translation>History</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="49"/>
+        <source>Prophets</source>
+        <translation>Prophets</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="50"/>
+        <source>New testament</source>
+        <translation>New testament</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="51"/>
+        <source>Gospels</source>
+        <translation>Gospels</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="52"/>
+        <source>Letters/Epistles</source>
+        <translation>Letters/Epistles</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="53"/>
+        <source>Paul&apos;s Epistles</source>
+        <translation>Paul&apos;s Epistles</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="89"/>
+        <source>Error loading configuration!</source>
+        <translation>Error loading configuration!</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="90"/>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</translation>
+    </message>
+</context>
+<context>
+    <name>BtConfigCore</name>
+    <message>
+        <location filename="../../src/backend/config/btconfigcore.cpp" line="62"/>
+        <source>Default Session</source>
+        <translation>Default Session</translation>
+    </message>
+</context>
+<context>
     <name>BtDisplaySettingsButton</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="103"/>
         <source>Use linebreaks after each verse</source>
         <translation>Use linebreaks after each verse</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
         <source>Show verse numbers</source>
         <translation>Show verse numbers</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
         <source>Show headings</source>
         <translation>Show headings</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
         <source>Highlight words of Jesus</source>
         <translation>Highlight words of Jesus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
         <source>Show Hebrew vowel points</source>
         <translation>Show Hebrew vowel points</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
         <source>Show Hebrew cantillation marks</source>
         <translation>Show Hebrew cantillation marks</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
         <source>Show Greek accents</source>
         <translation>Show Greek accents</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
         <source>Use alternative textual variant</source>
         <translation>Use alternative textual variant</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
         <source>Show scripture cross-references</source>
         <translation>Show scripture cross-references</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
         <source>Show footnotes</source>
         <translation>Show footnotes</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
         <source>Show morph segmentation</source>
         <translation>Show morph segmentation</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="120"/>
         <source>Display settings</source>
         <translation>Display settings</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="123"/>
         <source>Display settings: No options available</source>
         <translation>Display settings: No options available</translation>
     </message>
@@ -901,27 +968,45 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtEditBookmarkDialog</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="71"/>
         <source>Edit Bookmark</source>
         <translation>Edit Bookmark</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
         <source>Location:</source>
         <translation>Location:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
         <source>Title:</source>
         <translation>Title:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
         <source>Description:</source>
         <translation>Description:</translation>
     </message>
 </context>
 <context>
+    <name>BtFindWidget</name>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="28"/>
+        <source>Previous</source>
+        <translation>Previous</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="29"/>
+        <source>Next</source>
+        <translation>Next</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="74"/>
+        <source>Match case</source>
+        <translation>Match case</translation>
+    </message>
+</context>
+<context>
     <name>BtFontChooserWidget</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
@@ -942,27 +1027,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="151"/>
         <source>&amp;Language:</source>
         <translation>&amp;Language:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
         <source>The font selection below will apply to all texts in this language</source>
         <translation>The font selection below will apply to all texts in this language</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
         <source>Use custom font</source>
         <translation>Use custom font</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
         <source>Optionally specify a custom font for each language:</source>
         <translation>Optionally specify a custom font for each language:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="150"/>
         <source>Fonts</source>
         <translation>Fonts</translation>
     </message>
@@ -970,67 +1055,67 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtIndexPage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="124"/>
         <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
         <translation>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
         <source>Automatically delete orphaned indexes when BibleTime starts</source>
         <translation>Automatically delete orphaned indexes when BibleTime starts</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="127"/>
         <source>Delete the selected indexes</source>
         <translation>Delete the selected indexes</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
         <source>Delete</source>
         <translation>Delete</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="130"/>
         <source>Create new indexes for the selected works</source>
         <translation>Create new indexes for the selected works</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Work</source>
         <translation>Work</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Index size</source>
         <translation>Index size</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="107"/>
         <source>%1 KiB</source>
         <translation>%1 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="114"/>
         <source>0 KiB</source>
         <translation>0 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="122"/>
         <source>Search Indexes</source>
         <translation>Search Indexes</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="91"/>
         <source>Indexed Works</source>
         <translation>Indexed Works</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="96"/>
         <source>Unindexed Works</source>
         <translation>Unindexed Works</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
         <source>Create...</source>
         <translation>Create...</translation>
     </message>
@@ -1056,17 +1141,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallModuleChooserDialogModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="88"/>
         <source>Work</source>
         <translation>Work</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="89"/>
         <source>Installation source</source>
         <translation>Installation source</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="90"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
@@ -1159,12 +1244,12 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="388"/>
         <source>Delete Source?</source>
         <translation>Delete Source?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="389"/>
         <source>Do you really want to delete this source?</source>
         <translation>Do you really want to delete this source?</translation>
     </message>
@@ -1177,17 +1262,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPageModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="75"/>
         <source>Work</source>
         <translation>Work</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="76"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="77"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
@@ -1203,99 +1288,99 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPathDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="35"/>
         <source>Bookshelf Folders</source>
         <translation>Bookshelf Folders</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
         <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
         <translation>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="45"/>
         <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
         <translation>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="48"/>
         <source>Configure bookshelf folders</source>
         <translation>Configure bookshelf folders</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="53"/>
         <source>Configuration file for the folders is: </source>
         <translation>Configuration file for the folders is: </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="61"/>
         <source>Folders where new works can be installed</source>
         <translation>Folders where new works can be installed</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
         <source>Read-only folders</source>
         <translation>Read-only folders</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="66"/>
         <source>Nonexistent folders</source>
         <translation>Nonexistent folders</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="80"/>
         <source>&amp;Add...</source>
         <translation>&amp;Add...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="81"/>
         <source>Add new folder</source>
         <translation>Add new folder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="86"/>
         <source>&amp;Edit...</source>
         <translation>&amp;Edit...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="87"/>
         <source>Edit the selected folder</source>
         <translation>Edit the selected folder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="92"/>
         <source>&amp;Remove</source>
         <translation>&amp;Remove</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="93"/>
         <source>Remove the selected folder</source>
         <translation>Remove the selected folder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="167"/>
         <source>This default folder in your home directory can&apos;t be removed</source>
         <translation>This default folder in your home directory can&apos;t be removed</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="194"/>
         <source>Choose Folder</source>
         <translation>Choose Folder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>Use Folder?</source>
         <translation>Use Folder?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
         <translation>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
         <translation>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</translation>
     </message>
@@ -1303,52 +1388,42 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallProgressDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Work</source>
         <translation>Work</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Progress</source>
         <translation>Progress</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>Stop</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="60"/>
         <source>Stop All</source>
         <translation>Stop All</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Completed</source>
         <translation>Completed</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>Cancelled</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="55"/>
         <source>Waiting for turn...</source>
         <translation>Waiting for turn...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="113"/>
         <source>Preparing install...</source>
         <translation>Preparing install...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="37"/>
         <source>Install Progress</source>
         <translation>Install Progress</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Failed</source>
         <translation>Failed</translation>
     </message>
@@ -1356,17 +1431,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
         <source>Language for names of Bible books:</source>
         <translation>Language for names of Bible books:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation>The languages which can be used for the biblical booknames</translation>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="136"/>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="133"/>
         <source>Languages</source>
         <translation>Languages</translation>
     </message>
@@ -1416,7 +1491,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtModuleManagerDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="57"/>
         <source>Bookshelf Manager</source>
         <translation>Bookshelf Manager</translation>
     </message>
@@ -1424,7 +1499,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkAction</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="103"/>
         <source>&amp;Open work</source>
         <translation>&amp;Open work</translation>
     </message>
@@ -1432,12 +1507,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkActionMenu</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="42"/>
         <source>&amp;Grouping order</source>
         <translation>&amp;Grouping order</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="43"/>
         <source>Sets the grouping order for the items in this menu.</source>
         <translation>Sets the grouping order for the items in this menu.</translation>
     </message>
@@ -1473,47 +1548,47 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtRemovePage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="100"/>
         <source>Select &amp;works to uninstall:</source>
         <translation>Select &amp;works to uninstall:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&amp;Remove...</source>
         <translation>&amp;Remove...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="98"/>
         <source>Remove</source>
         <translation>Remove</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="111"/>
         <source>Start removal of %1 works:</source>
         <translation>Start removal of %1 works:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="114"/>
         <source>Start removal:</source>
         <translation>Start removal:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="145"/>
         <source>You selected the following work(s): </source>
         <translation>You selected the following work(s): </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="149"/>
         <source>Do you really want to remove them from your system?</source>
         <translation>Do you really want to remove them from your system?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
         <source>Remove the selected works</source>
         <translation>Remove the selected works</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="151"/>
         <source>Remove Works?</source>
         <translation>Remove Works?</translation>
     </message>
@@ -1534,12 +1609,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtSearchModuleChooserDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="47"/>
         <source>Works to Search in</source>
         <translation>Works to Search in</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="49"/>
         <source>Select the works which should be searched.</source>
         <translation>Select the works which should be searched.</translation>
     </message>
@@ -1623,24 +1698,165 @@ shortcut</translation>
     </message>
 </context>
 <context>
+    <name>BtStandardWorksTab</name>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="169"/>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
+        <translation>Bible:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="174"/>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation>The standard Bible is used when a hyperlink into a Bible is clicked</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</source>
+        <translation>Commentary:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="178"/>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation>The standard commentary is used when a hyperlink into a commentary is clicked</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
+        <translation>Lexicon:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="182"/>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation>The standard lexicon is used when a hyperlink into a lexicon is clicked</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</source>
+        <translation>Daily devotional:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="186"/>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation>The standard devotional will be used to display a short start up devotional</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation>Hebrew Strong&apos;s lexicon:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="190"/>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation>Greek Strong&apos;s lexicon:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="194"/>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</source>
+        <translation>Hebrew morphological lexicon:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="198"/>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</source>
+        <translation>Greek morphological lexicon:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="202"/>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</translation>
+    </message>
+</context>
+<context>
+    <name>BtTextFiltersTab</name>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="74"/>
+        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
+        <translation>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="78"/>
+        <source>Insert line break after each verse</source>
+        <translation>Insert line break after each verse</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
+        <source>Show verse numbers</source>
+        <translation>Show verse numbers</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
+        <source>Show section headings</source>
+        <translation>Show section headings</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
+        <source>Show scripture cross-references</source>
+        <translation>Show scripture cross-references</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="82"/>
+        <source>Show Greek accents</source>
+        <translation>Show Greek accents</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="83"/>
+        <source>Show Hebrew vowel points</source>
+        <translation>Show Hebrew vowel points</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="84"/>
+        <source>Show Hebrew cantillation marks</source>
+        <translation>Show Hebrew cantillation marks</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="85"/>
+        <source>Show morph segmentation</source>
+        <translation>Show morph segmentation</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="86"/>
+        <source>Use textual variants</source>
+        <translation>Use textual variants</translation>
+    </message>
+</context>
+<context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
         <source>Add/remove/replace</source>
         <translation>Add/remove/replace</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
         <source>Remove</source>
         <translation>Remove</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
         <source>Replace</source>
         <translation>Replace</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
         <source>Add</source>
         <translation>Add</translation>
     </message>
@@ -1648,87 +1864,87 @@ shortcut</translation>
 <context>
     <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="69"/>
         <source>Tip Of The Day</source>
         <translation>Tip Of The Day</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="83"/>
         <source>Show tips at startup</source>
         <translation>Show tips at startup</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="94"/>
         <source>Next Tip</source>
         <translation>Next Tip</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
         <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
         <translation>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
         <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
         <translation>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="134"/>
         <source>To learn more about the BibleTime project please go to our web site.</source>
         <translation>To learn more about the BibleTime project please go to our web site.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="137"/>
         <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
         <translation>To synchronise a commentary window with the active Bible window, activate the commentary window and select this icon.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
         <source>Select the icon again to stop the synchronization.</source>
         <translation>Select the icon again to stop the synchronisation.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="142"/>
         <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
         <translation>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="147"/>
         <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
         <translation>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="151"/>
         <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
         <translation>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="154"/>
         <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
         <translation>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="157"/>
         <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
         <translation>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="163"/>
         <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
         <translation>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialogue will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="178"/>
         <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
         <translation>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="168"/>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
         <translation>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
         <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
         <translation>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the Strongs Greek and Strongs Hebrew lexicons from Crosswire installed.</translation>
     </message>
@@ -1744,49 +1960,49 @@ shortcut</translation>
 <context>
     <name>CAcceleratorSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="128"/>
         <source>Choose action group:</source>
         <translation>Choose action group:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="130"/>
         <source>Main Window</source>
         <translation>Main Window</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
         <source>All text windows</source>
         <translation>All text windows</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="132"/>
         <source>Bible windows</source>
         <translation>Bible windows</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
         <source>Commentary windows</source>
         <translation>Commentary windows</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="134"/>
         <source>Lexicon windows</source>
         <translation>Lexicon windows</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
         <source>Book windows</source>
         <translation>Book windows</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
         <source>
    &quot;%1&quot; in the &quot;%2&quot; group</source>
         <translation>
    &quot;%1&quot; in the &quot;%2&quot; group</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
         <source>Shortcuts</source>
         <translation>Shortcuts</translation>
     </message>
@@ -1794,95 +2010,95 @@ shortcut</translation>
 <context>
     <name>CBibleReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="64"/>
         <source>Next book</source>
         <translation>Next book</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="68"/>
         <source>Previous book</source>
         <translation>Previous book</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="72"/>
         <source>Next chapter</source>
         <translation>Next chapter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="76"/>
         <source>Previous chapter</source>
         <translation>Previous chapter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="80"/>
         <source>Next verse</source>
         <translation>Next verse</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="84"/>
         <source>Previous verse</source>
         <translation>Previous verse</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="89"/>
         <source>Copy chapter</source>
         <translation>Copy chapter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="92"/>
         <source>Save chapter as plain text</source>
         <translation>Save chapter as plain text</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="95"/>
         <source>Save chapter as HTML</source>
         <translation>Save chapter as HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="98"/>
         <source>Print chapter</source>
         <translation>Print chapter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="110"/>
         <source>Text of reference</source>
         <translation>Text of reference</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
         <source>Reference with text</source>
         <translation>Reference with text</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="253"/>
         <source>Bible window</source>
         <translation>Bible window</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="263"/>
         <source>Copy...</source>
         <translation>Copy...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="274"/>
         <source>Save...</source>
         <translation>Save...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="287"/>
         <source>Print...</source>
         <translation>Print...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="371"/>
         <source>Copying</source>
         <translation>Copying</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="390"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="408"/>
         <source>Saving</source>
         <translation>Saving</translation>
     </message>
@@ -1890,7 +2106,7 @@ shortcut</translation>
 <context>
     <name>CBookReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
+        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="70"/>
         <source>Toggle tree view</source>
         <translation>Toggle tree view</translation>
     </message>
@@ -1898,93 +2114,93 @@ shortcut</translation>
 <context>
     <name>CBookmarkIndex</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
         <source>Bookmarks</source>
         <translation>Bookmarks</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="92"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="583"/>
         <source>New folder</source>
         <translation>New folder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
         <source>Rename folder</source>
         <translation>Rename folder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
         <source>Delete Items</source>
         <translation>Delete Items</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="704"/>
         <source>Do you really want to delete the selected items and child-items?</source>
         <translation>Do you really want to delete the selected items and child-items?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="814"/>
         <source>The work to which the bookmark points to is not installed.</source>
         <translation>The work to which the bookmark points to is not installed.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
         <source>Print bookmarks...</source>
         <translation>Print bookmarks...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="103"/>
         <source>Remove selected items...</source>
         <translation>Remove selected items...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
         <source>Import to folder...</source>
         <translation>Import to folder...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
         <source>Edit bookmark...</source>
         <translation>Edit bookmark...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
         <source>Sort folder bookmarks...</source>
         <translation>Sort folder bookmarks...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
         <source>Sort all bookmarks...</source>
         <translation>Sort all bookmarks...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="100"/>
         <source>Export from folder...</source>
         <translation>Export from folder...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="393"/>
         <source>Can drop only bookmarks or one folder</source>
         <translation>Can drop only bookmarks or one folder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="398"/>
         <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
         <translation>Can&apos;t drop folder into the folder itself or into its subfolder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
         <source>Copy</source>
         <translation>Copy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="406"/>
         <source>Move</source>
         <translation>Move</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="467"/>
         <source>Drag references from text views to this view</source>
         <translation>Drag references from text views to this view</translation>
     </message>
@@ -1992,42 +2208,42 @@ shortcut</translation>
 <context>
     <name>CCommentaryReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="31"/>
         <source>Next book</source>
         <translation>Next book</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="35"/>
         <source>Previous book</source>
         <translation>Previous book</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="39"/>
         <source>Next chapter</source>
         <translation>Next chapter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="43"/>
         <source>Previous chapter</source>
         <translation>Previous chapter</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="47"/>
         <source>Next verse</source>
         <translation>Next verse</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="51"/>
         <source>Previous verse</source>
         <translation>Previous verse</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="56"/>
         <source>Synchronize</source>
         <translation>Synchronise</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="59"/>
         <source>Synchronize the displayed entry of this work with the active Bible window</source>
         <translation>Synchronise the displayed entry of this work with the active Bible window</translation>
     </message>
@@ -2035,7 +2251,7 @@ shortcut</translation>
 <context>
     <name>CConfigurationDialog</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="41"/>
         <source>Configure BibleTime</source>
         <translation>Configure BibleTime</translation>
     </message>
@@ -2043,67 +2259,67 @@ shortcut</translation>
 <context>
     <name>CDisplaySettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
         <source>Display templates</source>
         <translation>Display templates</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
         <source>Available display styles:</source>
         <translation>Available display styles:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="113"/>
         <source>Style preview</source>
         <translation>Style preview</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="131"/>
         <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
         <translation>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="138"/>
         <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
         <translation>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="145"/>
         <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
         <translation>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="155"/>
         <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
         <translation>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="160"/>
         <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
         <translation>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="106"/>
         <source>Display templates define how text is displayed.</source>
         <translation>Display templates define how text is displayed.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="110"/>
         <source>Show the BibleTime logo on startup</source>
         <translation>Show the BibleTime logo on startup</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
         <source>Show startup logo</source>
         <translation>Show startup logo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="150"/>
         <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
         <translation>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="101"/>
         <source>Display</source>
         <translation>Display</translation>
     </message>
@@ -2111,62 +2327,62 @@ shortcut</translation>
 <context>
     <name>CDisplayWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="215"/>
         <source>Back in history</source>
         <translation>Back in history</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="223"/>
         <source>Forward in history</source>
         <translation>Forward in history</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="192"/>
         <source>Select all</source>
         <translation>Select all</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="196"/>
         <source>Copy</source>
         <translation>Copy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="200"/>
         <source>Find...</source>
         <translation>Find...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="204"/>
         <source>Change location</source>
         <translation>Change location</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="209"/>
         <source>Search with works of this window</source>
         <translation>Search with works of this window</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="393"/>
         <source>Work chooser buttons</source>
         <translation>Work chooser buttons</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="403"/>
         <source>Text area header</source>
         <translation>Text area header</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="453"/>
         <source>Navigation</source>
         <translation>Navigation</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="459"/>
         <source>Tool</source>
         <translation>Tool</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="465"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
@@ -2174,61 +2390,61 @@ shortcut</translation>
 <context>
     <name>CHTMLWriteDisplay</name>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
         <source>Bold</source>
         <translation>Bold</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="60"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="67"/>
         <source>Italic</source>
         <translation>Italic</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="79"/>
         <source>Underline</source>
         <translation>Underline</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="84"/>
         <source>Left</source>
         <translation>Left</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="94"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="99"/>
         <source>Center</source>
         <translation>Center</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="104"/>
         <source>Right</source>
         <translation>Right</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="231"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="243"/>
         <source>Font size</source>
         <translation>Font size</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="255"/>
         <source>Font color</source>
         <translation>Font colour</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="89"/>
         <source>Align left</source>
         <translation>Align left</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="109"/>
         <source>Align right</source>
         <translation>Align right</translation>
     </message>
@@ -2236,17 +2452,17 @@ shortcut</translation>
 <context>
     <name>CHTMLWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="122"/>
         <source>Module not writable</source>
         <translation>Module not writable</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="124"/>
         <source>Module is not writable.</source>
         <translation>Module is not writable.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="125"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Either the module may not be edited, or you do not have write permission.</translation>
     </message>
@@ -2254,22 +2470,22 @@ shortcut</translation>
 <context>
     <name>CLexiconKeyChooser</name>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
         <source>Entries of the current work</source>
         <translation>Entries of the current work</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Next entry</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="49"/>
         <source>Previous entry</source>
         <translation>Previous entry</translation>
     </message>
@@ -2277,70 +2493,70 @@ shortcut</translation>
 <context>
     <name>CLexiconReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Next entry</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="51"/>
         <source>Previous entry</source>
         <translation>Previous entry</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="55"/>
         <source>Copy reference only</source>
         <translation>Copy reference only</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
         <source>Save entry as HTML</source>
         <translation>Save entry as HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
         <source>Print reference only</source>
         <translation>Print reference only</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
         <source>Strong&apos;s Search</source>
         <translation>Strong&apos;s Search</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
         <source>Entry with text</source>
         <translation>Entry with text</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="134"/>
         <source>Entry as plain text</source>
         <translation>Entry as plain text</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="265"/>
         <source>Lexicon window</source>
         <translation>Lexicon window</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="272"/>
         <source>Copy...</source>
         <translation>Copy...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="281"/>
         <source>Save...</source>
         <translation>Save...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="297"/>
         <source>Print...</source>
         <translation>Print...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="340"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="364"/>
         <source>Saving</source>
         <translation>Saving</translation>
     </message>
@@ -2348,91 +2564,112 @@ shortcut</translation>
 <context>
     <name>CPlainWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="235"/>
         <source>Sync with active Bible</source>
         <translation>Sync with active Bible</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="245"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="249"/>
         <source>Save text</source>
         <translation>Save text</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="254"/>
         <source>Delete current entry</source>
         <translation>Delete current entry</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="263"/>
         <source>Restore original text</source>
         <translation>Restore original text</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="163"/>
         <source>Module not writable</source>
         <translation>Module not writable</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="165"/>
         <source>Module is not writable.</source>
         <translation>Module is not writable.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="166"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Either the module may not be edited, or you do not have write permission.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="240"/>
         <source>Synchronize (show the same verse) with the active Bible window</source>
         <translation>Synchronise (show the same verse) with the active Bible window</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="258"/>
         <source>Delete current entry (no undo)</source>
         <translation>Delete current entry (no undo)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="267"/>
         <source>Restore original text, new text will be lost</source>
         <translation>Restore original text, new text will be lost</translation>
     </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save Text?</source>
+        <translation>Save Text?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <source>Save text before closing?</source>
+        <translation>Save text before closing?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save changed text?</source>
+        <translation>Save changed text?</translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="232"/>
         <source>Save Search Analysis</source>
         <translation>Save Search Analysis</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation>HTML files (*.html;*.HTML;*.HTM;*.htm)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="243"/>
         <source>BibleTime Search Analysis</source>
         <translation>BibleTime Search Analysis</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation>Search text :</translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="234"/>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="259"/>
+        <source>Search text:</source>
+        <translation>Search text:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="263"/>
+        <source>Results by work and book</source>
+        <translation>Results by work and book</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="265"/>
         <source>Book</source>
         <translation>Book</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="293"/>
         <source>Total hits</source>
         <translation>Total hits</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="303"/>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
         <translation>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</translation>
     </message>
@@ -2440,168 +2677,168 @@ shortcut</translation>
 <context>
     <name>CSwordModuleInfo</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="763"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="766"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="774"/>
         <source>unknown</source>
         <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="771"/>
         <source>Markup</source>
         <translation>Markup</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
         <source>Location</source>
         <translation>Location</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="782"/>
         <source>Language</source>
         <translation>Language</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="787"/>
         <source>Category</source>
         <translation>Category</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="792"/>
         <source>LCSH</source>
         <translation>LCSH</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="796"/>
         <source>Writable</source>
         <translation>Writable</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>yes</source>
         <translation>yes</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>no</source>
         <translation>no</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="801"/>
         <source>Unlock key</source>
         <translation>Unlock key</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="822"/>
         <source>Features</source>
         <translation>Features</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="830"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Take care, this work contains cult / questionable material!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="834"/>
         <source>About</source>
         <translation>About</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="856"/>
         <source>Distribution license</source>
         <translation>Distribution license</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="857"/>
         <source>Distribution source</source>
         <translation>Distribution source</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="858"/>
         <source>Distribution notes</source>
         <translation>Distribution notes</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="859"/>
         <source>Text source</source>
         <translation>Text source</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="860"/>
         <source>Copyright notes</source>
         <translation>Copyright notes</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
         <source>Copyright holder</source>
         <translation>Copyright holder</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
         <source>Copyright date</source>
         <translation>Copyright date</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
         <source>Copyright contact name</source>
         <translation>Copyright contact name</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
         <source>Copyright contact address</source>
         <translation>Copyright contact address</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
         <source>Copyright contact email</source>
         <translation>Copyright contact email</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="956"/>
         <source>Bibles</source>
         <translation>Bibles</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="958"/>
         <source>Commentaries</source>
         <translation>Commentaries</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="960"/>
         <source>Books</source>
         <translation>Books</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="962"/>
         <source>Cults/Unorthodox</source>
         <translation>Cults/Unorthodox</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="964"/>
         <source>Maps and Images</source>
         <translation>Maps and Images</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="966"/>
         <source>Daily Devotionals</source>
         <translation>Daily Devotionals</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="968"/>
         <source>Lexicons and Dictionaries</source>
         <translation>Lexicons and Dictionaries</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="970"/>
         <source>Glossaries</source>
         <translation>Glossaries</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="972"/>
         <source>Unknown</source>
         <translation>Unknown</translation>
     </message>
@@ -2609,17 +2846,17 @@ shortcut</translation>
 <context>
     <name>CSwordSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="43"/>
         <source>Standard works</source>
         <translation>Standard works</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="44"/>
         <source>Text filters</source>
         <translation>Text filters</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="41"/>
         <source>Desk</source>
         <translation>Desk</translation>
     </message>
@@ -2627,71 +2864,71 @@ shortcut</translation>
 <context>
     <name>CSwordSetupInstallSourcesDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="47"/>
         <source>Caption</source>
         <translation>Caption</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="68"/>
         <source>Path</source>
         <translation>Path</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="91"/>
         <source>Get list...</source>
         <translation>Get list...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="92"/>
         <source>Download a list of sources from CrossWire server and add sources</source>
         <translation>Download a list of sources from CrossWire server and add sources</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
         <source>Please provide a caption.</source>
         <translation>Please provide a caption.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
         <source>A source with this caption already exists. Please provide a different caption.</source>
         <translation>A source with this caption already exists. Please provide a different caption.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
         <source>Please provide a server name.</source>
         <translation>Please provide a server name.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
         <source>Please provide a valid, readable path.</source>
         <translation>Please provide a valid, readable path.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Please provide a path.</source>
         <translation>Please provide a path.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="160"/>
         <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
 
 Do you want to continue?</source>
@@ -2700,106 +2937,87 @@ Do you want to continue?</source>
 Do you want to continue?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
         <source>Get source list from remote server?</source>
         <translation>Get source list from remote server?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="167"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="168"/>
         <source>Downloading List</source>
         <translation>Downloading List</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="178"/>
         <source>Connecting...</source>
         <translation>Connecting...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="197"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="198"/>
         <source>Refreshing...</source>
         <translation>Refreshing...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="39"/>
         <source>New  Installation Source</source>
         <translation>New  Installation Source</translation>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>Save text before closing?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>Save changed text?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>Save Text?</translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="178"/>
         <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
         <translation>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="194"/>
         <source>Abbreviation</source>
         <translation>Abbreviation</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="203"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="290"/>
         <source>Cross references</source>
         <translation>Cross references</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="343"/>
         <source>Footnote</source>
         <translation>Footnote</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="374"/>
         <source>Strongs</source>
         <translation>Strongs</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="451"/>
         <source>Morphology</source>
         <translation>Morphology</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="472"/>
         <source>Word lookup</source>
         <translation>Word lookup</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="60"/>
         <source>Copy</source>
         <translation>Copy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
         <source>Select all</source>
         <translation>Select all</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="80"/>
         <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
         <translation>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</translation>
     </message>
@@ -2807,28 +3025,28 @@ Do you want to continue?</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="412"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="422"/>
         <source>Indexing aborted</source>
         <translation>Indexing aborted</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="413"/>
         <source>An internal error occurred while building the index: %1</source>
         <translation>An internal error occurred while building the index: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="423"/>
         <source>An internal error occurred while building the index.</source>
         <translation>An internal error occurred while building the index.</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="522"/>
         <source>Search aborted</source>
         <translation>Search aborted</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="523"/>
         <source>An internal error occurred while executing your search.</source>
         <translation>An internal error occurred while executing your search.</translation>
     </message>
@@ -2869,7 +3087,7 @@ Do you want to continue?</translation>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="122"/>
         <source>Bibles</source>
         <translation>Bibles</translation>
     </message>
@@ -2886,740 +3104,740 @@ Do you want to continue?</translation>
         <translation>Books</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="390"/>
         <source>Added text</source>
         <translation>Added text</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="143"/>
         <source>Names of languages</source>
         <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
         <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
         <translation>Names of languages</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="148"/>
         <source>Afrikaans</source>
         <extracomment>Language name af</extracomment>
         <translation>Afrikaans</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="151"/>
         <source>Amuzgo, Guerrero</source>
         <extracomment>Language name amu</extracomment>
         <translation>Amuzgo, Guerrero</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="153"/>
         <source>English, Old (ca.450-1100)</source>
         <extracomment>Language name ang</extracomment>
         <translation>English, Old (ca.450-1100)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="155"/>
         <source>Arabic</source>
         <extracomment>Language name ar</extracomment>
         <translation>Arabic</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="158"/>
         <source>Azerbaijani</source>
         <extracomment>Language name az</extracomment>
         <translation>Azerbaijani</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="160"/>
         <source>Azerbaijani, South</source>
         <extracomment>Language name azb</extracomment>
         <translation>Azerbaijani, South</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="165"/>
         <source>Belarusian</source>
         <extracomment>Language name be</extracomment>
         <translation>Belarusian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="167"/>
         <source>Bulgarian</source>
         <extracomment>Language name bg</extracomment>
         <translation>Bulgarian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="173"/>
         <source>Breton</source>
         <extracomment>Language name br</extracomment>
         <translation>Breton</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="175"/>
         <source>Bosnian</source>
         <extracomment>Language name bs</extracomment>
         <translation>Bosnian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="177"/>
         <source>Catalan</source>
         <extracomment>Language name ca</extracomment>
         <translation>Catalan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="180"/>
         <source>Chinantec, Comaltepec</source>
         <extracomment>Language name cco</extracomment>
         <translation>Chinantec, Comaltepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="182"/>
         <source>Cebuano</source>
         <extracomment>Language name ceb</extracomment>
         <translation>Cebuano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
         <source>Chamorro</source>
         <extracomment>Language name ch</extracomment>
         <translation>Chamorro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
         <source>Chontal, Highland Oaxaca</source>
         <extracomment>Language name chd</extracomment>
         <translation>Chontal, Highland Oaxaca</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
         <source>Chinantec, Quiotepec</source>
         <extracomment>Language name chq</extracomment>
         <translation>Chinantec, Quiotepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="190"/>
         <source>Chinantec, Ozumacu00edn</source>
         <extracomment>Language name chz</extracomment>
         <translation>Chinantec, Ozumacu00edn</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="193"/>
         <source>Cakchiquel, Western</source>
         <extracomment>Language name ckw</extracomment>
         <translation>Cakchiquel, Western</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="195"/>
         <source>Chinantec, Lalana</source>
         <extracomment>Language name cnl</extracomment>
         <translation>Chinantec, Lalana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="197"/>
         <source>Chinantec, Tepetotutla</source>
         <extracomment>Language name cnt</extracomment>
         <translation>Chinantec, Tepetotutla</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="199"/>
         <source>Coptic</source>
         <extracomment>Language name cop</extracomment>
         <translation>Coptic</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
         <source>Czech</source>
         <extracomment>Language name cs</extracomment>
         <translation>Czech</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
         <source>Chinantec, Sochiapan</source>
         <extracomment>Language name cso</extracomment>
         <translation>Chinantec, Sochiapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
         <source>Chol, Tila</source>
         <extracomment>Language name cti</extracomment>
         <translation>Chol, Tila</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
         <source>Chatino, Western Highland</source>
         <extracomment>Language name ctp</extracomment>
         <translation>Chatino, Western Highland</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
         <source>Church Slavic</source>
         <extracomment>Language name cu</extracomment>
         <translation>Church Slavic</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="212"/>
         <source>Welsh</source>
         <extracomment>Language name cy</extracomment>
         <translation>Welsh</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
         <source>Danish</source>
         <extracomment>Language name da</extracomment>
         <translation>Danish</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
         <source>German</source>
         <extracomment>Language name de</extracomment>
         <translation>German</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
         <source>Duruma</source>
         <extracomment>Language name dug</extracomment>
         <translation>Duruma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="221"/>
         <source>Greek, Modern (1453-)</source>
         <extracomment>Language name el</extracomment>
         <translation>Greek, Modern (1453-)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
         <source>English</source>
         <extracomment>Language name en</extracomment>
         <translation>English</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="225"/>
         <source>American English</source>
         <extracomment>Language name en_US</extracomment>
         <translation>American English</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="227"/>
         <source>English, Middle (1100-1500)</source>
         <extracomment>Language name enm</extracomment>
         <translation>English, Middle (1100-1500)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="229"/>
         <source>Esperanto</source>
         <extracomment>Language name eo</extracomment>
         <translation>Esperanto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="231"/>
         <source>Spanish</source>
         <extracomment>Language name es</extracomment>
         <translation>Spanish</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
         <source>Estonian</source>
         <extracomment>Language name et</extracomment>
         <translation>Estonian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
         <source>Basque</source>
         <extracomment>Language name eu</extracomment>
         <translation>Basque</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
         <source>Persian</source>
         <extracomment>Language name fa</extracomment>
         <translation>Persian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
         <source>Finnish</source>
         <extracomment>Language name fi</extracomment>
         <translation>Finnish</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="243"/>
         <source>French</source>
         <extracomment>Language name fr</extracomment>
         <translation>French</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="245"/>
         <source>Frisian</source>
         <extracomment>Language name fy</extracomment>
         <translation>Frisian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="247"/>
         <source>Irish</source>
         <extracomment>Language name ga</extracomment>
         <translation>Irish</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="249"/>
         <source>Gaelic (Scots)</source>
         <extracomment>Language name gd</extracomment>
         <translation>Gaelic (Scots)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="251"/>
         <source>Geez</source>
         <extracomment>Language name gez</extracomment>
         <translation>Geez</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
         <source>Gothic</source>
         <extracomment>Language name got</extracomment>
         <translation>Gothic</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
         <source>Manx</source>
         <extracomment>Language name gv</extracomment>
         <translation>Manx</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
         <source>Greek, Ancient (to 1453)</source>
         <extracomment>Language name grc</extracomment>
         <translation>Greek, Ancient (to 1453)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="262"/>
         <source>Hebrew</source>
         <extracomment>Language name he</extracomment>
         <translation>Hebrew</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
         <source>Hausa</source>
         <extracomment>Language name hau</extracomment>
         <translation>Hausa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
         <source>Hawaiian</source>
         <extracomment>Language name haw</extracomment>
         <translation>Hawaiian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
         <source>Hindi</source>
         <extracomment>Language name hi</extracomment>
         <translation>Hindi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="271"/>
         <source>Croatian</source>
         <extracomment>Language name hr</extracomment>
         <translation>Croatian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="275"/>
         <source>Hungarian</source>
         <extracomment>Language name hu</extracomment>
         <translation>Hungarian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
         <source>Huave, San Mateo Del Mar</source>
         <extracomment>Language name huv</extracomment>
         <translation>Huave, San Mateo Del Mar</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
         <source>Armenian</source>
         <extracomment>Language name hy</extracomment>
         <translation>Armenian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
         <source>Indonesian</source>
         <extracomment>Language name id</extracomment>
         <translation>Indonesian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
         <source>Icelandic</source>
         <extracomment>Language name is</extracomment>
         <translation>Icelandic</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
         <source>Italian</source>
         <extracomment>Language name it</extracomment>
         <translation>Italian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="291"/>
         <source>Itzu00e1</source>
         <extracomment>Language name itz</extracomment>
         <translation>Itzu00e1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="293"/>
         <source>Ixil, San Juan Cotzal</source>
         <extracomment>Language name ixl</extracomment>
         <translation>Ixil, San Juan Cotzal</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
         <source>Japanese</source>
         <extracomment>Language name ja</extracomment>
         <translation>Japanese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
         <source>Jacalteco, Eastern</source>
         <extracomment>Language name jac</extracomment>
         <translation>Jacalteco, Eastern</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
         <source>Javanese, Caribbean</source>
         <extracomment>Language name jvn</extracomment>
         <translation>Javanese, Caribbean</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="302"/>
         <source>Georgian</source>
         <extracomment>Language name ka</extracomment>
         <translation>Georgian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
         <source>Korean</source>
         <extracomment>Language name ko</extracomment>
         <translation>Korean</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="315"/>
         <source>Kurdish</source>
         <extracomment>Language name ku</extracomment>
         <translation>Kurdish</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
         <source>Kirghiz</source>
         <extracomment>Language name ky</extracomment>
         <translation>Kirghiz</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
         <source>Latin</source>
         <extracomment>Language name la</extracomment>
         <translation>Latin</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
         <source>Lacandon</source>
         <extracomment>Language name lac</extracomment>
         <translation>Lacandon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
         <source>Lithuanian</source>
         <extracomment>Language name lt</extracomment>
         <translation>Lithuanian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="332"/>
         <source>Latvian</source>
         <extracomment>Language name lv</extracomment>
         <translation>Latvian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="334"/>
         <source>Malagasy</source>
         <extracomment>Language name mg</extracomment>
         <translation>Malagasy</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="337"/>
         <source>Maori</source>
         <extracomment>Language name mi</extracomment>
         <translation>Maori</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="339"/>
         <source>Mixe, Isthmus</source>
         <extracomment>Language name mir</extracomment>
         <translation>Mixe, Isthmus</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="341"/>
         <source>Mixtec, Coatzospan</source>
         <extracomment>Language name miz</extracomment>
         <translation>Mixtec, Coatzospan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="343"/>
         <source>Macedonian</source>
         <extracomment>Language name mk</extracomment>
         <translation>Macedonian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="345"/>
         <source>Mixtec, Silacayoapan</source>
         <extracomment>Language name mks</extracomment>
         <translation>Mixtec, Silacayoapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="350"/>
         <source>More</source>
         <extracomment>Language name mos</extracomment>
         <translation>More</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
         <source>Malay</source>
         <extracomment>Language name ms</extracomment>
         <translation>Malay</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
         <source>Maltese</source>
         <extracomment>Language name mt</extracomment>
         <translation>Maltese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="375"/>
         <source>Low German; Low Saxon</source>
         <extracomment>Language name nds</extracomment>
         <translation>Low German; Low Saxon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="377"/>
         <source>Nepali</source>
         <extracomment>Language name ne</extracomment>
         <translation>Nepali</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="379"/>
         <source>Nahuatl, Guerrero</source>
         <extracomment>Language name ngu</extracomment>
         <translation>Nahuatl, Guerrero</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
         <source>Nahuatl, Northern Oaxaca</source>
         <extracomment>Language name nhy</extracomment>
         <translation>Nahuatl, Northern Oaxaca</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
         <source>Dutch</source>
         <extracomment>Language name nl</extracomment>
         <translation>Dutch</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
         <source>Norwegian Nynorsk</source>
         <extracomment>Language name nn</extracomment>
         <translation>Norwegian Nynorsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
         <source>Norwegian</source>
         <extracomment>Language name no</extracomment>
         <translation>Norwegian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="397"/>
         <source>Otomi, Queru00e9taro</source>
         <extracomment>Language name otq</extracomment>
         <translation>Otomi, Queru00e9taro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
         <source>Papiamento</source>
         <extracomment>Language name pap</extracomment>
         <translation>Papiamento</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
         <source>Polish</source>
         <extracomment>Language name pl</extracomment>
         <translation>Polish</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="411"/>
         <source>Persian (Dari)</source>
         <extracomment>Language name prs</extracomment>
         <translation>Persian (Dari)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="415"/>
         <source>Portuguese</source>
         <extracomment>Language name pt</extracomment>
         <translation>Portuguese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
         <source>Brasilian Portuguese</source>
         <extracomment>Language name pt_BR</extracomment>
         <translation>Brasilian Portuguese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
         <source>Quichu00e9, West Central</source>
         <extracomment>Language name qut</extracomment>
         <translation>Quichu00e9, West Central</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
         <source>Romanian</source>
         <extracomment>Language name ro</extracomment>
         <translation>Romanian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
         <source>Russian</source>
         <extracomment>Language name ru</extracomment>
         <translation>Russian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="431"/>
         <source>Scots</source>
         <extracomment>Language name sco</extracomment>
         <translation>Scots</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="437"/>
         <source>Slovak</source>
         <extracomment>Language name sk</extracomment>
         <translation>Slovak</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="439"/>
         <source>Slovenian</source>
         <extracomment>Language name sl</extracomment>
         <translation>Slovenian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="443"/>
         <source>Somali</source>
         <extracomment>Language name so</extracomment>
         <translation>Somali</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
         <source>Albanian</source>
         <extracomment>Language name sq</extracomment>
         <translation>Albanian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="453"/>
         <source>Swedish</source>
         <extracomment>Language name sv</extracomment>
         <translation>Swedish</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="455"/>
         <source>Swahili</source>
         <extracomment>Language name sw</extracomment>
         <translation>Swahili</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="457"/>
         <source>Syriac</source>
         <extracomment>Language name syr</extracomment>
         <translation>Syriac</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="459"/>
         <source>Tamil</source>
         <extracomment>Language name ta</extracomment>
         <translation>Tamil</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="463"/>
         <source>Thai</source>
         <extracomment>Language name th</extracomment>
         <translation>Thai</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
         <source>Tagalog</source>
         <extracomment>Language name tl</extracomment>
         <translation>Tagalog</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="470"/>
         <source>Tswana</source>
         <extracomment>Language name tn</extracomment>
         <translation>Tswana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="472"/>
         <source>Turkish</source>
         <extracomment>Language name tr</extracomment>
         <translation>Turkish</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
         <source>Tektiteko</source>
         <extracomment>Language name ttc</extracomment>
         <translation>Tektiteko</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="479"/>
         <source>Tahitian</source>
         <extracomment>Language name ty</extracomment>
         <translation>Tahitian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="481"/>
         <source>Tzotzil, Zinacantu00e1n</source>
         <extracomment>Language name tzz</extracomment>
         <translation>Tzotzil, Zinacantu00e1n</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
         <source>Ukrainian</source>
         <extracomment>Language name uk</extracomment>
         <translation>Ukrainian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
         <source>Orya</source>
         <extracomment>Language name ury</extracomment>
         <translation>Orya</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
         <source>Uspanteco</source>
         <extracomment>Language name usp</extracomment>
         <translation>Uspanteco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="492"/>
         <source>Vietnamese</source>
         <extracomment>Language name vi</extracomment>
         <translation>Vietnamese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="496"/>
         <source>Xhosa</source>
         <extracomment>Language name xh</extracomment>
         <translation>Xhosa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="163"/>
         <source>Bavarian</source>
         <extracomment>Language name bar</extracomment>
         <translation>Bavarian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="326"/>
         <source>Lombard</source>
         <extracomment>Language name lmo</extracomment>
         <translation>Lombard</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="403"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
         <source>Uma</source>
         <extracomment>Language name ppk
 ----------
@@ -3627,441 +3845,421 @@ Language name ppk</extracomment>
         <translation>Uma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="448"/>
         <source>Sranan</source>
         <extracomment>Language name srn</extracomment>
         <translation>Sranan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
         <source>Yiddish</source>
         <extracomment>Language name yi</extracomment>
         <translation>Yiddish</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
         <source>Zapotec, San Juan Guelavu00eda</source>
         <extracomment>Language name zab</extracomment>
         <translation>Zapotec, San Juan Guelavu00eda</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="507"/>
         <source>Zapotec, Mitla</source>
         <extracomment>Language name zaw</extracomment>
         <translation>Zapotec, Mitla</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="509"/>
         <source>Chinese</source>
         <extracomment>Language name zh</extracomment>
         <translation>Chinese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="511"/>
         <source>Zapotec, Amatlu00e1n</source>
         <extracomment>Language name zpo</extracomment>
         <translation>Zapotec, Amatlu00e1n</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
         <source>Zapotec, Zoogocho</source>
         <extracomment>Language name zpq</extracomment>
         <translation>Zapotec, Zoogocho</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="515"/>
         <source>Zapotec, Yalu00e1lag</source>
         <extracomment>Language name zpu</extracomment>
         <translation>Zapotec, Yalu00e1lag</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
         <source>Zapotec, Chichicapan</source>
         <extracomment>Language name zpv</extracomment>
         <translation>Zapotec, Chichicapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
         <source>Zapotec, Southern Rincon</source>
         <extracomment>Language name zsr</extracomment>
         <translation>Zapotec, Southern Rincon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
         <source>Zapotec, Quioquitani-Quieru00ed</source>
         <extracomment>Language name ztq</extracomment>
         <translation>Zapotec, Quioquitani-Quieru00ed</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
         <source>Zapotec, Yatee</source>
         <extracomment>Language name zty</extracomment>
         <translation>Zapotec, Yatee</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="525"/>
         <source>Zulu</source>
         <extracomment>Language name zu</extracomment>
         <translation>Zulu</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="314"/>
         <source>Footnotes</source>
         <translation>Footnotes</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="316"/>
         <source>Strong&apos;s numbers</source>
         <translation>Strong&apos;s numbers</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="318"/>
         <source>Headings</source>
         <translation>Headings</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="320"/>
         <source>Morphological tags</source>
         <translation>Morphological tags</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="322"/>
         <source>Lemmas</source>
         <translation>Lemmas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="324"/>
         <source>Hebrew vowel points</source>
         <translation>Hebrew vowel points</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="326"/>
         <source>Hebrew cantillation marks</source>
         <translation>Hebrew cantillation marks</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="328"/>
         <source>Greek accents</source>
         <translation>Greek accents</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="330"/>
         <source>Red letter words</source>
         <translation>Red letter words</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="332"/>
         <source>Textual variants</source>
         <translation>Textual variants</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="334"/>
         <source>Scripture cross-references</source>
         <translation>Scripture cross-references</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="336"/>
         <source>Morph segmentation</source>
         <translation>Morph segmentation</translation>
     </message>
     <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation>Export</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
         <source>Local</source>
         <translation>Local</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>Remote</translation>
+        <source>Remote FTP</source>
+        <translation>Remote FTP</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Old testament</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="32"/>
+        <source>Remote SFTP</source>
+        <translation>Remote SFTP</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Moses/Pentateuch/Torah</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="33"/>
+        <source>Remote HTTP</source>
+        <translation>Remote HTTP</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>History</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="34"/>
+        <source>Remote HTTPS</source>
+        <translation>Remote HTTPS</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Prophets</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>New testament</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Gospels</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>Letters/Epistles</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Paul&apos;s Epistles</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
         <source>HTML files</source>
         <translation>HTML files</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="438"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>All files</source>
         <translation>All files</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>Text files</source>
         <translation>Text files</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="444"/>
         <source>Save file</source>
         <translation>Save file</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="130"/>
         <source>Save document ...</source>
         <translation>Save document ...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
         <source>BibleTime bookmark files</source>
         <translation>BibleTime bookmark files</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="127"/>
         <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
         <source>unknown</source>
         <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="60"/>
         <source>New folder</source>
         <translation>New folder</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
+        <location filename="../../src/util/tool.cpp" line="48"/>
         <source>The file already exists.</source>
         <translation>The file already exists.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
+        <location filename="../../src/util/tool.cpp" line="49"/>
         <source>Do you want to overwrite it?</source>
         <translation>Do you want to overwrite it?</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
+        <location filename="../../src/util/tool.cpp" line="69"/>
+        <location filename="../../src/util/tool.cpp" line="75"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>The file couldn&apos;t be saved.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
+        <location filename="../../src/util/tool.cpp" line="78"/>
         <source>Please check permissions etc.</source>
         <translation>Please check permissions etc.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
+        <location filename="../../src/util/tool.cpp" line="197"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Take care, this work contains cult / questionable material!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
+        <location filename="../../src/util/tool.cpp" line="218"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
+        <location filename="../../src/util/tool.cpp" line="207"/>
         <source>Encrypted - needs unlock key</source>
         <translation>Encrypted - needs unlock key</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
+        <location filename="../../src/util/tool.cpp" line="71"/>
+        <source>Error while writing to file.</source>
+        <translation>Error while writing to file.</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="72"/>
+        <source>Please check that enough disk space is available.</source>
+        <translation>Please check that enough disk space is available.</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="77"/>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation>The file couldn&apos;t be opened for saving.</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="231"/>
         <source>Double click for more information</source>
         <translation>Double click for more information</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
+        <location filename="../../src/util/tool.cpp" line="213"/>
         <source>Updated version available!</source>
         <translation>Updated version available!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
+        <location filename="../../src/util/tool.cpp" line="226"/>
         <source>Installed version</source>
         <translation>Installed version</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="273"/>
         <source>Haitian Creole</source>
         <extracomment>Language name ht</extracomment>
         <translation>Haitian Creole</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
         <source>Kekchu00ed</source>
         <comment>kek</comment>
         <extracomment>Language name kek</extracomment>
         <translation>Kekchu00ed</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="357"/>
         <source>(Multiple languages)</source>
         <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
         <translation>(Multiple languages)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="359"/>
         <source>Mam, Central</source>
         <extracomment>Language name mvc</extracomment>
         <translation>Mam, Central</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
         <source>Mam, Todos Santos Cuchumatu00e1n</source>
         <extracomment>Language name mvj</extracomment>
         <translation>Mam, Todos Santos Cuchumatu00e1n</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="363"/>
         <source>Mixe, Juquila</source>
         <extracomment>Language name mxq</extracomment>
         <translation>Mixe, Juquila</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="365"/>
         <source>Mixtec, Jamiltepec</source>
         <extracomment>Language name mxt</extracomment>
         <translation>Mixtec, Jamiltepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="367"/>
         <source>Burmese</source>
         <extracomment>Language name my</extracomment>
         <translation>Burmese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="370"/>
         <source>Norwegian Bokmu00e5l</source>
         <extracomment>Language name nb</extracomment>
         <translation>Norwegian Bokmu00e5l</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="372"/>
         <source>Nahuatl, Michoacu00e1n</source>
         <extracomment>Language name ncl</extracomment>
         <translation>Nahuatl, Michoacu00e1n</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
         <source>Potawatomi</source>
         <extracomment>Language name pot</extracomment>
         <translation>Potawatomi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="468"/>
         <source>Klingon</source>
         <extracomment>Language name tlh</extracomment>
         <translation>Klingon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="498"/>
         <source>Mixtec, Diuxi-Tilantongo</source>
         <extracomment>Language name xtd</extracomment>
         <translation>Mixtec, Diuxi-Tilantongo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
         <source>Yoryba</source>
         <extracomment>Language name yo</extracomment>
         <translation>Yoryba</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="407"/>
         <source>Verb tense changed</source>
         <translation>Verb tense changed</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>Can&apos;t write file</source>
         <translation>Can&apos;t write file</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>The Sword config file can&apos;t be written!</source>
         <translation>The Sword config file can&apos;t be written!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="39"/>
         <source>Export Bookmarks</source>
         <translation>Export Bookmarks</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="50"/>
         <source>Import bookmarks</source>
         <translation>Import bookmarks</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
+        <location filename="../../src/util/tool.cpp" line="46"/>
         <source>Overwrite File?</source>
         <translation>Overwrite File?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="276"/>
         <source>Parsing Strong&apos;s Numbers</source>
         <translation>Parsing Strong&apos;s Numbers</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="154"/>
         <source>This shortcut conflicts with the shortcut for the following actions:</source>
         <translation>This shortcut conflicts with the shortcut for the following actions:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
         <source>Do you want to clear the conflicting shortcuts and continue?</source>
         <translation>Do you want to clear the conflicting shortcuts and continue?</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="23"/>
         <source>Indexed works</source>
         <translation>Indexed works</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="24"/>
         <source>Unindexed works</source>
         <translation>Unindexed works</translation>
     </message>
@@ -4106,17 +4304,17 @@ Language name ppk</extracomment>
         <translation>Error: Invalid command-line argument: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="57"/>
         <source>CSS base template not found!</source>
         <translation>CSS base template not found!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="74"/>
         <source>Default template &quot;%1&quot; not found!</source>
         <translation>Default template &quot;%1&quot; not found!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="113"/>
         <source>Replace</source>
         <translation>Replace</translation>
     </message>
@@ -4124,91 +4322,91 @@ Language name ppk</extracomment>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="58"/>
         <source>OK</source>
         <comment>Dialog Button</comment>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="59"/>
         <source>Open</source>
         <comment>Dialog Button</comment>
         <translation>Open</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="60"/>
         <source>Save</source>
         <comment>Dialog Button</comment>
         <translation>Save</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="61"/>
         <source>Cancel</source>
         <comment>Dialog Button</comment>
         <translation>Cancel</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="62"/>
         <source>Close</source>
         <comment>Dialog Button</comment>
         <translation>Close</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="63"/>
         <source>Discard</source>
         <comment>Dialog Button</comment>
         <translation>Discard</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="64"/>
         <source>Apply</source>
         <comment>Dialog Button</comment>
         <translation>Apply</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="65"/>
         <source>Reset</source>
         <comment>Dialog Button</comment>
         <translation>Reset</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="66"/>
         <source>Restore defaults</source>
         <comment>Dialog Button</comment>
         <translation>Restore defaults</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="67"/>
         <source>Help</source>
         <comment>Dialog Button</comment>
         <translation>Help</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="68"/>
         <source>Save All</source>
         <comment>Dialog Button</comment>
         <translation>Save All</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="69"/>
         <source>Yes</source>
         <comment>Dialog Button</comment>
         <translation>Yes</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="70"/>
         <source>Yes to all</source>
         <comment>Dialog Button</comment>
         <translation>Yes to all</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="71"/>
         <source>No</source>
         <comment>Dialog Button</comment>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="72"/>
         <source>No to all</source>
         <comment>Dialog Button</comment>
         <translation>No to all</translation>
@@ -4217,102 +4415,102 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchOptionsArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="97"/>
         <source>Search for:</source>
         <translation>Search for:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="104"/>
         <source>&amp;Search</source>
         <translation>&amp;Search</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="106"/>
         <source>Start to search the text in the chosen works</source>
         <translation>Start to search the text in the chosen works</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="109"/>
         <source>Ch&amp;oose...</source>
         <translation>Ch&amp;oose...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="111"/>
         <source>Choose works for the search</source>
         <translation>Choose works for the search</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="114"/>
         <source>S&amp;etup...</source>
         <translation>S&amp;etup...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="133"/>
         <source>All of the words (AND is added between the words)</source>
         <translation>All of the words (AND is added between the words)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="137"/>
         <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
         <translation> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="148"/>
         <source>Scope:</source>
         <translation>Scope:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="169"/>
         <source>The text you want to search for</source>
         <translation>The text you want to search for</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="173"/>
         <source>Works:</source>
         <translation>Works:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="346"/>
         <source>No search scope</source>
         <translation>No search scope</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="128"/>
         <source>All words</source>
         <translation>All words</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="116"/>
         <source>Configure predefined scopes for search</source>
         <translation>Configure predefined scopes for search</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="130"/>
         <source>Some words</source>
         <translation>Some words</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
         <source>Free</source>
         <translation>Free</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
         <source>Some of the words (OR is added between the words)</source>
         <translation>Some of the words (OR is added between the words)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
         <source>Full lucene syntax</source>
         <translation>Full lucene syntax</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
         <source>Click the link to get help for search syntax</source>
         <translation>Click the link to get help for search syntax</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="159"/>
         <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
         <translation>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</translation>
     </message>
@@ -4320,17 +4518,17 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchResultArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="85"/>
         <source>Text of the selected search result item</source>
         <translation>Text of the selected search result item</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="88"/>
         <source>Select all</source>
         <translation>Select all</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="92"/>
         <source>Copy</source>
         <translation>Copy</translation>
     </message>
@@ -4338,242 +4536,242 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchSyntaxHelpDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="47"/>
         <source>Search Syntax Help</source>
         <translation>Search Syntax Help</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="94"/>
         <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
         <translation>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
         <source>Which words to find</source>
         <translation>Which words to find</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="101"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
         <source>Grouping and order</source>
         <translation>Grouping and order</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="103"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
         <source>Wildcards (partial words)</source>
         <translation>Wildcards (partial words)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
         <source>Text fields (different parts of text)</source>
         <translation>Text fields (different parts of text)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="208"/>
         <source>Other syntax features</source>
         <translation>Other syntax features</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
         <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
         <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
         <translation>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="119"/>
         <source>jesus AND god</source>
         <comment>Do not translate &quot;AND&quot;.</comment>
         <translation>jesus AND god</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="121"/>
         <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
         <translation>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="123"/>
         <source>jesus OR god</source>
         <comment>Do not translate &quot;OR&quot;.</comment>
         <translation>jesus OR god</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="125"/>
         <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
         <translation>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="127"/>
         <source>jesus NOT god</source>
         <comment>Do not translate &quot;NOT&quot;.</comment>
         <translation>jesus NOT god</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="133"/>
         <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
         <translation>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="131"/>
         <source>+jesus -god</source>
         <translation>+jesus -god</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
         <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
         <translation>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
         <source>(a AND b) OR c</source>
         <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
         <translation>(a AND b) OR c</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
         <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
         <translation>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="145"/>
         <source>&quot;says lord&quot;</source>
         <translation>&quot;says lord&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="149"/>
         <source>&quot;says the lord&quot;</source>
         <translation>&quot;says the lord&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="151"/>
         <source>Finds all verses with &apos;says the LORD&apos;</source>
         <translation>Finds all verses with &apos;says the LORD&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
         <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
         <translation>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="160"/>
         <source>a*</source>
         <translation>a*</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="162"/>
         <source>All words beginning with &apos;a&apos;</source>
         <translation>All words beginning with &apos;a&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="164"/>
         <source>a*a</source>
         <translation>a*a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="166"/>
         <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
         <translation>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="168"/>
         <source>a?</source>
         <translation>a?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="170"/>
         <source>&apos;at&apos; and &apos;an&apos;</source>
         <translation>&apos;at&apos; and &apos;an&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="172"/>
         <source>a??a</source>
         <translation>a??a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="174"/>
         <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
         <translation>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
         <source>Available text fields:</source>
         <translation>Available text fields:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="181"/>
         <source>Searches headings</source>
         <translation>Searches headings</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="183"/>
         <source>Searches footnotes</source>
         <translation>Searches footnotes</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="185"/>
         <source>Searches Strong&apos;s numbers</source>
         <translation>Searches Strong&apos;s numbers</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="187"/>
         <source>Searches morphology codes</source>
         <translation>Searches morphology codes</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="189"/>
         <source>Examples:</source>
         <translation>Examples:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="191"/>
         <source>heading:Jesus</source>
         <comment>Do not translate &quot;heading:&quot;.</comment>
         <translation>heading:Jesus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="193"/>
         <source>Finds headings with &apos;Jesus&apos;</source>
         <translation>Finds headings with &apos;Jesus&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="195"/>
         <source>footnote:Jesus AND footnote:said</source>
         <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
         <translation>footnote:Jesus AND footnote:said</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
         <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
         <translation>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
         <source>strong:G846</source>
         <comment>Do not translate &quot;strong:&quot;.</comment>
         <translation>strong:G846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="202"/>
         <source>Finds verses with Strong&apos;s Greek number 846</source>
         <translation>Finds verses with Strong&apos;s Greek number 846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="204"/>
         <source>morph:&quot;N-NSF&quot;</source>
         <comment>Do not translate &quot;morph:&quot;.</comment>
         <translation>morph:&quot;N-NSF&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="206"/>
         <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
         <translation>Finds verses with morphology code &apos;N-NSF&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="210"/>
         <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
         <translation>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</translation>
     </message>
@@ -4619,19 +4817,19 @@ Language name ppk</extracomment>
         <translation>Print...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="231"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="241"/>
         <source>Copying search result</source>
         <translation>Copying search result</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="250"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="259"/>
         <source>Saving search result</source>
         <translation>Saving search result</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="268"/>
         <source>Printing search result</source>
         <translation>Printing search result</translation>
     </message>
@@ -4717,42 +4915,42 @@ Language name ppk</extracomment>
 <context>
     <name>Search::CSearchDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="130"/>
         <source>Missing indices</source>
         <translation>Missing indices</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="87"/>
         <source>Search</source>
         <translation>Search</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="131"/>
         <source>The following modules need to be indexed before they can be searched in:</source>
         <translation>The following modules need to be indexed before they can be searched in:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="132"/>
         <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
         <translation>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="236"/>
         <source>Drag any verse reference onto an open Bible window</source>
         <translation>Drag any verse reference onto an open Bible window</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="241"/>
         <source>&amp;Analyze results...</source>
         <translation>&amp;Analyse results...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="242"/>
         <source>Show a graphical analysis of the search result</source>
         <translation>Show a graphical analysis of the search result</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="248"/>
         <source>&amp;Close</source>
         <translation>&amp;Close</translation>
     </message>
@@ -4793,19 +4991,19 @@ Language name ppk</extracomment>
         <translation>Print...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="164"/>
         <source>Printing search result</source>
         <translation>Printing search result</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="192"/>
         <source>Saving search result</source>
         <translation>Saving search result</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="210"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="228"/>
         <source>Copying search result</source>
         <translation>Copying search result</translation>
     </message>
@@ -4816,197 +5014,91 @@ Language name ppk</extracomment>
     </message>
 </context>
 <context>
-    <name>StandardWorksTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>Bible:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>The standard Bible is used when a hyperlink into a Bible is clicked</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>Commentary:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>The standard commentary is used when a hyperlink into a commentary is clicked</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation>Lexicon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>The standard lexicon is used when a hyperlink into a lexicon is clicked</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>Daily devotional:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>The standard devotional will be used to display a short start up devotional</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>Hebrew Strong&apos;s lexicon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>Greek Strong&apos;s lexicon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</translation>
-    </message>
+    <name>btm::InstallProgress</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>Hebrew morphological lexicon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="81"/>
+        <source>Failed</source>
+        <translation>Failed</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation>Greek morphological lexicon:</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="84"/>
+        <source>Completed</source>
+        <translation>Completed</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="90"/>
+        <source>Cancelled</source>
+        <translation>Cancelled</translation>
     </message>
 </context>
 <context>
-    <name>TextFiltersTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation>Insert line break after each verse</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation>Show verse numbers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation>Show section headings</translation>
-    </message>
+    <name>btm::InstallSources</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation>Show scripture cross-references</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation>Show Greek accents</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation>Show Hebrew vowel points</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation>Show Hebrew cantillation marks</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation>Show morph segmentation</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installsources.cpp" line="63"/>
+        <source>Failed to refresh source %1</source>
+        <translation>Failed to refresh source %1</translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation>Use textual variants</translation>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="59"/>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="62"/>
+        <source>The text you want to search for</source>
+        <translation>The text you want to search for</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation>Find Text</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="135"/>
+        <source>New Window</source>
+        <translation>New Window</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation>The text you want to search for</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="136"/>
+        <source>View Window</source>
+        <translation>View Window</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation>Search with case sensitivity</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="137"/>
+        <source>Text Font Size</source>
+        <translation>Text Font Size</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation>Case &amp;sensitive</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="138"/>
+        <source>User Interface Font Size</source>
+        <translation>User Interface Font Size</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation>Find the previous location of the text</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="141"/>
+        <source>Bookshelf Manager</source>
+        <translation>Bookshelf Manager</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation>&amp;Previous</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="187"/>
+        <source>Single</source>
+        <translation>Single</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation>Find the next location of the text</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="188"/>
+        <source>Tabbed</source>
+        <translation>Tabbed</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation>&amp;Next</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="189"/>
+        <source>Auto-tile</source>
+        <translation>Auto-tile</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation>Close the dialogue</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="190"/>
+        <source>Auto-tile horizontally</source>
+        <translation>Auto-tile horizontally</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Close</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="191"/>
+        <source>Auto-tile vertically</source>
+        <translation>Auto-tile vertically</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/messages/bibletime_ui_es.ts b/i18n/messages/bibletime_ui_es.ts
index b4d9d06..68202c0 100644
--- a/i18n/messages/bibletime_ui_es.ts
+++ b/i18n/messages/bibletime_ui_es.ts
@@ -6,7 +6,7 @@
     <message>
         <source></source>
         <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
 This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
@@ -22,452 +22,457 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTime</name>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
+        <location filename="../../src/bibletime_init.cpp" line="741"/>
         <source>&amp;File</source>
         <translation>&amp;Archivo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&amp;Search</source>
         <translation>&amp;Buscar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&amp;Window</source>
         <translation>V&amp;entana</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&amp;ttings</source>
         <translation>Pre&amp;ferencias</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&amp;Help</source>
         <translation>A&amp;yuda</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&amp;Show toolbar</source>
         <translation>&amp;Mostrar Barra de Herramientas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&amp;Fullscreen mode</source>
         <translation>Modo de &amp;pantalla completa</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
+        <location filename="../../src/bibletime_init.cpp" line="251"/>
         <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
         <translation>Abra el tutorial para el estudio de la Biblia incluido en BibleTime.&lt;br/&gt;Este tutorial es una introducción de cómo estudiar la Biblia de manera eficiente.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
+        <location filename="../../src/bibletime_init.cpp" line="256"/>
         <source>Information about the BibleTime program</source>
         <translation>Información acerca de BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation type="unfinished">&amp;Guardar sesión</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>&amp;Cargar sesión</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&amp;Delete session</source>
         <translation>&amp;Eliminar sesión</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&amp;Arrangement mode</source>
         <translation>Modo de arre&amp;glo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&amp;Manual mode</source>
         <translation>&amp;Modo manual</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &amp;vertically</source>
         <translation>Mosaico automatico &amp;Vertical</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &amp;horizontally</source>
         <translation>Mosaico automatico &amp;horizontal</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&amp;cascade</source>
         <translation>&amp;Cascada Automática</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&amp;Cascade</source>
         <translation>En &amp;cascada</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &amp;vertically</source>
         <translation>Mosaico &amp;vertical</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &amp;horizontally</source>
         <translation>Mosaico &amp;horizontal</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&amp;ose all windows</source>
         <translation>Ce&amp;rrar todas las ventanas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
+        <location filename="../../src/bibletime_init.cpp" line="224"/>
         <source>Close all open windows inside BibleTime</source>
         <translation>Cerrar todas las ventanas abiertas dentro de BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
+        <location filename="../../src/bibletime_init.cpp" line="241"/>
         <source>&amp;Handbook</source>
         <translation>&amp;Manual de referencia</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&amp;Bible Study Howto</source>
         <translation>Cómo estudiar la &amp;Biblia</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
+        <location filename="../../src/bibletime_slots.cpp" line="533"/>
         <source>Please enter a name for the new session.</source>
         <translation>Por favor, introduzca un nombre para la sesión nueva.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
+        <location filename="../../src/bibletime_slots.cpp" line="541"/>
+        <source>Session already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_slots.cpp" line="542"/>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="107"/>
         <source>Quit BibleTime</source>
         <translation>Salir de BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
+        <location filename="../../src/bibletime_init.cpp" line="114"/>
         <source>Toggle fullscreen mode of the main window</source>
         <translation>Cambiar a pantalla completa</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
+        <location filename="../../src/bibletime_init.cpp" line="123"/>
         <source>Search in &amp;open works...</source>
         <translation>Buscar en A&amp;brir obras...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &amp;Bible...</source>
         <translation>Buscar en &amp;Biblia Estandar...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &amp;new session...</source>
         <translation>Guardar como.&amp;Nueva Sesión...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
+        <location filename="../../src/bibletime_init.cpp" line="140"/>
         <source>Create and save a new session</source>
         <translation>Crear y guardar nueva Sesión</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
+        <location filename="../../src/bibletime_init.cpp" line="147"/>
         <source>Manually arrange the open windows</source>
         <translation>Ordenar manualmente las ventanas abiertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
+        <location filename="../../src/bibletime_init.cpp" line="154"/>
         <source>Automatically tile the open windows vertically (arrange side by side)</source>
         <translation>Ordenar automáticamente las ventanas abiertas verticalmente (ordenadas lado a lado)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
+        <location filename="../../src/bibletime_init.cpp" line="161"/>
         <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
         <translation>Ordenar automáticamente las ventanas abiertas horizontalmente (ordenar una arriba de la otra)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
+        <location filename="../../src/bibletime_init.cpp" line="165"/>
         <source>Auto-&amp;tile</source>
         <translation>Auto-&amp;Acomodar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
+        <location filename="../../src/bibletime_init.cpp" line="168"/>
         <source>Automatically tile the open windows</source>
         <translation>Acomodar automáticamente las ventanas abiertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
+        <location filename="../../src/bibletime_init.cpp" line="172"/>
         <source>Ta&amp;bbed</source>
         <translation>En &amp;pestañas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
+        <location filename="../../src/bibletime_init.cpp" line="175"/>
         <source>Automatically tab the open windows</source>
         <translation>Automáticamente abrir la ventana en pestañas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
+        <location filename="../../src/bibletime_init.cpp" line="182"/>
         <source>Automatically cascade the open windows</source>
         <translation>Ordenar automáticamente en cascada las ventanas abiertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
+        <location filename="../../src/bibletime_init.cpp" line="189"/>
         <source>Cascade the open windows</source>
         <translation>Ordenar en cascada las ventanas abiertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
+        <location filename="../../src/bibletime_init.cpp" line="193"/>
         <source>&amp;Tile</source>
         <translation>&amp;Acomodar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
+        <location filename="../../src/bibletime_init.cpp" line="196"/>
         <source>Tile the open windows</source>
         <translation>Acomodar las ventanas abiertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
+        <location filename="../../src/bibletime_init.cpp" line="203"/>
         <source>Vertically tile (arrange side by side) the open windows</source>
         <translation>Ordenar verticalmente (ordenadas lado a lado) las ventanas abiertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
+        <location filename="../../src/bibletime_init.cpp" line="210"/>
         <source>Horizontally tile (arrange on top of each other) the open windows</source>
         <translation>Ordenar horizontalmente (ordenadas una arriba de la otra) las ventanas abiertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
+        <location filename="../../src/bibletime_init.cpp" line="214"/>
         <source>Close &amp;window</source>
         <translation>Cerrar &amp;ventana</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
+        <location filename="../../src/bibletime_init.cpp" line="217"/>
         <source>Close the current open window</source>
         <translation>Cerrar la ventana actual</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
+        <location filename="../../src/bibletime_init.cpp" line="228"/>
         <source>&amp;Configure BibleTime...</source>
         <translation>&amp;Configurar BibleTime...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime&apos;s preferences</source>
         <translation>Preferencias de BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
+        <location filename="../../src/bibletime_init.cpp" line="234"/>
         <source>Bookshelf &amp;Manager...</source>
         <translation>Ad&amp;ministrador de &amp;biblioteca...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
+        <location filename="../../src/bibletime_init.cpp" line="237"/>
         <source>Configure your bookshelf and install/update/remove/index works</source>
         <translation>Configurar su biblioteca e instalar/actualizar/remover/indexar obras</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
+        <location filename="../../src/bibletime_init.cpp" line="244"/>
         <source>Open BibleTime&apos;s handbook</source>
         <translation>Abrir Manual de BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&amp;Tip of the day...</source>
         <translation>&amp;Consejo del día...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
+        <location filename="../../src/bibletime_init.cpp" line="263"/>
         <source>Show tips about BibleTime</source>
         <translation>Mostrar consejos sobre Bible</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
+        <location filename="../../src/bibletime_init.cpp" line="402"/>
         <source>Toggle visibility of the bookshelf window</source>
         <translation>Activar la visibilidad de la ventana de la biblioteca</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
+        <location filename="../../src/bibletime_init.cpp" line="406"/>
         <source>Toggle visibility of the bookmarks window</source>
         <translation>Activar la visibilidad de la ventana de los marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
+        <location filename="../../src/bibletime_init.cpp" line="410"/>
         <source>Toggle visibility of the mag window</source>
         <translation>Activar la visibilidad de la ventana de la lupa</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
+        <location filename="../../src/bibletime_init.cpp" line="735"/>
         <source>Main toolbar</source>
         <translation>Barra principal</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
+        <location filename="../../src/bibletime_init.cpp" line="736"/>
         <source>Navigation toolbar</source>
         <translation>Barra de Navegación</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
+        <location filename="../../src/bibletime_init.cpp" line="737"/>
         <source>Works toolbar</source>
         <translation>Barra de Obras</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
+        <location filename="../../src/bibletime_init.cpp" line="738"/>
         <source>Tools toolbar</source>
         <translation>Barra de herramientas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
+        <location filename="../../src/bibletime_init.cpp" line="739"/>
         <source>Format toolbar</source>
         <translation>Barra de Formato</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
+        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <source>Sw&amp;itch session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="777"/>
         <source>Show main toolbar</source>
         <translation>Mostrar barra de herramientas principal</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
+        <location filename="../../src/bibletime_init.cpp" line="780"/>
         <source>Show navigation bar</source>
         <translation>Mostrar barra de navegacion</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
+        <location filename="../../src/bibletime_init.cpp" line="783"/>
         <source>Show works toolbar</source>
         <translation>Mostrar barra de obras</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
+        <location filename="../../src/bibletime_init.cpp" line="786"/>
         <source>Show tools toolbar</source>
         <translation>Mostrar barade herramientas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
+        <location filename="../../src/bibletime_init.cpp" line="789"/>
         <source>Show formatting toolbar</source>
         <translation>Mostrar barra de formateo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
+        <location filename="../../src/bibletime_init.cpp" line="792"/>
         <source>Show bookshelf</source>
         <translation>Mostrar biblioteca</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
+        <location filename="../../src/bibletime_init.cpp" line="795"/>
         <source>Show bookmarks</source>
         <translation>Mostrar marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
+        <location filename="../../src/bibletime_init.cpp" line="798"/>
         <source>Show mag</source>
         <translation>Mostrar lupa</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
+        <location filename="../../src/bibletime_init.cpp" line="743"/>
         <source>Toolbars</source>
         <translation>Barra de herramientas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <location filename="../../src/bibletime_init.cpp" line="774"/>
         <source>Show toolbars in text windows</source>
         <translation>Mostrar barra de herramientas en las ventanas de texto</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
+        <location filename="../../src/bibletime_init.cpp" line="801"/>
         <source>Show parallel text headers</source>
         <translation>Mostrar encabezados de texto paralelo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
+        <location filename="../../src/bibletime_init.cpp" line="747"/>
         <source>O&amp;pen windows</source>
         <translation>A&amp;brir Ventanas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show &quot;Whats this widget&quot; dialog</source>
         <translation>Mostrar dialogo &quot;Que es este widget&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
+        <location filename="../../src/bibletime_init.cpp" line="954"/>
         <source>Whats this widget?</source>
         <translation>Qué es este widget?</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
+        <location filename="../../src/bibletime_init.cpp" line="126"/>
         <source>Search in all works that are currently open</source>
         <translation>Buscar en todas las obras que están abiertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
+        <location filename="../../src/bibletime_init.cpp" line="133"/>
         <source>Search in the standard Bible</source>
         <translation>Buscar en Biblia estandar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
+        <location filename="../../src/bibletime_slots.cpp" line="532"/>
         <source>New Session</source>
         <translation>Nueva Sesión</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
+        <location filename="../../src/bibletime.cpp" line="77"/>
         <source>Initializing the SWORD engine...</source>
         <translation>Inicializando el motor SWORD...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
+        <location filename="../../src/bibletime.cpp" line="85"/>
         <source>Creating BibleTime&apos;s user interface...</source>
         <translation>Creando interfaz de usuario de BibleTime...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
+        <location filename="../../src/bibletime.cpp" line="92"/>
         <source>Initializing menu- and toolbars...</source>
         <translation>Inicializando menu y barras de herramientas...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Unlock Work</source>
         <translation>Desbloquear obra</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Enter the unlock key for %1.</source>
         <translation>Introduzca la clave de desbloqueo de.%1.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
+        <location filename="../../src/bibletime.cpp" line="214"/>
         <source>Warning: Invalid unlock key!</source>
         <translation>Advertencia: Error de clave de desbloqueo!</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
+        <location filename="../../src/bibletime.cpp" line="215"/>
         <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
         <translation>La clave de desbloqueo que nos ha facilitado no pudo desbloquear este módulo. Por favor, inténtelo de nuevo.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
+        <location filename="../../src/bibletime_init.cpp" line="255"/>
         <source>&amp;About BibleTime</source>
         <translation>&amp;Acerca de BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
+        <location filename="../../src/bibletime_init.cpp" line="733"/>
         <source>Bookmarks</source>
         <translation>Marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
+        <location filename="../../src/bibletime_init.cpp" line="734"/>
         <source>Mag</source>
         <translation>Lente</translation>
     </message>
@@ -475,7 +480,8 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTimeApp</name>
     <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
+        <location filename="../../src/bibletimeapp.cpp" line="59"/>
+        <location filename="../../src/mobile/bibletimeapp.cpp" line="63"/>
         <source>Fatal error!</source>
         <translation>Error fatal</translation>
     </message>
@@ -483,7 +489,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtAboutDialog</name>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
         <source>BibleTime is an easy to use but powerful Bible study tool.</source>
         <translation>BibleTime es una herramienta  de estudio de la Biblia poderosa pero fácil de usar.</translation>
     </message>
@@ -498,52 +504,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>La licencia legalmente vinculada esta debajo.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="109"/>
         <source>About BibleTime</source>
         <translation>Acerca de BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="121"/>
         <source>&amp;BibleTime</source>
         <translation>&amp;BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="126"/>
         <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
         <translation>Estamos buscando desarrolladores y traductores. Si deseas unirte a nuestro equipo, por favor manda un email a %1.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation>(c)1999-2013, El equipo BibleTime</translation>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="130"/>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished">(c)1999-2014, El equipo BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="137"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Contribuyentes</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="148"/>
         <source>The following people contributed to BibleTime:</source>
         <translation>Las siguientes personas contribuyeron con BibleTime:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="150"/>
         <source>documentation and translation manager</source>
         <translation>Administrador de documentación y traducción</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="172"/>
         <source>project manager</source>
         <translation>Administrador de proyecto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>tester</source>
         <translation>Probador</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>usability expert</source>
         <translation>Experto de usabilidad</translation>
     </message>
@@ -583,52 +589,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>&amp;License</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
         <source>designer</source>
         <translation>diseñador</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="139"/>
         <source>developer</source>
         <translation>desarrollador</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
         <source>project founder</source>
         <translation>Fundador del proyecto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="157"/>
         <source>packager</source>
         <translation>empaquetador</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="158"/>
         <source>creator of The Sword Project</source>
         <translation>creador de The Sword Project</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
         <source>domain sponsor</source>
         <translation>patrocinador del dominio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
         <source>howto</source>
         <translation>tutorial</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="141"/>
         <source>artist</source>
         <translation>Artista</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="173"/>
         <source>documentation</source>
         <translation>documentacion</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="188"/>
         <source>The following people translated BibleTime into their language:</source>
         <translation>Las siguientes personas tradujeron BibleTime a su idioma:</translation>
     </message>
@@ -656,37 +662,37 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBibleKeyWidget</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="110"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Desplázate a través de la entradas de la lista. Presione el botón y mueva el ratón para aumentar o disminuir el elemento.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
         <source>Next book</source>
         <translation>Libro siguiente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
         <source>Previous book</source>
         <translation>Libro anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="117"/>
         <source>Next chapter</source>
         <translation>Capí­tulo siguiente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
         <source>Previous chapter</source>
         <translation>Capí­tulo anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="122"/>
         <source>Next verse</source>
         <translation>Versículo siguiente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
         <source>Previous verse</source>
         <translation>Versículo anterior</translation>
     </message>
@@ -765,27 +771,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfGroupingMenu</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
         <source>Category/Language</source>
         <translation type="unfinished">Categoría/Idioma</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
         <source>Category</source>
         <translation>Categorí­a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
         <source>Language/Category</source>
         <translation type="unfinished">Idioma/Categoría</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="105"/>
         <source>Language</source>
         <translation type="unfinished">Idioma</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="108"/>
         <source>No grouping</source>
         <translation type="unfinished">Sin agrupar</translation>
     </message>
@@ -793,7 +799,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfModel</name>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
+        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="78"/>
         <source>Module</source>
         <translation>Módulo</translation>
     </message>
@@ -801,23 +807,23 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfWidget</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="157"/>
         <source>Fi&amp;lter:</source>
         <translation>Fi&amp;ltro:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="158"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
         <source>Grouping</source>
         <translation>Agrupación</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="159"/>
         <source>Change the grouping of items in the bookshelf.</source>
         <translation>Cambiar la agrupación de los elementos en la biblioteca.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
         <source>Show/hide works</source>
         <translation>Mostrar/Esconder obras</translation>
     </message>
@@ -831,69 +837,130 @@ This file is distributed under the same license as the Bibetime package.</transl
     </message>
 </context>
 <context>
+    <name>BtConfig</name>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="46"/>
+        <source>Old testament</source>
+        <translation type="unfinished">Antiguo Testamento</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="47"/>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation type="unfinished">Moisés/Pentateuco/Torá</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="48"/>
+        <source>History</source>
+        <translation type="unfinished">Historia</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="49"/>
+        <source>Prophets</source>
+        <translation type="unfinished">Profetas</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="50"/>
+        <source>New testament</source>
+        <translation type="unfinished">Nuevo Testamento</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="51"/>
+        <source>Gospels</source>
+        <translation type="unfinished">Evangelios</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="52"/>
+        <source>Letters/Epistles</source>
+        <translation type="unfinished">Cartas/Epí­stolas</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="53"/>
+        <source>Paul&apos;s Epistles</source>
+        <translation type="unfinished">Las Epí­stolas de Pablo</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="89"/>
+        <source>Error loading configuration!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="90"/>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BtConfigCore</name>
+    <message>
+        <location filename="../../src/backend/config/btconfigcore.cpp" line="62"/>
+        <source>Default Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtDisplaySettingsButton</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="103"/>
         <source>Use linebreaks after each verse</source>
         <translation>Usar saltos de lí­nea después de cada versículo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
         <source>Show verse numbers</source>
         <translation>Mostrar números de versículos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
         <source>Show headings</source>
         <translation>Mostrar cabeceras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
         <source>Highlight words of Jesus</source>
         <translation>Marcar las palabras de Jesús</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
         <source>Show Hebrew vowel points</source>
         <translation>Mostrar puntos de vocales hebreas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
         <source>Show Hebrew cantillation marks</source>
         <translation>Mostrar los acentos de &quot;cantilación&quot; hebreas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
         <source>Show Greek accents</source>
         <translation>Mostrar acentos griegos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
         <source>Use alternative textual variant</source>
         <translation>Usar variante textual alternativa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
         <source>Show scripture cross-references</source>
         <translation>Mostrar referencias cruzadas de las escrituras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
         <source>Show footnotes</source>
         <translation type="unfinished">Mostrar notas al pie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
         <source>Show morph segmentation</source>
         <translation>Mostrar segmentación de morfología</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="120"/>
         <source>Display settings</source>
         <translation>Configuración de pantalla</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="123"/>
         <source>Display settings: No options available</source>
         <translation>Mostrar configuracion: No hay opciones disponibles</translation>
     </message>
@@ -901,27 +968,45 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtEditBookmarkDialog</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="71"/>
         <source>Edit Bookmark</source>
         <translation>Editar marcador</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
         <source>Location:</source>
         <translation>Ubicación:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
         <source>Title:</source>
         <translation>Título:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
 </context>
 <context>
+    <name>BtFindWidget</name>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="28"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="29"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="74"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtFontChooserWidget</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
@@ -942,27 +1027,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="151"/>
         <source>&amp;Language:</source>
         <translation>&amp;Idioma:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
         <source>The font selection below will apply to all texts in this language</source>
         <translation>La selección de fuente debajo se va a aplicar a todos los textos de este idioma</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
         <source>Use custom font</source>
         <translation>Usar fuente personalizada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
         <source>Optionally specify a custom font for each language:</source>
         <translation>Opcionalmente especifique una fuente personalizada para cada idioma:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="150"/>
         <source>Fonts</source>
         <translation>Fuentes</translation>
     </message>
@@ -970,67 +1055,67 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtIndexPage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="107"/>
         <source>%1 KiB</source>
         <translation>%1 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="114"/>
         <source>0 KiB</source>
         <translation>0 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="124"/>
         <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
         <translation>Si está seleccionado, aquellos índices que no tienen una obra correspondiente serán eliminados cuando BibleTime arranque</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
         <source>Automatically delete orphaned indexes when BibleTime starts</source>
         <translation>Eliminar índices huerfanos automáticamente cuando BibleTime arranque</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="127"/>
         <source>Delete the selected indexes</source>
         <translation>Eliminar los índices seleccionados</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
         <source>Delete</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="130"/>
         <source>Create new indexes for the selected works</source>
         <translation>Crear nuevos índices para la obra seleccionada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Work</source>
         <translation>Obra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Index size</source>
         <translation>Tamaño del índice</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="122"/>
         <source>Search Indexes</source>
         <translation>Buscar índices</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="91"/>
         <source>Indexed Works</source>
         <translation>Obras indexadas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="96"/>
         <source>Unindexed Works</source>
         <translation>Obras no indexadas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
         <source>Create...</source>
         <translation>Crear...</translation>
     </message>
@@ -1056,17 +1141,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallModuleChooserDialogModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="88"/>
         <source>Work</source>
         <translation>Obra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="89"/>
         <source>Installation source</source>
         <translation>Fuente de instalación</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="90"/>
         <source>Version</source>
         <translation>Versión</translation>
     </message>
@@ -1159,12 +1244,12 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>No se puede escribir en el directorio destino o bien no existe. La instalación fallará a menos que esto se resuelva primero.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="388"/>
         <source>Delete Source?</source>
         <translation>¿Eliminar Fuente?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="389"/>
         <source>Do you really want to delete this source?</source>
         <translation type="unfinished">¿Seguro que desea eliminar esta fuente?</translation>
     </message>
@@ -1177,17 +1262,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPageModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="75"/>
         <source>Work</source>
         <translation>Obra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="76"/>
         <source>Version</source>
         <translation>Versión</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="77"/>
         <source>Description</source>
         <translation type="unfinished">Descripción</translation>
     </message>
@@ -1203,99 +1288,99 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPathDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="35"/>
         <source>Bookshelf Folders</source>
         <translation>Carpetas de la Biblioteca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
         <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
         <translation>Las obras pueden ser instaladas en una o más carpetas. Después de configurar estas carpetas, puedes seleccionar una de ellas en la página de Instalación.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="45"/>
         <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
         <translation type="unfinished">BibleTime y la biblioteca SWORD se encuentran las obras en cualquiera de estas carpetas. Si una carpeta es removida aquí, sigue existiendo en el sistema con todas las obras en ella.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="48"/>
         <source>Configure bookshelf folders</source>
         <translation>Configurar carpetas de la biblioteca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="53"/>
         <source>Configuration file for the folders is: </source>
         <translation>El archivo de configuración para las carpetas es: </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="61"/>
         <source>Folders where new works can be installed</source>
         <translation>Carpetas donde las nuevas obras pueden ser instaladas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
         <source>Read-only folders</source>
         <translation>Carpetas de Sólo-lectura</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="66"/>
         <source>Nonexistent folders</source>
         <translation>Carpeta no existente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="80"/>
         <source>&amp;Add...</source>
         <translation>Agregar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="81"/>
         <source>Add new folder</source>
         <translation>Agregar nueva carpeta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="86"/>
         <source>&amp;Edit...</source>
         <translation>Editar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="87"/>
         <source>Edit the selected folder</source>
         <translation>Editar la carpeta seleccionada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="92"/>
         <source>&amp;Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="93"/>
         <source>Remove the selected folder</source>
         <translation>Eliminar la carpeta seleccionada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="167"/>
         <source>This default folder in your home directory can&apos;t be removed</source>
         <translation>Esta carpeta predeterminada en tu directorio local no puede ser eliminado</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="194"/>
         <source>Choose Folder</source>
         <translation>Seleccionar Carpeta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>Use Folder?</source>
         <translation>Usar Carpeta?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
         <translation>Esta carpeta no se puede editar, por lo tanto las obras no pueden ser instaladas usando BibleTime. ¿Deseas usar esta carpeta en lugar del valor anterior?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
         <translation>Esta carpeta no se puede editar, por lo tanto las obras no pueden ser instalados usando BibleTime. ¿Aún deseas agregarla a la lista de carpetas de la biblioteca?</translation>
     </message>
@@ -1303,52 +1388,42 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallProgressDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Work</source>
         <translation>Obra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Progress</source>
         <translation>Progreso</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>Detener</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="60"/>
         <source>Stop All</source>
         <translation>Detener Todo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Completed</source>
         <translation>Completado</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>Cancelado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="55"/>
         <source>Waiting for turn...</source>
         <translation>Esperando turno...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="113"/>
         <source>Preparing install...</source>
         <translation>Preparando Instalación...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="37"/>
         <source>Install Progress</source>
         <translation>Progreso de la Instalación</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Failed</source>
         <translation>Falló</translation>
     </message>
@@ -1356,17 +1431,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
         <source>Language for names of Bible books:</source>
         <translation>Idioma para los nombres de los libros de la Bíblia:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation>Idiomas que pueden ser usados para nombres de los libros bíblicos</translation>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="136"/>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="133"/>
         <source>Languages</source>
         <translation>Idiomas</translation>
     </message>
@@ -1416,7 +1491,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtModuleManagerDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="57"/>
         <source>Bookshelf Manager</source>
         <translation>Administrador de biblioteca</translation>
     </message>
@@ -1424,7 +1499,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkAction</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="103"/>
         <source>&amp;Open work</source>
         <translation>&amp;Abrir obra</translation>
     </message>
@@ -1432,12 +1507,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkActionMenu</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="42"/>
         <source>&amp;Grouping order</source>
         <translation type="unfinished">Orden de A&amp;grupación</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="43"/>
         <source>Sets the grouping order for the items in this menu.</source>
         <translation type="unfinished">Establece el orden de agrupación de los elementos de este menú.</translation>
     </message>
@@ -1473,47 +1548,47 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtRemovePage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="100"/>
         <source>Select &amp;works to uninstall:</source>
         <translation type="unfinished">Seleccione &amp;obras a desinstalar:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&amp;Remove...</source>
         <translation>&amp;Eliminar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="98"/>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="111"/>
         <source>Start removal of %1 works:</source>
         <translation type="unfinished">Iniciando eliminación de %1 obras:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="114"/>
         <source>Start removal:</source>
         <translation type="unfinished">Iniciando eliminación:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="145"/>
         <source>You selected the following work(s): </source>
         <translation>Seleccionaste la(s) siguiente(s) obra(s): </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="149"/>
         <source>Do you really want to remove them from your system?</source>
         <translation>Deseas realmente eliminarlos de tu sistema?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
         <source>Remove the selected works</source>
         <translation>Eliminar las obras seleccionados</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="151"/>
         <source>Remove Works?</source>
         <translation>Eliminar Obras?</translation>
     </message>
@@ -1534,12 +1609,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtSearchModuleChooserDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="47"/>
         <source>Works to Search in</source>
         <translation>Obras para la búsqueda en:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="49"/>
         <source>Select the works which should be searched.</source>
         <translation>Selecciona las obras que deberían ser buscadas.</translation>
     </message>
@@ -1623,63 +1698,165 @@ atajo</translation>
     </message>
 </context>
 <context>
+    <name>BtStandardWorksTab</name>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="169"/>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation type="unfinished">Las obras predeterminadas son utilizadas cuando ninguna obra es especificada, por ejemplo cuando se hace clic en un hipervínculo dentro de una Biblia.</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
+        <translation type="unfinished">Biblia:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="174"/>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation type="unfinished">La Biblia estandar es usada cuando un hipervínculo dentro de la Biblia es cliqueado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</source>
+        <translation type="unfinished">Comentario:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="178"/>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation type="unfinished">El comentario estandar es usado cuando un hipervínculo dentro del comentario es cliqueado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
+        <translation type="unfinished">Léxico:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="182"/>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation type="unfinished">El léxico estandar es usado cuando un hipervínculo dentro del léxico es cliqueado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</source>
+        <translation type="unfinished">Devocional diario:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="186"/>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation type="unfinished">El devocional estandar será usado para mostrar un devocional de inicio</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation type="unfinished">Léxico Hebreo de Strong:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="190"/>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation type="unfinished">El léxico Hebreo estandar es utilizado cuando un hipervínculo es cliqueado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation type="unfinished">Léxico Griego de Strong:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="194"/>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation type="unfinished">El léxico Griego estandar es utilizado cuando un hipervínculo en un léxico Griego es cliqueado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</source>
+        <translation type="unfinished">Léxico Hebreo morfológico:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="198"/>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation type="unfinished">El léxico morfológico para textos Hebreos es utilizado cuando un hipervínculo de una etiqueta morfológica en texto Hebreo es cliqueado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</source>
+        <translation type="unfinished">Diccionario léxico griego morfológico:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="202"/>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation type="unfinished">El léxico morfológico para textos Griegos es utilizado cuando un hipervínculo de una etiqueta morfológica en texto Griego es cliqueado</translation>
+    </message>
+</context>
+<context>
     <name>BtTextFiltersTab</name>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="74"/>
         <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="obsolete">Los filtros controlan la apariencia del texto. Aquí puedes especificar las configuraciones predeterminadas para todos los filtros. Puedes anular estas configuraciones en cada ventana mostrada.</translation>
+        <translation type="unfinished">Los filtros controlan la apariencia del texto. Aquí puedes especificar las configuraciones predeterminadas para todos los filtros. Puedes anular estas configuraciones en cada ventana mostrada.</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="78"/>
         <source>Insert line break after each verse</source>
-        <translation type="obsolete">Insertar salto de lí­nea después de cada versículo</translation>
+        <translation type="unfinished">Insertar salto de lí­nea después de cada versículo</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
         <source>Show verse numbers</source>
-        <translation type="obsolete">Mostrar números de versículos</translation>
+        <translation type="unfinished">Mostrar números de versículos</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
         <source>Show section headings</source>
-        <translation type="obsolete">Mostrar cabeceras de las secciones</translation>
+        <translation type="unfinished">Mostrar cabeceras de las secciones</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
+        <source>Show scripture cross-references</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="82"/>
         <source>Show Greek accents</source>
-        <translation type="obsolete">Mostrar acentos griegos</translation>
+        <translation type="unfinished">Mostrar acentos griegos</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="83"/>
         <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">Mostrar puntos de vocales hebreas</translation>
+        <translation type="unfinished">Mostrar puntos de vocales hebreas</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="84"/>
         <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">Mostrar los acentos de &quot;cantilación&quot; hebreas</translation>
+        <translation type="unfinished">Mostrar los acentos de &quot;cantilación&quot; hebreas</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="85"/>
         <source>Show morph segmentation</source>
-        <translation type="obsolete">Mostrar segmentación de morfología</translation>
+        <translation type="unfinished">Mostrar segmentación de morfología</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="86"/>
         <source>Use textual variants</source>
-        <translation type="obsolete">Usar varientes textuales</translation>
+        <translation type="unfinished">Usar varientes textuales</translation>
     </message>
 </context>
 <context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
         <source>Add/remove/replace</source>
         <translation>Agregar/eliminar/reemplazar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
         <source>Remove</source>
         <translation type="unfinished">Eliminar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
         <source>Replace</source>
         <translation>Reemplazar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
         <source>Add</source>
         <translation>Agregar</translation>
     </message>
@@ -1687,87 +1864,87 @@ atajo</translation>
 <context>
     <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="69"/>
         <source>Tip Of The Day</source>
         <translation type="unfinished">Sugerencia del día</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="83"/>
         <source>Show tips at startup</source>
         <translation type="unfinished">Mostrar sugerencias al inicio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="94"/>
         <source>Next Tip</source>
         <translation type="unfinished">Siguiente sugerencia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
         <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
         <translation type="unfinished">Para agregar varias obras bíblicas en paralelo en su ventana Biblia activa seleccione el icono y seleccione otra obra bíblica.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
         <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
         <translation type="unfinished">Para agregar varios comentarios en paralelo en su ventana de comentarios activa seleccione el icono y seleccione otro comentario.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="134"/>
         <source>To learn more about the BibleTime project please go to our web site.</source>
         <translation>Para obtener más información sobre el proyecto BibleTime por favor visite nuestro sitio web.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="137"/>
         <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
         <translation type="unfinished">Para sincronizar una ventana de comentario con la ventana activa de la Biblia, activar la ventana de comentario y seleccione el icono.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
         <source>Select the icon again to stop the synchronization.</source>
         <translation type="unfinished">Seleccione el icono de nuevo para detener la sincronización.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="142"/>
         <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
         <translation>Para crear un marcador arrastre la referencia del versículo de una Biblia o comentario en la ventana Marcadores. Una flecha indicará la posición donde quedará el marcador cuando suelte el cursor. Otras obras podrán tener referencia en la esquina superior izquierda con la cual se puede crear un marcador.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="147"/>
         <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
         <translation>Para cambiar el título o descripción de un marcador, haga clic con el botón derecho en el marcador y seleccione el menú Editar marcador. Después de terminar la edición de la descripción se puede ver colocando el ratón sobre el marcador.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="151"/>
         <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
         <translation type="unfinished">Para cargar múltiples fuentes de instalación de las obras, vaya al Administrador de biblioteca, seleccione el botón Agregar y, a continuación, el botón Obtener lista.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="154"/>
         <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
         <translation>Para obtener más información acerca de una obra, ir a la ventana de la biblioteca, haga clic derecho en la obra, y seleccionar el menú Acerca de.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="157"/>
         <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
         <translation type="unfinished">Las ventanas Biblioteca, Marcadores, y Lente se puede mover a lugares nuevos arrastrándolos desde el título ubicado en la parte superior de cada ventana. Se pueden colocar a la izquierda, derecha, arriba o debajo de las ventanas de obras. Se pueden colocar en la parte superior de cada uno y pestañas aparecerán por lo que cada ventana se puede seleccionar. Se puede cambiar el tamaño arrastrando el borde entre la ventana y la otra ventana.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="163"/>
         <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
         <translation type="unfinished">Puede buscar por número de Strong en una obra. Inicie con una obra que tiene números de Strong y posicione el cursor sobre una palabra. Haga clic en la palabra y el uso de Strong del menú de búsqueda. Un diálogo de búsqueda aparecerá que le permite ver el uso del mismo número Strong en otros lugares de la obra.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="178"/>
         <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
         <translation type="unfinished">Puede guardar las ventanas abiertas en una sesión. Ese período de sesiones pueden ser fácilmente restaurados posteriormente. Puede guardar tantas sesiones como quiera. La característica de la sesión se puede acceder en la entrada del menú Ventana.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="168"/>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
         <translation type="unfinished">Puede guardar notas personales de referencias versículos específicos. Debe instalar el comentario personal. Abra el Administrador de biblioteca, elegir Crosswire como la fuente y busque en comentario e Inglés. Una vez instalado, use la ventana de biblioteca y haga clic derecho en el comentario personal. Utilice el menú Editar texto o HTML en el menú Editar para abrir el trabajo en modo de escritura.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
         <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
         <translation type="unfinished">Puede ver la información del número de Strong en la ventana del Lente colocando el cursor sobre una palabra en una obra bíblica que tiene números de Strong. Usted debe tener los léxicos StrongsGreek y StrongsHebrew de Crosswire instalados.</translation>
     </message>
@@ -1783,49 +1960,49 @@ atajo</translation>
 <context>
     <name>CAcceleratorSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="128"/>
         <source>Choose action group:</source>
         <translation>Elige grupo de acción:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="130"/>
         <source>Main Window</source>
         <translation>Ventana principal</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
         <source>All text windows</source>
         <translation>Todas las ventanas de texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="132"/>
         <source>Bible windows</source>
         <translation>Ventanas de Biblias</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
         <source>Commentary windows</source>
         <translation>Ventanas de comentario</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="134"/>
         <source>Lexicon windows</source>
         <translation>Ventanas de diccionarios léxicos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
         <source>Book windows</source>
         <translation>Ventanas de Libros</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
         <source>
    &quot;%1&quot; in the &quot;%2&quot; group</source>
         <translation>
    &quot;%1&quot; en el &quot;%2&quot; grupo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
         <source>Shortcuts</source>
         <translation>Atajos</translation>
     </message>
@@ -1833,95 +2010,95 @@ atajo</translation>
 <context>
     <name>CBibleReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="64"/>
         <source>Next book</source>
         <translation>Libro siguiente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="68"/>
         <source>Previous book</source>
         <translation>Libro anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="72"/>
         <source>Next chapter</source>
         <translation>Capí­tulo siguiente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="76"/>
         <source>Previous chapter</source>
         <translation>Capí­tulo anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="80"/>
         <source>Next verse</source>
         <translation>Versículo siguiente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="84"/>
         <source>Previous verse</source>
         <translation>Versículo anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="89"/>
         <source>Copy chapter</source>
         <translation>Copiar Capí­tulo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="92"/>
         <source>Save chapter as plain text</source>
         <translation>Guardar Capí­tulo como texto sin formato</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="95"/>
         <source>Save chapter as HTML</source>
         <translation>Guardar Capí­tulo como HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="98"/>
         <source>Print chapter</source>
         <translation>Imprimir Capí­tulo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="110"/>
         <source>Text of reference</source>
         <translation>Texto de referencia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
         <source>Reference with text</source>
         <translation>Referencia con texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="253"/>
         <source>Bible window</source>
         <translation>Ventana de Biblia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="263"/>
         <source>Copy...</source>
         <translation>Copiar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="274"/>
         <source>Save...</source>
         <translation>Guardar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="287"/>
         <source>Print...</source>
         <translation>Imprimir...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="371"/>
         <source>Copying</source>
         <translation>Copiando</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="390"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="408"/>
         <source>Saving</source>
         <translation>Guardando</translation>
     </message>
@@ -1929,7 +2106,7 @@ atajo</translation>
 <context>
     <name>CBookReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
+        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="70"/>
         <source>Toggle tree view</source>
         <translation>Cambiar a vista de arbol</translation>
     </message>
@@ -1937,93 +2114,93 @@ atajo</translation>
 <context>
     <name>CBookmarkIndex</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
         <source>Bookmarks</source>
         <translation>Marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="92"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="583"/>
         <source>New folder</source>
         <translation>Nueva carpeta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
         <source>Rename folder</source>
         <translation>Renombrar carpeta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
         <source>Delete Items</source>
         <translation>Eliminar elementos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="704"/>
         <source>Do you really want to delete the selected items and child-items?</source>
         <translation>Estas seguro que deseas eliminar los elementos seleccionados y sus hijos?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="814"/>
         <source>The work to which the bookmark points to is not installed.</source>
         <translation>La obra a la que apunta el marcador no esta instalada.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
         <source>Print bookmarks...</source>
         <translation>Imprimir marcadores...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="103"/>
         <source>Remove selected items...</source>
         <translation>Eliminar objetos seleccionados...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
         <source>Import to folder...</source>
         <translation>Importar a carpeta...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
         <source>Edit bookmark...</source>
         <translation>Editar marcador...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
         <source>Sort folder bookmarks...</source>
         <translation>Ordenar carpeta de marcadores...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
         <source>Sort all bookmarks...</source>
         <translation>Ordenar todos los marcadores...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="100"/>
         <source>Export from folder...</source>
         <translation>Exportar a carpeta...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="393"/>
         <source>Can drop only bookmarks or one folder</source>
         <translation>Solo puedes soltar a una carpeta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="398"/>
         <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
         <translation>No se puede soltar esta carpeta en ella misma o dentro de sus subcarpetas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="406"/>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="467"/>
         <source>Drag references from text views to this view</source>
         <translation>Arrastrar referencias de las vistas de texto a esta vista</translation>
     </message>
@@ -2031,42 +2208,42 @@ atajo</translation>
 <context>
     <name>CCommentaryReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="31"/>
         <source>Next book</source>
         <translation>Libro siguiente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="35"/>
         <source>Previous book</source>
         <translation>Libro anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="39"/>
         <source>Next chapter</source>
         <translation>Capí­tulo siguiente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="43"/>
         <source>Previous chapter</source>
         <translation>Capí­tulo anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="47"/>
         <source>Next verse</source>
         <translation>Versículo siguiente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="51"/>
         <source>Previous verse</source>
         <translation>Versículo anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="56"/>
         <source>Synchronize</source>
         <translation>Sincronizar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="59"/>
         <source>Synchronize the displayed entry of this work with the active Bible window</source>
         <translation>Sincronizar la entrada desplegada de esta obra con la ventana activa de la Biblia</translation>
     </message>
@@ -2074,7 +2251,7 @@ atajo</translation>
 <context>
     <name>CConfigurationDialog</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="41"/>
         <source>Configure BibleTime</source>
         <translation>Configurar BibleTime</translation>
     </message>
@@ -2082,67 +2259,67 @@ atajo</translation>
 <context>
     <name>CDisplaySettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
         <source>Display templates</source>
         <translation>Plantillas de opciones de pantalla</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
         <source>Available display styles:</source>
         <translation>Estilos de visualización disponibles:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="113"/>
         <source>Style preview</source>
         <translation>Vista preliminar de estilo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="131"/>
         <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
         <translation>Porque de tal manera amo Dios al mundo, que ha dado a su hijo unigénito, para todo aquel que en el crea, no se pierda mas tenga vida eterna.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="138"/>
         <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
         <translation>Porque Dios no envio a su hijo al mundo para juzgar al mundo, sino para que el mundo se salve a través de él.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="145"/>
         <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
         <translation>El que en él cree, no es condenado; mas el que no cree, ya ha sido condenado, porque no creyó en el nombre del unigénito Hijo de Dios.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="155"/>
         <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
         <translation>Porque todo aquel que hace lo malo, aborrece la luz y no viene a la luz, porque sus obras no están redargüidas.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="160"/>
         <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
         <translation>Mas el que obra verdad, viene a la luz, para que sus obras sean manifestadas que son hechas en Dios.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="106"/>
         <source>Display templates define how text is displayed.</source>
         <translation>Desplegar Plantillas define como el texto es desplegado.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="110"/>
         <source>Show the BibleTime logo on startup</source>
         <translation>Mostrar el logo de BibleTIme al arranque</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
         <source>Show startup logo</source>
         <translation>Mostrar logo de arranque</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="150"/>
         <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
         <translation>Este es el juicio, que la luz ha venido al mundo, y los hombres amaron mas la oscuridad que la luz; porque sus obras eran malas.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="101"/>
         <source>Display</source>
         <translation>Pantalla</translation>
     </message>
@@ -2155,62 +2332,62 @@ atajo</translation>
 <context>
     <name>CDisplayWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="215"/>
         <source>Back in history</source>
         <translation>Volver en el historial</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="223"/>
         <source>Forward in history</source>
         <translation>Adelantar en el Historial</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="192"/>
         <source>Select all</source>
         <translation>Seleccionar todo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="196"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="200"/>
         <source>Find...</source>
         <translation>Encontrar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="204"/>
         <source>Change location</source>
         <translation>Cambiar ubicación</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="209"/>
         <source>Search with works of this window</source>
         <translation>Buscar con obras de esta ventana</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="393"/>
         <source>Work chooser buttons</source>
         <translation>Botones del seleccionador de obras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="403"/>
         <source>Text area header</source>
         <translation>Encabezado del area de texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="453"/>
         <source>Navigation</source>
         <translation>Navegación</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="459"/>
         <source>Tool</source>
         <translation>Herramienta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="465"/>
         <source>Format</source>
         <translation>Formato</translation>
     </message>
@@ -2218,61 +2395,61 @@ atajo</translation>
 <context>
     <name>CHTMLWriteDisplay</name>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
         <source>Bold</source>
         <translation>Negrita</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="60"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="67"/>
         <source>Italic</source>
         <translation>Cursiva</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="79"/>
         <source>Underline</source>
         <translation>Subrayar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="84"/>
         <source>Left</source>
         <translation>Izquierda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="94"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="99"/>
         <source>Center</source>
         <translation>Centro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="104"/>
         <source>Right</source>
         <translation>Derecha</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="231"/>
         <source>Font</source>
         <translation>Fuente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="243"/>
         <source>Font size</source>
         <translation>Tamaño de fuente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="255"/>
         <source>Font color</source>
         <translation>Color de fuente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="89"/>
         <source>Align left</source>
         <translation>Alinear a la izquierda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="109"/>
         <source>Align right</source>
         <translation>Alinear a la derecha</translation>
     </message>
@@ -2280,17 +2457,17 @@ atajo</translation>
 <context>
     <name>CHTMLWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="122"/>
         <source>Module not writable</source>
         <translation>El módulo no es escribible</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="124"/>
         <source>Module is not writable.</source>
         <translation>Módulo no escribible.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="125"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>El módulo no puede ser editado, o no tienes permisos de escritura sobre él.</translation>
     </message>
@@ -2306,22 +2483,22 @@ atajo</translation>
 <context>
     <name>CLexiconKeyChooser</name>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Desplázate a través de la entradas de la lista. Presione el botón y mueva el ratón para aumentar o disminuir el elemento.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
         <source>Entries of the current work</source>
         <translation>Entradas en la obra actual</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Entrada siguiente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="49"/>
         <source>Previous entry</source>
         <translation>Entrada anterior</translation>
     </message>
@@ -2329,70 +2506,70 @@ atajo</translation>
 <context>
     <name>CLexiconReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Entrada siguiente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="51"/>
         <source>Previous entry</source>
         <translation>Entrada anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="55"/>
         <source>Copy reference only</source>
         <translation>Sólo copiar referencia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
         <source>Save entry as HTML</source>
         <translation>Guardar entrada como HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
         <source>Print reference only</source>
         <translation>Solo imprimir referencia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
         <source>Strong&apos;s Search</source>
         <translation>Búsqueda en Strong</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
         <source>Entry with text</source>
         <translation>Entrada con texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="134"/>
         <source>Entry as plain text</source>
         <translation>Entrada como texto sin formato</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="265"/>
         <source>Lexicon window</source>
         <translation>Ventana del diccionario léxico</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="272"/>
         <source>Copy...</source>
         <translation>Copiar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="281"/>
         <source>Save...</source>
         <translation>Guardar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="297"/>
         <source>Print...</source>
         <translation>Imprimir...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="340"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="364"/>
         <source>Saving</source>
         <translation>Guardando</translation>
     </message>
@@ -2400,91 +2577,112 @@ atajo</translation>
 <context>
     <name>CPlainWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="235"/>
         <source>Sync with active Bible</source>
         <translation>Sincronizar con Biblia activa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="245"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="249"/>
         <source>Save text</source>
         <translation>Guardar texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="254"/>
         <source>Delete current entry</source>
         <translation>Borrar entrada actual</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="263"/>
         <source>Restore original text</source>
         <translation>Restaurar texto original</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="163"/>
         <source>Module not writable</source>
         <translation>La obra no es escribible</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="165"/>
         <source>Module is not writable.</source>
         <translation>Módulo no escribible.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="166"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>El módulo no puede ser editado, o no tienes permisos de escritura sobre él.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="240"/>
         <source>Synchronize (show the same verse) with the active Bible window</source>
         <translation>Sincronizar (mostrar el mismo versículo) con la ventana de la Biblia activa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="258"/>
         <source>Delete current entry (no undo)</source>
         <translation>Eliminar entrada actual (No se puede deshacer)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="267"/>
         <source>Restore original text, new text will be lost</source>
         <translation>Restaurar texto original, el texto nuevo se perderá</translation>
     </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save Text?</source>
+        <translation type="unfinished">Guardar texto?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <source>Save text before closing?</source>
+        <translation type="unfinished">¿Guardar texto antes de cerrar?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save changed text?</source>
+        <translation type="unfinished">¿Guardar texto modificado?</translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="232"/>
         <source>Save Search Analysis</source>
         <translation>Guardar Análisis de la búsqueda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation>Archivos HTML (*.html;*.HTML;*.HTM;*.htm)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="243"/>
         <source>BibleTime Search Analysis</source>
         <translation>BibleTime Análisis de la búsqueda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation>Buscar texto:</translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="234"/>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="259"/>
+        <source>Search text:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="263"/>
+        <source>Results by work and book</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="265"/>
         <source>Book</source>
         <translation>Libro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="293"/>
         <source>Total hits</source>
         <translation>Total de coincidencias</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="303"/>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
         <translation>Creado por &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</translation>
     </message>
@@ -2492,168 +2690,168 @@ atajo</translation>
 <context>
     <name>CSwordModuleInfo</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="763"/>
         <source>Version</source>
         <translation>Versión</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="766"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="774"/>
         <source>unknown</source>
         <translation>desconocido(a)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="771"/>
         <source>Markup</source>
         <translation>Marcar</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="782"/>
         <source>Language</source>
         <translation>Idioma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="787"/>
         <source>Category</source>
         <translation>Categorí­a</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="792"/>
         <source>LCSH</source>
         <translation>LCSH</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="796"/>
         <source>Writable</source>
         <translation>Escribible</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>yes</source>
         <translation>si­</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>no</source>
         <translation>no</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="801"/>
         <source>Unlock key</source>
         <translation>Desbloquear clave</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="822"/>
         <source>Features</source>
         <translation>Características</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="830"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>¡Ten cuidado, esta obra contiene material dudoso / cuestionable!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="834"/>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="856"/>
         <source>Distribution license</source>
         <translation>Licencia de distribución</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="857"/>
         <source>Distribution source</source>
         <translation>Fuente de distribución</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="858"/>
         <source>Distribution notes</source>
         <translation>Notas de distribución</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="859"/>
         <source>Text source</source>
         <translation>Fuente del texto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="860"/>
         <source>Copyright notes</source>
         <translation>Notas de Copyright</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
         <source>Copyright holder</source>
         <translation>Propietario del Copyright</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
         <source>Copyright date</source>
         <translation>Fecha de Copyright</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
         <source>Copyright contact name</source>
         <translation>Nombre del contacto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
         <source>Copyright contact address</source>
         <translation>Dirección de contacto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
         <source>Copyright contact email</source>
         <translation>Email de contacto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="956"/>
         <source>Bibles</source>
         <translation>Biblias</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="958"/>
         <source>Commentaries</source>
         <translation>Comentarios</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="960"/>
         <source>Books</source>
         <translation>Libros</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="962"/>
         <source>Cults/Unorthodox</source>
         <translation>Cultos/No Ortodoxos</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="964"/>
         <source>Maps and Images</source>
         <translation>Mapas e Imágenes</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="966"/>
         <source>Daily Devotionals</source>
         <translation>Devocionales diarios</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="968"/>
         <source>Lexicons and Dictionaries</source>
         <translation>Léxicos y Diccionarios</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="970"/>
         <source>Glossaries</source>
         <translation>Glosarios</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="972"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
@@ -2661,17 +2859,17 @@ atajo</translation>
 <context>
     <name>CSwordSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="43"/>
         <source>Standard works</source>
         <translation>Obras Estándar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="44"/>
         <source>Text filters</source>
         <translation>Filtros de texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="41"/>
         <source>Desk</source>
         <translation>Escritorio</translation>
     </message>
@@ -2684,37 +2882,37 @@ atajo</translation>
 <context>
     <name>CSwordSetupInstallSourcesDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="47"/>
         <source>Caption</source>
         <translation>Título</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="68"/>
         <source>Path</source>
         <translation>Ruta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="91"/>
         <source>Get list...</source>
         <translation>Obtener lista...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
         <source>A source with this caption already exists. Please provide a different caption.</source>
         <translation>Una fuente con este título ya existe. Por favor introduce un título diferente.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="160"/>
         <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
 
 Do you want to continue?</source>
@@ -2723,140 +2921,121 @@ Do you want to continue?</source>
 Deseas continuar?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
         <source>Get source list from remote server?</source>
         <translation>Obtener lista de fuentes del servidor remoto?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="167"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="168"/>
         <source>Downloading List</source>
         <translation>Descargando Lista</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="178"/>
         <source>Connecting...</source>
         <translation>Conectando....</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="197"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="198"/>
         <source>Refreshing...</source>
         <translation>Actualizando...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="92"/>
         <source>Download a list of sources from CrossWire server and add sources</source>
         <translation>Descargar una lista de las fuentes del servidor de CrossWire y agregar las fuentes</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
         <source>Please provide a caption.</source>
         <translation>Por favor introduce un título.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
         <source>Please provide a server name.</source>
         <translation>Por favor introduce un nombre de servidor.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
         <source>Please provide a valid, readable path.</source>
         <translation>Por favor introduce ruta valida y leible.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Please provide a path.</source>
         <translation>Por favor introduce una ruta.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="39"/>
         <source>New  Installation Source</source>
         <translation>Nueva  Fuente de Instalación</translation>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>¿Guardar texto antes de cerrar?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>¿Guardar texto modificado?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>Guardar texto?</translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="178"/>
         <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
         <translation>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Versión: %3&lt;/p&gt;&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="194"/>
         <source>Abbreviation</source>
         <translation>Abreviación</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="203"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="290"/>
         <source>Cross references</source>
         <translation>Referencias cruzadas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="343"/>
         <source>Footnote</source>
         <translation>Notas al pie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="374"/>
         <source>Strongs</source>
         <translation>Números de Strong</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="451"/>
         <source>Morphology</source>
         <translation>Etiquetas morfológicas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="472"/>
         <source>Word lookup</source>
         <translation>Buscar palabra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="60"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
         <source>Select all</source>
         <translation>Seleccionar todo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="80"/>
         <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
         <translation type="unfinished">&lt;small&gt;Esta es el area de visor de lente. Coloca el ratón sobre los enlaces y otros elementos que incluyan datos y el contenido aparecera en la lente</translation>
     </message>
@@ -2864,28 +3043,28 @@ Deseas continuar?</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="412"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="422"/>
         <source>Indexing aborted</source>
         <translation>Indexación interrumpida</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="413"/>
         <source>An internal error occurred while building the index: %1</source>
         <translation>Ocurrió un error interno mientras se construía el índice: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="423"/>
         <source>An internal error occurred while building the index.</source>
         <translation>Ocurrió un error interno mientras se construia el índice.</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="522"/>
         <source>Search aborted</source>
         <translation>Búsqueda abortada</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="523"/>
         <source>An internal error occurred while executing your search.</source>
         <translation>Ocurrió un error interno mientras se ejecutaba tu búsqueda.</translation>
     </message>
@@ -2926,7 +3105,7 @@ Deseas continuar?</translation>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="122"/>
         <source>Bibles</source>
         <translation>Biblias</translation>
     </message>
@@ -2943,735 +3122,735 @@ Deseas continuar?</translation>
         <translation>Libros</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="390"/>
         <source>Added text</source>
         <translation>Texto agregado</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="143"/>
         <source>Names of languages</source>
         <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
         <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="148"/>
         <source>Afrikaans</source>
         <extracomment>Language name af</extracomment>
         <translation>Afrikáans</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="151"/>
         <source>Amuzgo, Guerrero</source>
         <extracomment>Language name amu</extracomment>
         <translation>Amuzgo, Guerrero</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="153"/>
         <source>English, Old (ca.450-1100)</source>
         <extracomment>Language name ang</extracomment>
         <translation>Inglés, Antiguo (circa 450-1100)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="155"/>
         <source>Arabic</source>
         <extracomment>Language name ar</extracomment>
         <translation>�rabe</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="158"/>
         <source>Azerbaijani</source>
         <extracomment>Language name az</extracomment>
         <translation>Azerbaiyaní</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="160"/>
         <source>Azerbaijani, South</source>
         <extracomment>Language name azb</extracomment>
         <translation>Azerbayaní, Sur</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="165"/>
         <source>Belarusian</source>
         <extracomment>Language name be</extracomment>
         <translation>Bieloruso</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="167"/>
         <source>Bulgarian</source>
         <extracomment>Language name bg</extracomment>
         <translation>Búlgaro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="173"/>
         <source>Breton</source>
         <extracomment>Language name br</extracomment>
         <translation>Bretón</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="175"/>
         <source>Bosnian</source>
         <extracomment>Language name bs</extracomment>
         <translation>Bosnio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="177"/>
         <source>Catalan</source>
         <extracomment>Language name ca</extracomment>
         <translation>Catalán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="180"/>
         <source>Chinantec, Comaltepec</source>
         <extracomment>Language name cco</extracomment>
         <translation>Chinanteca, Comaltepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="182"/>
         <source>Cebuano</source>
         <extracomment>Language name ceb</extracomment>
         <translation>Cebuano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
         <source>Chamorro</source>
         <extracomment>Language name ch</extracomment>
         <translation>Chamorro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
         <source>Chontal, Highland Oaxaca</source>
         <extracomment>Language name chd</extracomment>
         <translation>Chontal, Altas Oaxaca</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
         <source>Chinantec, Quiotepec</source>
         <extracomment>Language name chq</extracomment>
         <translation>Chinanteca, Quiotepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="190"/>
         <source>Chinantec, Ozumacu00edn</source>
         <extracomment>Language name chz</extracomment>
         <translation>Chinanteca, Ozumacun</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="193"/>
         <source>Cakchiquel, Western</source>
         <extracomment>Language name ckw</extracomment>
         <translation>Cakchiquel, Oeste</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="195"/>
         <source>Chinantec, Lalana</source>
         <extracomment>Language name cnl</extracomment>
         <translation>Chinanteca, Lalana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="197"/>
         <source>Chinantec, Tepetotutla</source>
         <extracomment>Language name cnt</extracomment>
         <translation>Chinanteca, Tepetotutla</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="199"/>
         <source>Coptic</source>
         <extracomment>Language name cop</extracomment>
         <translation>Copto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
         <source>Czech</source>
         <extracomment>Language name cs</extracomment>
         <translation>Checo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
         <source>Chinantec, Sochiapan</source>
         <extracomment>Language name cso</extracomment>
         <translation>Chinanteca, Sochiapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
         <source>Chol, Tila</source>
         <extracomment>Language name cti</extracomment>
         <translation>Chol, Tila</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
         <source>Chatino, Western Highland</source>
         <extracomment>Language name ctp</extracomment>
         <translation>Chatino, Altas tierras del Oeste</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
         <source>Church Slavic</source>
         <extracomment>Language name cu</extracomment>
         <translation>Church Eslavo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="212"/>
         <source>Welsh</source>
         <extracomment>Language name cy</extracomment>
         <translation>Galés</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
         <source>Danish</source>
         <extracomment>Language name da</extracomment>
         <translation>Danés</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
         <source>German</source>
         <extracomment>Language name de</extracomment>
         <translation>Alemán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
         <source>Duruma</source>
         <extracomment>Language name dug</extracomment>
         <translation>Duruma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="221"/>
         <source>Greek, Modern (1453-)</source>
         <extracomment>Language name el</extracomment>
         <translation>Griego, Moderno (1453-)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
         <source>English</source>
         <extracomment>Language name en</extracomment>
         <translation>Inglés</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="225"/>
         <source>American English</source>
         <extracomment>Language name en_US</extracomment>
         <translation>Inglés Americano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="227"/>
         <source>English, Middle (1100-1500)</source>
         <extracomment>Language name enm</extracomment>
         <translation>Inglés, Medio (1100-1500)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="229"/>
         <source>Esperanto</source>
         <extracomment>Language name eo</extracomment>
         <translation>Esperanto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="231"/>
         <source>Spanish</source>
         <extracomment>Language name es</extracomment>
         <translation>Español</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
         <source>Estonian</source>
         <extracomment>Language name et</extracomment>
         <translation>Estoniano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
         <source>Basque</source>
         <extracomment>Language name eu</extracomment>
         <translation>Vasco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
         <source>Persian</source>
         <extracomment>Language name fa</extracomment>
         <translation>Persa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
         <source>Finnish</source>
         <extracomment>Language name fi</extracomment>
         <translation>Finlandés</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="243"/>
         <source>French</source>
         <extracomment>Language name fr</extracomment>
         <translation>Francés</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="245"/>
         <source>Frisian</source>
         <extracomment>Language name fy</extracomment>
         <translation>Frisio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="247"/>
         <source>Irish</source>
         <extracomment>Language name ga</extracomment>
         <translation>Irlandés</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="249"/>
         <source>Gaelic (Scots)</source>
         <extracomment>Language name gd</extracomment>
         <translation>Gaélico (Escocés)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="251"/>
         <source>Geez</source>
         <extracomment>Language name gez</extracomment>
         <translation>Geez</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
         <source>Gothic</source>
         <extracomment>Language name got</extracomment>
         <translation>Gótico</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
         <source>Manx</source>
         <extracomment>Language name gv</extracomment>
         <translation>Manx (Isla de Man)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
         <source>Greek, Ancient (to 1453)</source>
         <extracomment>Language name grc</extracomment>
         <translation>Griego, Antiguo (hasta 1453)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="262"/>
         <source>Hebrew</source>
         <extracomment>Language name he</extracomment>
         <translation>Hebreo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
         <source>Hausa</source>
         <extracomment>Language name hau</extracomment>
         <translation>Hausa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
         <source>Hawaiian</source>
         <extracomment>Language name haw</extracomment>
         <translation>Hawaiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
         <source>Hindi</source>
         <extracomment>Language name hi</extracomment>
         <translation>Hindú</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="271"/>
         <source>Croatian</source>
         <extracomment>Language name hr</extracomment>
         <translation>Croata</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="275"/>
         <source>Hungarian</source>
         <extracomment>Language name hu</extracomment>
         <translation>Húngaro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
         <source>Huave, San Mateo Del Mar</source>
         <extracomment>Language name huv</extracomment>
         <translation>Huave, San Mateo Del Mar</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
         <source>Armenian</source>
         <extracomment>Language name hy</extracomment>
         <translation>Armenio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
         <source>Indonesian</source>
         <extracomment>Language name id</extracomment>
         <translation>Indonesio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
         <source>Icelandic</source>
         <extracomment>Language name is</extracomment>
         <translation>Islándico</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
         <source>Italian</source>
         <extracomment>Language name it</extracomment>
         <translation>Italiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="291"/>
         <source>Itzu00e1</source>
         <extracomment>Language name itz</extracomment>
         <translation>Itzu00e1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="293"/>
         <source>Ixil, San Juan Cotzal</source>
         <extracomment>Language name ixl</extracomment>
         <translation>Ixil, San Juan Cotzal</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
         <source>Japanese</source>
         <extracomment>Language name ja</extracomment>
         <translation>Japonés</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
         <source>Jacalteco, Eastern</source>
         <extracomment>Language name jac</extracomment>
         <translation>Jacalteco, Éste</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
         <source>Javanese, Caribbean</source>
         <extracomment>Language name jvn</extracomment>
         <translation>Javanés</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="302"/>
         <source>Georgian</source>
         <extracomment>Language name ka</extracomment>
         <translation>Georgiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
         <source>Korean</source>
         <extracomment>Language name ko</extracomment>
         <translation>Coreano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="315"/>
         <source>Kurdish</source>
         <extracomment>Language name ku</extracomment>
         <translation>Kurdo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
         <source>Kirghiz</source>
         <extracomment>Language name ky</extracomment>
         <translation>Kirghiz</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
         <source>Latin</source>
         <extracomment>Language name la</extracomment>
         <translation>Latin</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
         <source>Lacandon</source>
         <extracomment>Language name lac</extracomment>
         <translation>Lacandon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
         <source>Lithuanian</source>
         <extracomment>Language name lt</extracomment>
         <translation>Lituano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="332"/>
         <source>Latvian</source>
         <extracomment>Language name lv</extracomment>
         <translation>Latvio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="334"/>
         <source>Malagasy</source>
         <extracomment>Language name mg</extracomment>
         <translation>Madagascarí</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="337"/>
         <source>Maori</source>
         <extracomment>Language name mi</extracomment>
         <translation>Maorí</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="339"/>
         <source>Mixe, Isthmus</source>
         <extracomment>Language name mir</extracomment>
         <translation>Mixe, Istmo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="341"/>
         <source>Mixtec, Coatzospan</source>
         <extracomment>Language name miz</extracomment>
         <translation>Mixteca, Coatzospan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="343"/>
         <source>Macedonian</source>
         <extracomment>Language name mk</extracomment>
         <translation>Macedonio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="345"/>
         <source>Mixtec, Silacayoapan</source>
         <extracomment>Language name mks</extracomment>
         <translation>Mixtec, Silacayoapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="350"/>
         <source>More</source>
         <extracomment>Language name mos</extracomment>
         <translation>Maorí</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
         <source>Malay</source>
         <extracomment>Language name ms</extracomment>
         <translation>Malayo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
         <source>Maltese</source>
         <extracomment>Language name mt</extracomment>
         <translation>Maltés</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="375"/>
         <source>Low German; Low Saxon</source>
         <extracomment>Language name nds</extracomment>
         <translation>Alemán Bajo, Sajón Bajo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="377"/>
         <source>Nepali</source>
         <extracomment>Language name ne</extracomment>
         <translation>Nepalí</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="379"/>
         <source>Nahuatl, Guerrero</source>
         <extracomment>Language name ngu</extracomment>
         <translation>Nahuatl, Guerrero</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
         <source>Nahuatl, Northern Oaxaca</source>
         <extracomment>Language name nhy</extracomment>
         <translation>Nahuatl, Norte de Oaxaca</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
         <source>Dutch</source>
         <extracomment>Language name nl</extracomment>
         <translation>Holandés</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
         <source>Norwegian Nynorsk</source>
         <extracomment>Language name nn</extracomment>
         <translation>Noruego Nuevo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
         <source>Norwegian</source>
         <extracomment>Language name no</extracomment>
         <translation>Noruego</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
         <source>Papiamento</source>
         <extracomment>Language name pap</extracomment>
         <translation>Papiamento</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
         <source>Polish</source>
         <extracomment>Language name pl</extracomment>
         <translation>Polaco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="411"/>
         <source>Persian (Dari)</source>
         <extracomment>Language name prs</extracomment>
         <translation>Persa (Dari)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="415"/>
         <source>Portuguese</source>
         <extracomment>Language name pt</extracomment>
         <translation>Portugués</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
         <source>Brasilian Portuguese</source>
         <extracomment>Language name pt_BR</extracomment>
         <translation>Portugés Brasileño</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
         <source>Quichu00e9, West Central</source>
         <extracomment>Language name qut</extracomment>
         <translation>Quiche, Oeste Central</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
         <source>Romanian</source>
         <extracomment>Language name ro</extracomment>
         <translation>Rumano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
         <source>Russian</source>
         <extracomment>Language name ru</extracomment>
         <translation>Ruso</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="431"/>
         <source>Scots</source>
         <extracomment>Language name sco</extracomment>
         <translation>Escocés</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="437"/>
         <source>Slovak</source>
         <extracomment>Language name sk</extracomment>
         <translation>Eslovaco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="439"/>
         <source>Slovenian</source>
         <extracomment>Language name sl</extracomment>
         <translation>Esloveno</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="443"/>
         <source>Somali</source>
         <extracomment>Language name so</extracomment>
         <translation>Somalí­</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
         <source>Albanian</source>
         <extracomment>Language name sq</extracomment>
         <translation>Albanés</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="453"/>
         <source>Swedish</source>
         <extracomment>Language name sv</extracomment>
         <translation>Sueco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="455"/>
         <source>Swahili</source>
         <extracomment>Language name sw</extracomment>
         <translation>Swahili</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="457"/>
         <source>Syriac</source>
         <extracomment>Language name syr</extracomment>
         <translation>Siriaco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="459"/>
         <source>Tamil</source>
         <extracomment>Language name ta</extracomment>
         <translation>Tamil</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="463"/>
         <source>Thai</source>
         <extracomment>Language name th</extracomment>
         <translation>Tailandés</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
         <source>Tagalog</source>
         <extracomment>Language name tl</extracomment>
         <translation>Tagalog</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="470"/>
         <source>Tswana</source>
         <extracomment>Language name tn</extracomment>
         <translation>Tswana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="472"/>
         <source>Turkish</source>
         <extracomment>Language name tr</extracomment>
         <translation>Turco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
         <source>Tektiteko</source>
         <extracomment>Language name ttc</extracomment>
         <translation>Tectiteco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="479"/>
         <source>Tahitian</source>
         <extracomment>Language name ty</extracomment>
         <translation>Tahitiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
         <source>Ukrainian</source>
         <extracomment>Language name uk</extracomment>
         <translation>Ucraniano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
         <source>Orya</source>
         <extracomment>Language name ury</extracomment>
         <translation>Orya</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
         <source>Uspanteco</source>
         <extracomment>Language name usp</extracomment>
         <translation>Uspanteco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="492"/>
         <source>Vietnamese</source>
         <extracomment>Language name vi</extracomment>
         <translation>Vietnamita</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="496"/>
         <source>Xhosa</source>
         <extracomment>Language name xh</extracomment>
         <translation>Xhosa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="163"/>
         <source>Bavarian</source>
         <extracomment>Language name bar</extracomment>
         <translation>Bávaro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="326"/>
         <source>Lombard</source>
         <extracomment>Language name lmo</extracomment>
         <translation>Lombard</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="397"/>
         <source>Otomi, Queru00e9taro</source>
         <extracomment>Language name otq</extracomment>
         <translatorcomment>Querétaro is a state of Mexico</translatorcomment>
         <translation>Otomi, Querétaro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="403"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
         <source>Uma</source>
         <extracomment>Language name ppk
 ----------
@@ -3679,447 +3858,427 @@ Language name ppk</extracomment>
         <translation>Uma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="448"/>
         <source>Sranan</source>
         <extracomment>Language name srn</extracomment>
         <translation>Sranan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="481"/>
         <source>Tzotzil, Zinacantu00e1n</source>
         <extracomment>Language name tzz</extracomment>
         <translation>Tzotzil, Zinacantuen</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
         <source>Yiddish</source>
         <extracomment>Language name yi</extracomment>
         <translation>JudeoAlemán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
         <source>Zapotec, San Juan Guelavu00eda</source>
         <extracomment>Language name zab</extracomment>
         <translation>Zapoteca, San Juan Guelaveda</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="507"/>
         <source>Zapotec, Mitla</source>
         <extracomment>Language name zaw</extracomment>
         <translation>Zapoteco, Mitla</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="509"/>
         <source>Chinese</source>
         <extracomment>Language name zh</extracomment>
         <translation>Chino</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="511"/>
         <source>Zapotec, Amatlu00e1n</source>
         <extracomment>Language name zpo</extracomment>
         <translation>Zapoteco, Amatlun</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
         <source>Zapotec, Zoogocho</source>
         <extracomment>Language name zpq</extracomment>
         <translation>Zapoteco, Zoogocho</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="515"/>
         <source>Zapotec, Yalu00e1lag</source>
         <extracomment>Language name zpu</extracomment>
         <translation>Zapoteco, Yalulag</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
         <source>Zapotec, Chichicapan</source>
         <extracomment>Language name zpv</extracomment>
         <translation>Zapoteco, Chichicapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
         <source>Zapotec, Southern Rincon</source>
         <extracomment>Language name zsr</extracomment>
         <translation>Zapoteco, Rincón del sur</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
         <source>Zapotec, Quioquitani-Quieru00ed</source>
         <extracomment>Language name ztq</extracomment>
         <translation>Zapoteco, Quioquitani-Quierud</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
         <source>Zapotec, Yatee</source>
         <extracomment>Language name zty</extracomment>
         <translation>Zapoteco, Yatee</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="525"/>
         <source>Zulu</source>
         <extracomment>Language name zu</extracomment>
         <translation>Zulú</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="314"/>
         <source>Footnotes</source>
         <translation>Notas al pie</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="316"/>
         <source>Strong&apos;s numbers</source>
         <translation>Números de Strong</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="318"/>
         <source>Headings</source>
         <translation>Cabeceras</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="320"/>
         <source>Morphological tags</source>
         <translation>Etiquetas morfológicas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="322"/>
         <source>Lemmas</source>
         <translation>Lemas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="324"/>
         <source>Hebrew vowel points</source>
         <translation>Puntos vocales Hebreos</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="326"/>
         <source>Hebrew cantillation marks</source>
         <translation>Mostrar los acentos de &quot;cantilación&quot; hebreas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="328"/>
         <source>Greek accents</source>
         <translation>Acentos Griegos</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="330"/>
         <source>Red letter words</source>
         <translation>Palabras en letras rojas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="332"/>
         <source>Textual variants</source>
         <translation>Varientes Textuales</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="334"/>
         <source>Scripture cross-references</source>
         <translation>Referencias cruzadas de las Escricturas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="336"/>
         <source>Morph segmentation</source>
         <translation>Segmentación de Morfología</translation>
     </message>
     <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation>Exportar</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
         <source>Local</source>
         <translation>Local</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>Remoto</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Antiguo Testamento</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Moisés/Pentateuco/Torá</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>Historia</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Profetas</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>Nuevo Testamento</translation>
+        <source>Remote FTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Evangelios</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="32"/>
+        <source>Remote SFTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>Cartas/Epí­stolas</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="33"/>
+        <source>Remote HTTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Las Epí­stolas de Pablo</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="34"/>
+        <source>Remote HTTPS</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
         <source>HTML files</source>
         <translation>Archivos HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="438"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>All files</source>
         <translation>Todos los archivos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>Text files</source>
         <translation>Archivos de texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="444"/>
         <source>Save file</source>
         <translation>Guardar archivo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="130"/>
         <source>Save document ...</source>
         <translation>Guardar el documento...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
         <source>BibleTime bookmark files</source>
         <translation>Archivos de marcadores de BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="127"/>
         <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="60"/>
         <source>New folder</source>
         <translation>Nueva carpeta</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
+        <location filename="../../src/util/tool.cpp" line="48"/>
         <source>The file already exists.</source>
         <translation>¡El archivo ya existe!.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
+        <location filename="../../src/util/tool.cpp" line="49"/>
         <source>Do you want to overwrite it?</source>
         <translation>¿Deseas sobreescribirlo?</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
+        <location filename="../../src/util/tool.cpp" line="69"/>
+        <location filename="../../src/util/tool.cpp" line="75"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>El archivo no se puede guardar.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
+        <location filename="../../src/util/tool.cpp" line="78"/>
         <source>Please check permissions etc.</source>
         <translation>Por favor, comprueba los permisos, etc.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
+        <location filename="../../src/util/tool.cpp" line="197"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>¡Ten cuidado, esta obra contiene material dudoso / cuestionable!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
+        <location filename="../../src/util/tool.cpp" line="218"/>
         <source>Version</source>
         <translation>Versión</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
+        <location filename="../../src/util/tool.cpp" line="207"/>
         <source>Encrypted - needs unlock key</source>
         <translation>Encriptado - necesita clave de desbloqueo</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
+        <location filename="../../src/util/tool.cpp" line="71"/>
+        <source>Error while writing to file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="72"/>
+        <source>Please check that enough disk space is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="77"/>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="231"/>
         <source>Double click for more information</source>
         <translation>Doble click para más información</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
+        <location filename="../../src/util/tool.cpp" line="213"/>
         <source>Updated version available!</source>
         <translation>Versión actualizada disponible!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
+        <location filename="../../src/util/tool.cpp" line="226"/>
         <source>Installed version</source>
         <translation>Versión instalada</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="273"/>
         <source>Haitian Creole</source>
         <extracomment>Language name ht</extracomment>
         <translation>Haitiano Creole</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
         <source>Kekchu00ed</source>
         <comment>kek</comment>
         <extracomment>Language name kek</extracomment>
         <translation>Cacché, Quecchí</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="357"/>
         <source>(Multiple languages)</source>
         <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
         <translation>(Multiples idiomas)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="359"/>
         <source>Mam, Central</source>
         <extracomment>Language name mvc</extracomment>
         <translation>Mam, Central</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
         <source>Mam, Todos Santos Cuchumatu00e1n</source>
         <extracomment>Language name mvj</extracomment>
         <translation>Mam, Todos Santos Cuchumatu00e1n</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="363"/>
         <source>Mixe, Juquila</source>
         <extracomment>Language name mxq</extracomment>
         <translation>Mixé, Juquila</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="365"/>
         <source>Mixtec, Jamiltepec</source>
         <extracomment>Language name mxt</extracomment>
         <translation>Mixteca, Jamiltepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="367"/>
         <source>Burmese</source>
         <extracomment>Language name my</extracomment>
         <translation>Birmano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="370"/>
         <source>Norwegian Bokmu00e5l</source>
         <extracomment>Language name nb</extracomment>
         <translation>Noruego, libro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="372"/>
         <source>Nahuatl, Michoacu00e1n</source>
         <extracomment>Language name ncl</extracomment>
         <translation>Nahuatrl, Michoacán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
         <source>Potawatomi</source>
         <extracomment>Language name pot</extracomment>
         <translation>Potawatomi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="468"/>
         <source>Klingon</source>
         <extracomment>Language name tlh</extracomment>
         <translation>Klingon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="498"/>
         <source>Mixtec, Diuxi-Tilantongo</source>
         <extracomment>Language name xtd</extracomment>
         <translation>Mixteca, Diuxi-Tilantongo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
         <source>Yoryba</source>
         <extracomment>Language name yo</extracomment>
         <translation>Yoryba</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="407"/>
         <source>Verb tense changed</source>
         <translation>El tiempo del verbo cambio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>Can&apos;t write file</source>
         <translation>No se puede escribir archivo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>The Sword config file can&apos;t be written!</source>
         <translation>El archivo de configuración de Sword no puede ser escrito!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="39"/>
         <source>Export Bookmarks</source>
         <translation>Exportar Marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="50"/>
         <source>Import bookmarks</source>
         <translation>Importar marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
+        <location filename="../../src/util/tool.cpp" line="46"/>
         <source>Overwrite File?</source>
         <translation>Sobreescribir Archivo?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="276"/>
         <source>Parsing Strong&apos;s Numbers</source>
         <translation>Ordenando Números de Strong</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="154"/>
         <source>This shortcut conflicts with the shortcut for the following actions:</source>
         <translation>Este atajo tiene conflictos con el atajo para las siguientes acciones:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
         <source>Do you want to clear the conflicting shortcuts and continue?</source>
         <translation>Deseas eliminar atajos con conflictos y continuar?</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="23"/>
         <source>Indexed works</source>
         <translation>Obras indexadas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="24"/>
         <source>Unindexed works</source>
         <translation>Obras no indexadas</translation>
     </message>
@@ -4164,17 +4323,17 @@ Language name ppk</extracomment>
         <translation type="unfinished">Error: Argumento Inválido en la linea de comandos: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="57"/>
         <source>CSS base template not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="74"/>
         <source>Default template &quot;%1&quot; not found!</source>
         <translation>¡Plantilla predeterminada &quot;%1&quot; no se encuentra!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="113"/>
         <source>Replace</source>
         <translation type="unfinished">Reemplazar</translation>
     </message>
@@ -4182,91 +4341,91 @@ Language name ppk</extracomment>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="58"/>
         <source>OK</source>
         <comment>Dialog Button</comment>
         <translation>Si</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="59"/>
         <source>Open</source>
         <comment>Dialog Button</comment>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="60"/>
         <source>Save</source>
         <comment>Dialog Button</comment>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="61"/>
         <source>Cancel</source>
         <comment>Dialog Button</comment>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="62"/>
         <source>Close</source>
         <comment>Dialog Button</comment>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="63"/>
         <source>Discard</source>
         <comment>Dialog Button</comment>
         <translation>Descartar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="64"/>
         <source>Apply</source>
         <comment>Dialog Button</comment>
         <translation>Aplicar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="65"/>
         <source>Reset</source>
         <comment>Dialog Button</comment>
         <translation>Reestablecer</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="66"/>
         <source>Restore defaults</source>
         <comment>Dialog Button</comment>
         <translation>Restaurar predefinidos</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="67"/>
         <source>Help</source>
         <comment>Dialog Button</comment>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="68"/>
         <source>Save All</source>
         <comment>Dialog Button</comment>
         <translation>Guardar Todo</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="69"/>
         <source>Yes</source>
         <comment>Dialog Button</comment>
         <translation>Si</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="70"/>
         <source>Yes to all</source>
         <comment>Dialog Button</comment>
         <translation>Si a todo</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="71"/>
         <source>No</source>
         <comment>Dialog Button</comment>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="72"/>
         <source>No to all</source>
         <comment>Dialog Button</comment>
         <translation>No a todo</translation>
@@ -4275,104 +4434,104 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchOptionsArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="97"/>
         <source>Search for:</source>
         <translation>Buscar por:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="104"/>
         <source>&amp;Search</source>
         <translation>&amp;Buscar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="106"/>
         <source>Start to search the text in the chosen works</source>
         <translation>Comenzar a buscar el texto en las obras escogidas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="109"/>
         <source>Ch&amp;oose...</source>
         <translation>Es&amp;coger...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="111"/>
         <source>Choose works for the search</source>
         <translation>Selecciona obras para la búsqueda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="114"/>
         <source>S&amp;etup...</source>
         <translation>C&amp;onfigurar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="133"/>
         <source>All of the words (AND is added between the words)</source>
         <translatorcomment>AND es palabra clave, no se traduce aquí</translatorcomment>
         <translation>Todas las palabras (AND es agregado entre las palabras)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="137"/>
         <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
         <translation> (&lt;a href=&apos;syntax_help&apos;&gt;sintaxis completa&lt;/a&gt;)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="148"/>
         <source>Scope:</source>
         <translation>Criterio:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="169"/>
         <source>The text you want to search for</source>
         <translation>El texto que deseas buscar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="173"/>
         <source>Works:</source>
         <translation>Obras:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="346"/>
         <source>No search scope</source>
         <translation>No hay un criterio de búsqueda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="128"/>
         <source>All words</source>
         <translation>Todas las palabras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="116"/>
         <source>Configure predefined scopes for search</source>
         <translation>Configurar criterios predefinidos para buscar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="130"/>
         <source>Some words</source>
         <translation>Algunas palabras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
         <source>Free</source>
         <translation>Libre</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
         <source>Some of the words (OR is added between the words)</source>
         <translatorcomment>OR es palabra clave, no se traduce aquí</translatorcomment>
         <translation>Algunas de las palabras (OR es agregado entre las palabras)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
         <source>Full lucene syntax</source>
         <translation>Sintaxis Lucena Completa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
         <source>Click the link to get help for search syntax</source>
         <translation>Haz Click en el enlace para obtener ayuda para la sintaxis de búsqueda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="159"/>
         <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
         <translation>Selecciona el criterio (libros/capitulos/versículos donde buscar).&lt;br /&gt;Aplicable en Biblias y comentarios.</translation>
     </message>
@@ -4380,17 +4539,17 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchResultArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="85"/>
         <source>Text of the selected search result item</source>
         <translation>Texto del elemento de la búsqueda seleccionada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="88"/>
         <source>Select all</source>
         <translation>Seleccionar todo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="92"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -4398,242 +4557,242 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchSyntaxHelpDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="47"/>
         <source>Search Syntax Help</source>
         <translation>Buscar Ayuda con Sintaxis</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="94"/>
         <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
         <translation>Esta ayuda es principalmente para la opción de &apos;Sintaxis Completa&apos;. Las opciones de &apos;Todas las palabras&apos; y &apos;Algunas palabras&apos; tienen una sintaxis mas limitada; &lt;a href=&apos;#wildcards&apos;&gt;comodines&lt;/a&gt; y &lt;a href=&apos;#fields&apos;&gt;campos de texto&lt;/a&gt;son soportados. Algunas otras caracteristicas de sintaxis pueden arrojar resultados extraños o equivocados con Todas las palabras/Algunas palabras.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
         <source>Which words to find</source>
         <translation>Cuales palabras para encontrar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="101"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
         <source>Grouping and order</source>
         <translation>Agrupación y orden</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="103"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
         <source>Wildcards (partial words)</source>
         <translation>Comodines (palabras parciales)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
         <source>Text fields (different parts of text)</source>
         <translation>Campos de texto (partes diferentes de texto)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="208"/>
         <source>Other syntax features</source>
         <translation>Otras características de sintaxis</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
         <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
         <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
         <translation>Las condiciones de busqueda estan separadas con espacios. &lt;strong&gt;AND&lt;/strong&gt; (todas las palabras), &lt;strong&gt;OR&lt;/strong&gt; (algunas palabras) y &lt;strong&gt;NOT&lt;/strong&gt; (no la siguiente palabra) pueden ser agregadas entre las palabras. Si nunguna se agrega explicitamente OR es usada automaticamente. &apos;&lt;strong&gt;+&lt;/strong&gt;Significa que la palabra tiene que estar en los resultados, &apos;&lt;strong&gt;-&lt;/strong&gt;Significa que la palabra no tiene que estar en los resultados.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="119"/>
         <source>jesus AND god</source>
         <comment>Do not translate &quot;AND&quot;.</comment>
         <translation>Jesús AND Dios</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="121"/>
         <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
         <translation>Encontrar versículos con ambos &apos;Jesús&apos; y &apos;Dios&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="123"/>
         <source>jesus OR god</source>
         <comment>Do not translate &quot;OR&quot;.</comment>
         <translation>Jesús OR Dios</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="125"/>
         <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
         <translation>Encontrar versículos con &apos;Jesús&apos; o &apos;Dios&apos; o ambas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="127"/>
         <source>jesus NOT god</source>
         <comment>Do not translate &quot;NOT&quot;.</comment>
         <translation>Jesús NOT Dios</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="133"/>
         <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
         <translation>Encontrar versículos con &apos;Jesús&apos; pero sin &apos;Dios&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="131"/>
         <source>+jesus -god</source>
         <translation>+Jesús -Dios</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
         <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
         <translation>Las palabras pueden agruparse con &lt;strong&gt;paréntesis&lt;/strong&gt;. El orden estricto de las palabras puede ser definido con &lt;strong&gt;comillas&lt;/strong&gt;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
         <source>(a AND b) OR c</source>
         <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
         <translation>(a AND b) OR c</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
         <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
         <translation>Encontrar versículos con ambas &apos;a&apos; AND &apos;b&apos;,y versículos con &apos;c&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="145"/>
         <source>&quot;says lord&quot;</source>
         <translation>&quot;dice señor&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="149"/>
         <source>&quot;says the lord&quot;</source>
         <translation>&quot;dice el señor&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="151"/>
         <source>Finds all verses with &apos;says the LORD&apos;</source>
         <translation>Encontrar todos los versículos con &apos;dice el SEÑOR&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
         <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
         <translation>&apos;&lt;strong&gt;*&lt;/strong&gt;hace que coincida cualquier secuencia con 0 ó más caracteres, mientras que &apos;&lt;strong&gt;?&lt;/strong&gt;&apos;hace que coincida cualquier caracter sencillo. Un comodin no puede ser usado al comienzo de una palabra.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="160"/>
         <source>a*</source>
         <translation>a*</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="162"/>
         <source>All words beginning with &apos;a&apos;</source>
         <translation>Todas las palabras que comienzan con &apos;a&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="164"/>
         <source>a*a</source>
         <translation>a*a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="166"/>
         <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
         <translation>&apos;Asiria&apos;, &apos;aroma&apos;,&apos;abba&apos; etc.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="168"/>
         <source>a?</source>
         <translation>a?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="170"/>
         <source>&apos;at&apos; and &apos;an&apos;</source>
         <translation>&apos;al&apos; y &apos;as&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="172"/>
         <source>a??a</source>
         <translation>a??a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="174"/>
         <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
         <translation>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
         <source>Available text fields:</source>
         <translation>Campos de texto disponibles:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="181"/>
         <source>Searches headings</source>
         <translation>Busca cabeceras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="183"/>
         <source>Searches footnotes</source>
         <translation>Busca notas al pie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="185"/>
         <source>Searches Strong&apos;s numbers</source>
         <translation>Busca Números de Strong</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="187"/>
         <source>Searches morphology codes</source>
         <translation>Busca códigos de morfología</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="189"/>
         <source>Examples:</source>
         <translation>Ejemplos:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="191"/>
         <source>heading:Jesus</source>
         <comment>Do not translate &quot;heading:&quot;.</comment>
         <translation>heading:Jesús</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="193"/>
         <source>Finds headings with &apos;Jesus&apos;</source>
         <translation>Encuentra cabeceras con &apos;Jesús&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="195"/>
         <source>footnote:Jesus AND footnote:said</source>
         <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
         <translation>footnote:Jesús AND footnote:dijo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
         <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
         <translation>Encuentra notas al pie con &apos;Jesús&apos; y &apos;dijo&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
         <source>strong:G846</source>
         <comment>Do not translate &quot;strong:&quot;.</comment>
         <translation>strong:G846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="202"/>
         <source>Finds verses with Strong&apos;s Greek number 846</source>
         <translation>Encuentra versículos con el número Strong Griego 846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="204"/>
         <source>morph:&quot;N-NSF&quot;</source>
         <comment>Do not translate &quot;morph:&quot;.</comment>
         <translation>morph:&quot;N-NSF&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="206"/>
         <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
         <translation>Encuentra versículos con código de morfología &apos;N-NSF&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="210"/>
         <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
         <translation>BibleTime usa el motor de búsqueda CLucene. Puedes leer más en &lt;a href=&apos;%1&apos;&gt;Página web de sintaxis lucene&lt;/a&gt; (en navegador externo).</translation>
     </message>
@@ -4679,19 +4838,19 @@ Language name ppk</extracomment>
         <translation>Imprimir...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="231"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="241"/>
         <source>Copying search result</source>
         <translation>Copiando resultado de búsqueda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="250"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="259"/>
         <source>Saving search result</source>
         <translation>Guardando el resultado de búsqueda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="268"/>
         <source>Printing search result</source>
         <translation>Imprimiendo resultados de búsqueda</translation>
     </message>
@@ -4777,42 +4936,42 @@ Language name ppk</extracomment>
 <context>
     <name>Search::CSearchDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="87"/>
         <source>Search</source>
         <translation>Buscar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="130"/>
         <source>Missing indices</source>
         <translation>�ndices perdidos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="131"/>
         <source>The following modules need to be indexed before they can be searched in:</source>
         <translation type="unfinished">Los siguientes módulos deben ser indexados antes de que se pueden buscar en:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="132"/>
         <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
         <translation type="unfinished">La indexación podría tomar un largo tiempo. Clic en &quot;Si&quot; para indexar los modulos e iniciar la búsqueda, o &quot;No&quot; para cancelar la búsqueda.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="236"/>
         <source>Drag any verse reference onto an open Bible window</source>
         <translation type="unfinished">Arrastre cualquier referencia del verso en una ventana abierta de la Biblia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="241"/>
         <source>&amp;Analyze results...</source>
         <translation>&amp;Analizar resultados...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="242"/>
         <source>Show a graphical analysis of the search result</source>
         <translation>Mostrar un analisis grafico de un resultado de búsqueda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="248"/>
         <source>&amp;Close</source>
         <translation>&amp;Cerrar</translation>
     </message>
@@ -4853,19 +5012,19 @@ Language name ppk</extracomment>
         <translation>Imprimir...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="164"/>
         <source>Printing search result</source>
         <translation>Imprimiendo resultos de búsqueda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="192"/>
         <source>Saving search result</source>
         <translation>Guardando el resultado de búsqueda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="210"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="228"/>
         <source>Copying search result</source>
         <translation>Copiando resultado de búsqueda</translation>
     </message>
@@ -4878,91 +5037,6 @@ Language name ppk</extracomment>
 <context>
     <name>StandardWorksTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation>Las obras predeterminadas son utilizadas cuando ninguna obra es especificada, por ejemplo cuando se hace clic en un hipervínculo dentro de una Biblia.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>Biblia:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>La Biblia estandar es usada cuando un hipervínculo dentro de la Biblia es cliqueado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>Comentario:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>El comentario estandar es usado cuando un hipervínculo dentro del comentario es cliqueado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation>Léxico:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>El léxico estandar es usado cuando un hipervínculo dentro del léxico es cliqueado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>Devocional diario:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>El devocional estandar será usado para mostrar un devocional de inicio</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>Léxico Hebreo de Strong:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>El léxico Hebreo estandar es utilizado cuando un hipervínculo es cliqueado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>Léxico Griego de Strong:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>El léxico Griego estandar es utilizado cuando un hipervínculo en un léxico Griego es cliqueado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>Léxico Hebreo morfológico:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>El léxico morfológico para textos Hebreos es utilizado cuando un hipervínculo de una etiqueta morfológica en texto Hebreo es cliqueado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation>Diccionario léxico griego morfológico:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>El léxico morfológico para textos Griegos es utilizado cuando un hipervínculo de una etiqueta morfológica en texto Griego es cliqueado</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="62"/>
         <source></source>
         <translation></translation>
@@ -4971,112 +5045,97 @@ Language name ppk</extracomment>
 <context>
     <name>TextFiltersTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation type="unfinished">Insertar salto de lí­nea después de cada versículo</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">Mostrar números de versículos</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation type="unfinished">Mostrar cabeceras de las secciones</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">Mostrar las referencias cruzadas de las escrituras</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">Mostrar acentos griegos</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Mostrar puntos de vocales hebreas</translation>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
+        <source></source>
+        <translation></translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallProgress</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Mostrar los acentos de &quot;cantilación&quot; hebreas</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="81"/>
+        <source>Failed</source>
+        <translation type="unfinished">Falló</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">Mostrar segmentación de morfología</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="84"/>
+        <source>Completed</source>
+        <translation type="unfinished">Completado</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation type="unfinished">Usar varientes textuales</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="90"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">Cancelado</translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallSources</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="unfinished">Los filtros controlan la apariencia del texto. Aquí puedes especificar las configuraciones predeterminadas para todos los filtros. Puedes anular estas configuraciones en cada ventana mostrada.</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installsources.cpp" line="63"/>
+        <source>Failed to refresh source %1</source>
+        <translation type="unfinished">Falló al refrescar la fuente %1</translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source></source>
-        <translation></translation>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="59"/>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="62"/>
+        <source>The text you want to search for</source>
+        <translation type="unfinished">El texto que deseas buscar</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation>Encontrar texto</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="135"/>
+        <source>New Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation>El texto que deseas buscar</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="136"/>
+        <source>View Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation>Buscar sensible a mayusculas</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="137"/>
+        <source>Text Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation>Sensible a &amp;mayusculas</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="138"/>
+        <source>User Interface Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation>Encontrar la ubicación anterior del texto</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="141"/>
+        <source>Bookshelf Manager</source>
+        <translation type="unfinished">Administrador de biblioteca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation>&amp;Anterior</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="187"/>
+        <source>Single</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation>Encontrar la siguiente ubicación del texto</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="188"/>
+        <source>Tabbed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation>&amp;Siguiente</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="189"/>
+        <source>Auto-tile</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation>Cerrar el diálogo</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="190"/>
+        <source>Auto-tile horizontally</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Cerrar</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="191"/>
+        <source>Auto-tile vertically</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/messages/bibletime_ui_et.ts b/i18n/messages/bibletime_ui_et.ts
index ac70b81..57c1061 100644
--- a/i18n/messages/bibletime_ui_et.ts
+++ b/i18n/messages/bibletime_ui_et.ts
@@ -6,7 +6,7 @@
     <message>
         <source></source>
         <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
 This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
@@ -22,452 +22,457 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTime</name>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
+        <location filename="../../src/bibletime_init.cpp" line="741"/>
         <source>&amp;File</source>
         <translation>&amp;Fail</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&amp;View</source>
         <translation>&amp;Vaade</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&amp;Search</source>
         <translation>&amp;Otsing</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&amp;Window</source>
         <translation>A&amp;ken</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&amp;ttings</source>
         <translation>&amp;Seaded</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&amp;Help</source>
         <translation>&amp;Abi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&amp;Show toolbar</source>
         <translation>Näita &amp;tööriistariba</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&amp;Fullscreen mode</source>
         <translation>Täis&amp;ekraanvaade</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&amp;Quit</source>
         <translation>&amp;Välju</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
+        <location filename="../../src/bibletime_init.cpp" line="251"/>
         <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
         <translation>Ava BibleTime-ga kaasasolev Piibli uurimise õpetus.&lt;br/&gt;See õpetus on sissejuhatus Piibli efektiivseks uurimiseks.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
+        <location filename="../../src/bibletime_init.cpp" line="256"/>
         <source>Information about the BibleTime program</source>
         <translation>Informatsioon BibleTime kohta</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation>&amp;Salvesta sessioon</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>&amp;Lae sessioon</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&amp;Delete session</source>
         <translation>&amp;Kustuta sessioon</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&amp;Arrangement mode</source>
         <translation>Asetus&amp;viis</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&amp;Manual mode</source>
         <translation>&amp;Käsitiasetus</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &amp;vertically</source>
         <translation>Automaatne &amp;vertikaalasetus</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &amp;horizontally</source>
         <translation>Automaatne &amp;horisontaalasetus</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&amp;cascade</source>
         <translation>Automaatne k&amp;askaadasetus</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&amp;Cascade</source>
         <translation>Aseta &amp;kaskaadi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &amp;vertically</source>
         <translation>Aseta &amp;vertikaalselt </translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &amp;horizontally</source>
         <translation>Aseta &amp;horisontaalselt</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&amp;ose all windows</source>
         <translation>Sulge &amp;kõik aknad</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
+        <location filename="../../src/bibletime_init.cpp" line="224"/>
         <source>Close all open windows inside BibleTime</source>
         <translation>Sulge kõik BibleTime sees avatud aknad</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
+        <location filename="../../src/bibletime_init.cpp" line="241"/>
         <source>&amp;Handbook</source>
         <translation>&amp;Käsiraamat</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&amp;Bible Study Howto</source>
         <translation>&amp;Piibli uurimise õpetus</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
+        <location filename="../../src/bibletime_slots.cpp" line="533"/>
         <source>Please enter a name for the new session.</source>
         <translation>Palun sisestage nimetus uue sessiooni jaoks.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
+        <location filename="../../src/bibletime_slots.cpp" line="541"/>
+        <source>Session already exists</source>
+        <translation>Sessioon juba eksisteerib</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_slots.cpp" line="542"/>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation>Sessioon nimega &quot;%1&quot; juba eksisteerib. Palun sisestage erinev nimi.</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="107"/>
         <source>Quit BibleTime</source>
         <translation>Välju BibleTime&apos;st</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
+        <location filename="../../src/bibletime_init.cpp" line="114"/>
         <source>Toggle fullscreen mode of the main window</source>
         <translation>Kasuta täisekraanvaadet peaakna jaoks</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
+        <location filename="../../src/bibletime_init.cpp" line="123"/>
         <source>Search in &amp;open works...</source>
         <translation>&amp;Otsi avatud teostest...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &amp;Bible...</source>
         <translation>Otsi &amp;eelistatud Piiblist...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &amp;new session...</source>
         <translation>Salvesta &amp;uue sessioonina...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
+        <location filename="../../src/bibletime_init.cpp" line="140"/>
         <source>Create and save a new session</source>
         <translation>Loo ja salvesta uus sessioon</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
+        <location filename="../../src/bibletime_init.cpp" line="147"/>
         <source>Manually arrange the open windows</source>
         <translation>Paiguta avatud aknad käsitsi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
+        <location filename="../../src/bibletime_init.cpp" line="154"/>
         <source>Automatically tile the open windows vertically (arrange side by side)</source>
         <translation>Aseta avatud aknad automaatselt vertikaalselt (üksteise kõrvale)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
+        <location filename="../../src/bibletime_init.cpp" line="161"/>
         <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
         <translation>Aseta avatud aknad automaatselt horisontaalselt (üksteise kohale)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
+        <location filename="../../src/bibletime_init.cpp" line="165"/>
         <source>Auto-&amp;tile</source>
         <translation>Automaatne asetus &amp;ruudustikku</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
+        <location filename="../../src/bibletime_init.cpp" line="168"/>
         <source>Automatically tile the open windows</source>
         <translation>Aseta avatud aknad automaatselt ruudustikku</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
+        <location filename="../../src/bibletime_init.cpp" line="172"/>
         <source>Ta&amp;bbed</source>
         <translation>&amp;Sakkidesse</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
+        <location filename="../../src/bibletime_init.cpp" line="175"/>
         <source>Automatically tab the open windows</source>
         <translation>Aseta avatud aknad automaatselt sakkidesse</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
+        <location filename="../../src/bibletime_init.cpp" line="182"/>
         <source>Automatically cascade the open windows</source>
         <translation>Aseta avatud aknad automaatselt kaskaadi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
+        <location filename="../../src/bibletime_init.cpp" line="189"/>
         <source>Cascade the open windows</source>
         <translation>Aseta avatud aknad kaskaadi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
+        <location filename="../../src/bibletime_init.cpp" line="193"/>
         <source>&amp;Tile</source>
         <translation>Aseta &amp;ruudustikku</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
+        <location filename="../../src/bibletime_init.cpp" line="196"/>
         <source>Tile the open windows</source>
         <translation>Aseta avatud aknad ruudustikku</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
+        <location filename="../../src/bibletime_init.cpp" line="203"/>
         <source>Vertically tile (arrange side by side) the open windows</source>
         <translation>Aseta avatud aknad vertikaalselt (üksteise kõrvale)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
+        <location filename="../../src/bibletime_init.cpp" line="210"/>
         <source>Horizontally tile (arrange on top of each other) the open windows</source>
         <translation>Aseta avatud aknad horisontaalselt (üksteise kohale)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
+        <location filename="../../src/bibletime_init.cpp" line="214"/>
         <source>Close &amp;window</source>
         <translation>Sul&amp;ge aken</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
+        <location filename="../../src/bibletime_init.cpp" line="217"/>
         <source>Close the current open window</source>
         <translation>Sulge aktiivne aken</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
+        <location filename="../../src/bibletime_init.cpp" line="228"/>
         <source>&amp;Configure BibleTime...</source>
         <translation>&amp;Seadista BibleTime...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime&apos;s preferences</source>
         <translation>Muuda BibleTime seadistusi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
+        <location filename="../../src/bibletime_init.cpp" line="234"/>
         <source>Bookshelf &amp;Manager...</source>
         <translation>Raamaturiiuli &amp;haldamine...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
+        <location filename="../../src/bibletime_init.cpp" line="237"/>
         <source>Configure your bookshelf and install/update/remove/index works</source>
         <translation>Seadista oma raamaturiiul ning paigalda/uuenda/eemalda/indekseeri teoseid</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
+        <location filename="../../src/bibletime_init.cpp" line="244"/>
         <source>Open BibleTime&apos;s handbook</source>
         <translation>Ava BibleTime&apos; käsiraamat</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&amp;Tip of the day...</source>
         <translation>&amp;Päeva vihje...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
+        <location filename="../../src/bibletime_init.cpp" line="263"/>
         <source>Show tips about BibleTime</source>
         <translation>Näita vihjeid BibleTime kohta</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
+        <location filename="../../src/bibletime_init.cpp" line="402"/>
         <source>Toggle visibility of the bookshelf window</source>
         <translation>Kuva raamaturiiuli akent/paneeli</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
+        <location filename="../../src/bibletime_init.cpp" line="406"/>
         <source>Toggle visibility of the bookmarks window</source>
         <translation>Kuva järjehoidjate akent/paneeli</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
+        <location filename="../../src/bibletime_init.cpp" line="410"/>
         <source>Toggle visibility of the mag window</source>
         <translation>Kuva infokuva akent/paneeli</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
+        <location filename="../../src/bibletime_init.cpp" line="735"/>
         <source>Main toolbar</source>
         <translation>Peamine tööriistariba</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
+        <location filename="../../src/bibletime_init.cpp" line="736"/>
         <source>Navigation toolbar</source>
         <translation>Navigeerimisriba</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
+        <location filename="../../src/bibletime_init.cpp" line="737"/>
         <source>Works toolbar</source>
         <translation>Teoste riba</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
+        <location filename="../../src/bibletime_init.cpp" line="738"/>
         <source>Tools toolbar</source>
         <translation>Tööriistade riba</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
+        <location filename="../../src/bibletime_init.cpp" line="739"/>
         <source>Format toolbar</source>
         <translation>Vorminguriba</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
+        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <source>Sw&amp;itch session</source>
+        <translation>Vahe&amp;ta sessiooni</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="777"/>
         <source>Show main toolbar</source>
         <translation>Kuva peamist tööriistariba</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
+        <location filename="../../src/bibletime_init.cpp" line="780"/>
         <source>Show navigation bar</source>
         <translation>Kuva navigeerimisriba</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
+        <location filename="../../src/bibletime_init.cpp" line="783"/>
         <source>Show works toolbar</source>
         <translation>Kuva teoste riba</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
+        <location filename="../../src/bibletime_init.cpp" line="786"/>
         <source>Show tools toolbar</source>
         <translation>Kuva vahendite riba</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
+        <location filename="../../src/bibletime_init.cpp" line="789"/>
         <source>Show formatting toolbar</source>
         <translation>Kuva vormistamise riba</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
+        <location filename="../../src/bibletime_init.cpp" line="792"/>
         <source>Show bookshelf</source>
         <translation>Kuva raamaturiiulit</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
+        <location filename="../../src/bibletime_init.cpp" line="795"/>
         <source>Show bookmarks</source>
         <translation>Kuva järjehoidjaid</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
+        <location filename="../../src/bibletime_init.cpp" line="798"/>
         <source>Show mag</source>
         <translation>Kuva infokuva</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
+        <location filename="../../src/bibletime_init.cpp" line="743"/>
         <source>Toolbars</source>
         <translation>Tööriistaribad</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <location filename="../../src/bibletime_init.cpp" line="774"/>
         <source>Show toolbars in text windows</source>
         <translation>Kuva tööriistaribasid tekstiakendes</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
+        <location filename="../../src/bibletime_init.cpp" line="801"/>
         <source>Show parallel text headers</source>
         <translation>Kuva paralleeltekstide päiseid</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
+        <location filename="../../src/bibletime_init.cpp" line="747"/>
         <source>O&amp;pen windows</source>
         <translation>&amp;Avatud aknad</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show &quot;Whats this widget&quot; dialog</source>
         <translation>Näita &quot;Mis vidin see on?&quot; akent</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
+        <location filename="../../src/bibletime_init.cpp" line="954"/>
         <source>Whats this widget?</source>
         <translation>Mis vidin see on?</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
+        <location filename="../../src/bibletime_init.cpp" line="126"/>
         <source>Search in all works that are currently open</source>
         <translation>Otsi kõikidest hetkel avatud teostest</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
+        <location filename="../../src/bibletime_init.cpp" line="133"/>
         <source>Search in the standard Bible</source>
         <translation>Otsi eelistatud Piiblist</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
+        <location filename="../../src/bibletime_slots.cpp" line="532"/>
         <source>New Session</source>
         <translation>Uus sessioon</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
+        <location filename="../../src/bibletime.cpp" line="77"/>
         <source>Initializing the SWORD engine...</source>
         <translation>SWORD mootori käivitamine...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
+        <location filename="../../src/bibletime.cpp" line="85"/>
         <source>Creating BibleTime&apos;s user interface...</source>
         <translation>BibleTime&apos; kasutajaliidese käivitamine...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
+        <location filename="../../src/bibletime.cpp" line="92"/>
         <source>Initializing menu- and toolbars...</source>
         <translation>Menüü ja tööriistaribade käivitamine...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Unlock Work</source>
         <translation>Kaitstud teose avamine</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Enter the unlock key for %1.</source>
         <translation>Palun sisestage võti teose %1 avamiseks.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
+        <location filename="../../src/bibletime.cpp" line="214"/>
         <source>Warning: Invalid unlock key!</source>
         <translation>Hoiatus: Vale võti!</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
+        <location filename="../../src/bibletime.cpp" line="215"/>
         <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
         <translation>Teie poolt sisestatud võti ei avanud seda moodulit. Palun proovige uuesti.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
+        <location filename="../../src/bibletime_init.cpp" line="255"/>
         <source>&amp;About BibleTime</source>
         <translation>&amp;Info BibleTime kohta</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
+        <location filename="../../src/bibletime_init.cpp" line="733"/>
         <source>Bookmarks</source>
         <translation>Järjehoidjad</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
+        <location filename="../../src/bibletime_init.cpp" line="734"/>
         <source>Mag</source>
         <translation>Info</translation>
     </message>
@@ -475,7 +480,8 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTimeApp</name>
     <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
+        <location filename="../../src/bibletimeapp.cpp" line="59"/>
+        <location filename="../../src/mobile/bibletimeapp.cpp" line="63"/>
         <source>Fatal error!</source>
         <translation>Saatuslik viga!</translation>
     </message>
@@ -483,7 +489,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtAboutDialog</name>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
         <source>BibleTime is an easy to use but powerful Bible study tool.</source>
         <translation>BibleTime on võimas, kuid lihtne tööriist Piibli uurimiseks.</translation>
     </message>
@@ -498,52 +504,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Täielik juriidiliselt siduv litsents on toodud allpool.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="109"/>
         <source>About BibleTime</source>
         <translation>Info BibleTime kohta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="121"/>
         <source>&amp;BibleTime</source>
         <translation>&amp;BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="126"/>
         <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
         <translation>Me otsime arendajaid ja tõlkijaid. Kui Te soovite meie meeskonnaga ühineda, palun saatke e-mail aadressile %1.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation>(c)1999-2013, The BibleTime&apos;i meeskond</translation>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="130"/>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished">(c)1999-2014, The BibleTime&apos;i meeskond</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="137"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Toetajad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="148"/>
         <source>The following people contributed to BibleTime:</source>
         <translation>Järgmised inimesed toetasid BibleTime projekti:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="150"/>
         <source>documentation and translation manager</source>
         <translation>dokumentatsiooni ja tõlgete haldaja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="172"/>
         <source>project manager</source>
         <translation>projektijuht</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>tester</source>
         <translation>testija</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>usability expert</source>
         <translation>kasutusekspert</translation>
     </message>
@@ -583,52 +589,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>&amp;Litsents</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
         <source>designer</source>
         <translation>disainer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="139"/>
         <source>developer</source>
         <translation>arendaja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
         <source>project founder</source>
         <translation>projekti looja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="157"/>
         <source>packager</source>
         <translation>pakihaldur</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="158"/>
         <source>creator of The Sword Project</source>
         <translation>Sword projekti looja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
         <source>domain sponsor</source>
         <translation>veebidomeeni sponsor</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
         <source>howto</source>
         <translation>õpetus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="141"/>
         <source>artist</source>
         <translation>kunstnik</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="173"/>
         <source>documentation</source>
         <translation>dokumentatsioon</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="188"/>
         <source>The following people translated BibleTime into their language:</source>
         <translation>Järgnevad inimesed tõlkisid BibleTime&apos; enda keelde:</translation>
     </message>
@@ -656,37 +662,37 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBibleKeyWidget</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="110"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Elemendi valimiseks vajutage seda nuppu ja liigutage hiirekursorit üles või alla.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
         <source>Next book</source>
         <translation>Järgmine raamat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
         <source>Previous book</source>
         <translation>Eelmine raamat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="117"/>
         <source>Next chapter</source>
         <translation>Järgmine peatükk</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
         <source>Previous chapter</source>
         <translation>Eelmine peatükk</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="122"/>
         <source>Next verse</source>
         <translation>Järgmine salm</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
         <source>Previous verse</source>
         <translation>Eelmine salm</translation>
     </message>
@@ -765,27 +771,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfGroupingMenu</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
         <source>Category/Language</source>
         <translation>Kategooria/keel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
         <source>Category</source>
         <translation>Kategooria</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
         <source>Language/Category</source>
         <translation>Keel/kategooria</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="105"/>
         <source>Language</source>
         <translation>Keel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="108"/>
         <source>No grouping</source>
         <translation>Ära grupeeri</translation>
     </message>
@@ -793,7 +799,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfModel</name>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
+        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="78"/>
         <source>Module</source>
         <translation>Moodul</translation>
     </message>
@@ -801,123 +807,160 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfWidget</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="157"/>
         <source>Fi&amp;lter:</source>
         <translation>Fi&amp;lter:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="158"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
         <source>Grouping</source>
         <translation>Grupeerimine</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="159"/>
         <source>Change the grouping of items in the bookshelf.</source>
         <translation>Muuda raamaturiiuli teoste grupeerimist.</translation>
     </message>
     <message>
-        <source>Use grouping from bookshelf dock</source>
-        <translation type="obsolete">Kasuta grupeerimist peaakna raamaturiiulist</translation>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
+        <source>Show/hide works</source>
+        <translation>Näita/peida teoseid</translation>
     </message>
+</context>
+<context>
+    <name>BtChapterDropdownChooserButton</name>
     <message>
-        <source>Category/Language</source>
-        <translation type="obsolete">Kategooria/keel</translation>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
+        <source>Select chapter</source>
+        <translation>Vali peatükk</translation>
     </message>
+</context>
+<context>
+    <name>BtConfig</name>
     <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategooria</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="46"/>
+        <source>Old testament</source>
+        <translation>Vana Testament</translation>
     </message>
     <message>
-        <source>Language/Category</source>
-        <translation type="obsolete">Keel/kategooria</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="47"/>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation>Viis Moosese raamatut/Pentateuh/Toora</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation type="obsolete">Keel</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="48"/>
+        <source>History</source>
+        <translation>Ajalugu</translation>
     </message>
     <message>
-        <source>No grouping</source>
-        <translation type="obsolete">Ära grupeeri</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="49"/>
+        <source>Prophets</source>
+        <translation>Prohvetid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
-        <source>Show/hide works</source>
-        <translation>Näita/peida teoseid</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="50"/>
+        <source>New testament</source>
+        <translation>Uus Testament</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="51"/>
+        <source>Gospels</source>
+        <translation>Evangeeliumid</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="52"/>
+        <source>Letters/Epistles</source>
+        <translation>Kirjad/epistlid</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="53"/>
+        <source>Paul&apos;s Epistles</source>
+        <translation>Pauluse kirjad</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="89"/>
+        <source>Error loading configuration!</source>
+        <translation>Viga seadistuse laadimisel!</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="90"/>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation>BibleTime seadistusi ei õnnestunud laadida, sest näib nagu oleks konfiguratsioonifaili oleks salvestatud uuema versiooni BibleTime programmiga. Selle põhjuseks on tõenäoliselt vanemale BibleTime versiooni paigaldusele tagasiminek. Uue konfiguratsioonifaili laadimine võib põhjustada &lt;b&gt;andmekadu&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Kas soovite siiski üritada laadida uut konfiguratsioonifaili? Vajutage &quot;Ei&quot; väljumaks BibleTime-st.</translation>
     </message>
 </context>
 <context>
-    <name>BtChapterDropdownChooserButton</name>
+    <name>BtConfigCore</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
-        <source>Select chapter</source>
-        <translation>Vali peatükk</translation>
+        <location filename="../../src/backend/config/btconfigcore.cpp" line="62"/>
+        <source>Default Session</source>
+        <translation>Vaikesessioon</translation>
     </message>
 </context>
 <context>
     <name>BtDisplaySettingsButton</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="103"/>
         <source>Use linebreaks after each verse</source>
         <translation>Alusta iga salmi uuelt realt</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
         <source>Show verse numbers</source>
         <translation>Kuva salmide numbreid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
         <source>Show headings</source>
         <translation>Kuva pealkirju</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
         <source>Highlight words of Jesus</source>
         <translation>Tõsta esile Jeesuse sõnad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
         <source>Show Hebrew vowel points</source>
         <translation>Kuva heebrea keele vokaalimärke</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
         <source>Show Hebrew cantillation marks</source>
         <translation>Kuva heebrea keele laulumärke</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
         <source>Show Greek accents</source>
         <translation>Kuva kreeka keele rõhumärke</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
         <source>Use alternative textual variant</source>
         <translation>Kasuta alternatiivseid tekstivariante</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
         <source>Show scripture cross-references</source>
         <translation>Kuva pühakirjade ristviiteid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
         <source>Show footnotes</source>
         <translation>Kuva allmärkusi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
         <source>Show morph segmentation</source>
         <translation>Kuva morfoloogilist segmentatsiooni</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="120"/>
         <source>Display settings</source>
         <translation>Kuva seaded</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="123"/>
         <source>Display settings: No options available</source>
         <translation>Kuva seaded: sätteid ei ole</translation>
     </message>
@@ -925,27 +968,45 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtEditBookmarkDialog</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="71"/>
         <source>Edit Bookmark</source>
         <translation>Muuda järjehoidjat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
         <source>Location:</source>
         <translation>Viide:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
         <source>Title:</source>
         <translation>Nimi:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
         <source>Description:</source>
         <translation>Kirjeldus:</translation>
     </message>
 </context>
 <context>
+    <name>BtFindWidget</name>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="28"/>
+        <source>Previous</source>
+        <translation>Eelmine</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="29"/>
+        <source>Next</source>
+        <translation>Järgmine</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="74"/>
+        <source>Match case</source>
+        <translation>Tõstutundlik</translation>
+    </message>
+</context>
+<context>
     <name>BtFontChooserWidget</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
@@ -966,31 +1027,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <source>You can specify a custom font for each language.</source>
-        <translation type="obsolete">Te võite määrata iga keele jaoks kohandatud kirjatüübi.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="151"/>
         <source>&amp;Language:</source>
         <translation>&amp;Keel:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
         <source>The font selection below will apply to all texts in this language</source>
         <translation>Allpoololev kirjatüübi valik rakendub kõikidele selle keele tekstidele</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
         <source>Use custom font</source>
         <translation>Kasuta kohandatud kirjatüüpi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
         <source>Optionally specify a custom font for each language:</source>
         <translation>Valikuliselt võite iga keele jaoks valida eraldi kirjatüübi:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="150"/>
         <source>Fonts</source>
         <translation>Kirjatüübid</translation>
     </message>
@@ -998,75 +1055,67 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtIndexPage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="107"/>
         <source>%1 KiB</source>
         <translation>%1 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="114"/>
         <source>0 KiB</source>
         <translation>0 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="124"/>
         <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
         <translation>Kui valitud, siis kustutatakse BibleTime käivitamisel automaatselt need indeksid, millele vastavat teost pole paigaldatud</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
         <source>Automatically delete orphaned indexes when BibleTime starts</source>
         <translation>Kustuta teosteta indeksid automaatselt BibleTime käivitamisel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="127"/>
         <source>Delete the selected indexes</source>
         <translation>Kustuta valitud indeksid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
         <source>Delete</source>
         <translation>Kustuta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="130"/>
         <source>Create new indexes for the selected works</source>
         <translation>Loo uued indeksid valitud teostele</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Work</source>
         <translation>Teos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Index size</source>
         <translation>Indeksi suurus</translation>
     </message>
     <message>
-        <source>Create new search indexes and delete created indexes for the installed works.</source>
-        <translation type="obsolete">Paigaldatud teoste indeksite haldamine.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="122"/>
         <source>Search Indexes</source>
         <translation>Otsinguindeksid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="91"/>
         <source>Indexed Works</source>
         <translation>Indekseeritud teosed</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="96"/>
         <source>Unindexed Works</source>
         <translation>Indekseerimata teosed</translation>
     </message>
     <message>
-        <source>KiB</source>
-        <translation type="obsolete">kiB</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
         <source>Create...</source>
         <translation>Loo...</translation>
     </message>
@@ -1092,17 +1141,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallModuleChooserDialogModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="88"/>
         <source>Work</source>
         <translation>Teos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="89"/>
         <source>Installation source</source>
         <translation>Paigalduse allikas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="90"/>
         <source>Version</source>
         <translation>Versioon</translation>
     </message>
@@ -1110,10 +1159,6 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPage</name>
     <message>
-        <source>Install folder:</source>
-        <translation type="obsolete">Paigalduskataloog:</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="265"/>
         <source>WARNING!!!</source>
         <translation>HOIATUS!!!</translation>
@@ -1194,30 +1239,21 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Sihtkataloog pole kirjutatav või ei eksisteeri. Paigaldus ebaõnnestub kui seda probleemi eelnevalt ei lahendata.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="388"/>
         <source>Delete Source?</source>
         <translation>Eemaldada allikas?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="389"/>
         <source>Do you really want to delete this source?</source>
         <translation>Kas soovite tõesti selle allika BibleTime&apos;st eemaldada?</translation>
     </message>
     <message>
-        <source>Install and update works. Add remote or local sources, refresh them, select the works to be installed/updated and click Install.&lt;br/&gt;&lt;b&gt;WARNING:&lt;/b&gt; If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translatorcomment>&quot;remote&quot; -&gt; &quot;kaug-&quot; is fuzzy</translatorcomment>
-        <translation type="obsolete">Paigalda ja uuenda teoseid. Lisa kaug- ja kohalikke allikaid, värskenda neid, vali teosed paigaldamiseks/uuendamiseks ning vajuta Paigalda.&lt;br/&gt;&lt;b&gt;HOIATUS:&lt;/b&gt; Kui Te elate riigis, kus Teid võidakse taga kiusata, ning Te ei soovi riskeerida Teie avastamisega, ärge kasutage kaug-allikaid.</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="263"/>
         <source>Install/Update</source>
         <translation>Paigalda/uuenda</translation>
     </message>
     <message>
-        <source>Install...</source>
-        <translation type="obsolete">Paigalda...</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="281"/>
         <source>Install or update selected works</source>
         <translation>Paigalda või uuenda valitud teosed</translation>
@@ -1226,17 +1262,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPageModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="75"/>
         <source>Work</source>
         <translation>Teos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="76"/>
         <source>Version</source>
         <translation>Versioon</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="77"/>
         <source>Description</source>
         <translation>Kirjeldus</translation>
     </message>
@@ -1252,99 +1288,99 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPathDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="35"/>
         <source>Bookshelf Folders</source>
         <translation>Raamaturiiuli kataloogid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
         <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
         <translation>Teoseid saab paigaldada ühte või enamasse kataloogi. Pärast kataloogide määramist saab paigaldamise leheküljel neid valida.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="45"/>
         <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
         <translation>BibleTime ja SWORD teek leiavad teoseid kõigist nendest kataloogidest. Kui mõni kataloog siit eemaldatakse, jääb see süsteemi alles koos kõikide teostega, mis on sinna paigaldatud.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="48"/>
         <source>Configure bookshelf folders</source>
         <translation>Raamaturiiuli kataloogide seadistamine</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="53"/>
         <source>Configuration file for the folders is: </source>
         <translation>Selle kataloogi seadistuse fail on: </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="61"/>
         <source>Folders where new works can be installed</source>
         <translation>Kataloogid, kuhu saab paigaldada uusi teoseid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
         <source>Read-only folders</source>
         <translation>Kirjutuskaitstud kataloogid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="66"/>
         <source>Nonexistent folders</source>
         <translation>Mitte-eksisteerivad kataloogid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="80"/>
         <source>&amp;Add...</source>
         <translation>&amp;Lisa...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="81"/>
         <source>Add new folder</source>
         <translation>Lisa uus kataloog</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="86"/>
         <source>&amp;Edit...</source>
         <translation>&amp;Muuda...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="87"/>
         <source>Edit the selected folder</source>
         <translation>Muuda valitud kataloogi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="92"/>
         <source>&amp;Remove</source>
         <translation>&amp;Eemalda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="93"/>
         <source>Remove the selected folder</source>
         <translation>Eemalda valitud kataloog</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="167"/>
         <source>This default folder in your home directory can&apos;t be removed</source>
         <translation>Vaikimisi kataloogi teie kodukataloogis ei saa eemaldada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="194"/>
         <source>Choose Folder</source>
         <translation>Vali kataloog</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>Use Folder?</source>
         <translation>Kasutada kataloogi?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
         <translation>Sellel kataloog on kirjutuskaitstud, seega ei saa BibleTime sinna teosed paigaldada. Kas siiski kasutada seda kataloogi eelneva asemel?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
         <translation>Sellel kataloog on kirjutuskaitstud, seega ei saa BibleTime sinna teosed paigaldada. Kas siiski lisada see kataloog raamaturiiuli kataloogide hulka?</translation>
     </message>
@@ -1352,52 +1388,42 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallProgressDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Work</source>
         <translation>Teos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Progress</source>
         <translation>Progress</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>Peata</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="60"/>
         <source>Stop All</source>
         <translation>Peata kõik</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Completed</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>Katkestatud</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="55"/>
         <source>Waiting for turn...</source>
         <translation>Ootel...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="113"/>
         <source>Preparing install...</source>
         <translation>Paigaldamiseks valmistumine...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="37"/>
         <source>Install Progress</source>
         <translation>Paigalduse edenemine</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Failed</source>
         <translation>Ebaõnnestus</translation>
     </message>
@@ -1405,21 +1431,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <source>Select the language in which the Biblical book names are displayed.</source>
-        <translation type="obsolete">Valige keel, milles kuvatakse Piibli raamatute nimed.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
         <source>Language for names of Bible books:</source>
         <translation>Piibli raamatute nimede keel:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation>Keeled, mida saab kasutada Piibli raamatute nimede jaoks</translation>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="136"/>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation>Keeled, mida saab kasutada Piibli raamatute nimede jaoks. Tõlkeid pakub Sword teek.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="133"/>
         <source>Languages</source>
         <translation>Keeled</translation>
     </message>
@@ -1469,7 +1491,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtModuleManagerDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="57"/>
         <source>Bookshelf Manager</source>
         <translation>Raamaturiiuli haldamine</translation>
     </message>
@@ -1477,7 +1499,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkAction</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="103"/>
         <source>&amp;Open work</source>
         <translation>&amp;Ava teos</translation>
     </message>
@@ -1485,12 +1507,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkActionMenu</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="42"/>
         <source>&amp;Grouping order</source>
         <translation>&amp;Grupeerimine</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="43"/>
         <source>Sets the grouping order for the items in this menu.</source>
         <translation>Muuda selle menüü elementide grupeerimist.</translation>
     </message>
@@ -1498,10 +1520,6 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtRefreshProgressDialog</name>
     <message>
-        <source>Refreshing Source %1</source>
-        <translation type="obsolete">Allika %1 värskendamine</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="15"/>
         <source>Refreshing source %1</source>
         <translation>Allika &quot;%1&quot; värskendamine</translation>
@@ -1530,59 +1548,47 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtRemovePage</name>
     <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Eemalda</translation>
-    </message>
-    <message>
-        <source>Remove installed works. Select the works and click Remove button.</source>
-        <translation type="obsolete">Paigaldatud teoste eemaldamine. Valige teosed ja vajutage eemaldamisnupul.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="100"/>
         <source>Select &amp;works to uninstall:</source>
         <translation>Valige &amp;teosed eemaldamiseks:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&amp;Remove...</source>
         <translation>&amp;Eemalda...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="98"/>
         <source>Remove</source>
         <translation>Eemalda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="111"/>
         <source>Start removal of %1 works:</source>
         <translation>Alusta %1 teose eemaldamist:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="114"/>
         <source>Start removal:</source>
         <translation>Alusta eemaldamist:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="145"/>
         <source>You selected the following work(s): </source>
         <translation>Valisite järgmised teos(ed): </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="149"/>
         <source>Do you really want to remove them from your system?</source>
         <translation>Kas soovite need tõesti enda süsteemist eemaldada?</translation>
     </message>
     <message>
-        <source>Remove...</source>
-        <translation type="obsolete">Eemalda...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
         <source>Remove the selected works</source>
         <translation>Eemalda valitud teosed</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="151"/>
         <source>Remove Works?</source>
         <translation>Eemaldada teosed?</translation>
     </message>
@@ -1603,12 +1609,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtSearchModuleChooserDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="47"/>
         <source>Works to Search in</source>
         <translation>Teosed, millest otsida</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="49"/>
         <source>Select the works which should be searched.</source>
         <translation>Valige teosed, millest peaks otsima.</translation>
     </message>
@@ -1692,176 +1698,165 @@ kiirklahv</translation>
     </message>
 </context>
 <context>
-    <name>BtSourceArea</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">Teos</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="obsolete">Kirjeldus</translation>
-    </message>
+    <name>BtStandardWorksTab</name>
     <message>
-        <source>&amp;Add...</source>
-        <translation type="obsolete">Lisa...</translation>
-    </message>
-    <message>
-        <source>Refresh...</source>
-        <translation type="obsolete">Värskenda...</translation>
-    </message>
-    <message>
-        <source>Refresh the list of works from this source</source>
-        <translation type="obsolete">Värskenda teoste nimekiri sellest allikast</translation>
-    </message>
-    <message>
-        <source>&amp;Delete...</source>
-        <translation type="obsolete">Eemalda...</translation>
-    </message>
-    <message>
-        <source>Delete this source</source>
-        <translation type="obsolete">Eemalda see allikas</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="169"/>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation>Eelistatud teoseid kasutatake kui ei ole määratud konkreetset teost, näiteks kui kasutatakse hüperlinki, mis viitab Piiblisse või mõnda leksikoni.</translation>
     </message>
     <message>
-        <source>Add new source</source>
-        <translation type="obsolete">Lisa uus allikas</translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceAreaModel</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">Teos</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
+        <translation>Piibel:</translation>
     </message>
     <message>
-        <source>Version</source>
-        <translation type="obsolete">Versioon</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="174"/>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation>Eelistatud Piiblit kasutatakse siis kui vajutatakse mõnele Piibli kirjakohale viitavale hüperlingile</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Kirjeldus</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</source>
+        <translation>Kommentaarid:</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceWidget</name>
     <message>
-        <source>Delete Source?</source>
-        <translation type="obsolete">Eemaldada allikas?</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="178"/>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation>Eelistatud kommentaare kasutatakse siis kui vajutatakse mõnele kommentaaridele viitavale hüperlingile</translation>
     </message>
     <message>
-        <source>Do you really want to delete this source?</source>
-        <translation type="obsolete">Kas soovite tõesti selle allika BibleTime&apos;st eemaldada?</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
+        <translation>Leksikon:</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Tühista</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="182"/>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation>Eelistatud leksikoni kasutatakse siis kui vajutatakse mõnele leksikoni viitavale hüperlingile</translation>
     </message>
     <message>
-        <source>Refreshing Source</source>
-        <translation type="obsolete">Värskendamine allikast</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</source>
+        <translation>Igapäevane harduskirjandus:</translation>
     </message>
     <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Ãœhendumine...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="186"/>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation>Eelistatud igapäevast harduskirjanduse teost kasutatakse sellest lühikeste lõikude kuvamiseks BibleTime käivitamisel</translation>
     </message>
     <message>
-        <source>Refreshing...</source>
-        <translation type="obsolete">Värskendamine...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation>Heebreakeelne Strongi leksikon:</translation>
     </message>
     <message>
-        <source>No sources were found in the SWORD configuration and BibleTime couldn&apos;t create a default source. Check your SWORD configuration and that the configuration path is writable. Then restart the Bookshelf Manager.</source>
-        <translation type="obsolete">SWORD teegi seadistuses ei leitud ühtegi allikat, mistõttu ei saanud BibleTime valida vaikimisi allikat. Palun kontrollige SWORD&apos;i konfiguratsiooni ning et konfiguratsiooni asukoht oleks kirjutatav. Seejärel taaskäivitage raamaturiiuli haldamine.</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="190"/>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation>Eelistatud heebreakeelset leksikoni kasutatakse, kui klikitakse hüperlingil, mis viitab heebreakeelsesse leksikoni</translation>
     </message>
     <message>
-        <source>Remote:</source>
-        <translation type="obsolete">Võrgusolev:</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation>Kreekakeelne Strongi leksikon:</translation>
     </message>
     <message>
-        <source>Local:</source>
-        <translation type="obsolete">Kohalik:</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="194"/>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation>Eelistatud kreekakeelset leksikoni kasutatakse, kui klikitakse hüperlingil, mis viitab kreekakeelsesse leksikoni</translation>
     </message>
     <message>
-        <source>Not a directory!</source>
-        <translation type="obsolete">Ei ole kataloog!</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</source>
+        <translation>Heebreakeelne morfoloogiline leksikon:</translation>
     </message>
     <message>
-        <source>Not readable!</source>
-        <translation type="obsolete">Pole loetav!</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="198"/>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation>Eelistatud heebreakeelset morfoloogilist leksikoni kasutatakse, kui klikitakse morfoloogilise märgendi hüperlingil heebreakeelses tekstis</translation>
     </message>
     <message>
-        <source>Warning</source>
-        <translation type="obsolete">Hoiatus</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</source>
+        <translation>Kreekakeelne morfoloogiline leksikon:</translation>
     </message>
     <message>
-        <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="obsolete">Sihtkataloog pole kirjutatav või ei eksisteeri. Paigaldus ebaõnnestub kui seda probleemi eelnevalt ei lahendata.</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="202"/>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation>Eelistatud kreekakeelset morfoloogilist leksikoni kasutatakse, kui klikitakse morfoloogilise märgendi hüperlingil kreekakeelses tekstis</translation>
     </message>
 </context>
 <context>
     <name>BtTextFiltersTab</name>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="74"/>
         <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="obsolete">Filtrid reguleerivad teksti välimust. Siin võite Te seadistada vaikimisi sätteid kõikidele filtritele. Te saate filtrite sätteid ka igas aknas eraldi muuta.</translation>
+        <translation>Filtrid reguleerivad teksti välimust. Siin võite Te seadistada vaikimisi sätteid kõikidele filtritele. Te saate filtrite sätteid ka igas aknas eraldi muuta.</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="78"/>
         <source>Insert line break after each verse</source>
-        <translation type="obsolete">Alusta iga salmi uuelt realt</translation>
+        <translation>Alusta iga salmi uuelt realt</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
         <source>Show verse numbers</source>
-        <translation type="obsolete">Kuva salmide numbreid</translation>
+        <translation>Kuva salmide numbreid</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
         <source>Show section headings</source>
-        <translation type="obsolete">Kuva tekstiosade pealkirju</translation>
+        <translation>Kuva tekstiosade pealkirju</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
         <source>Show scripture cross-references</source>
-        <translation type="obsolete">Kuva pühakirjade ristviiteid</translation>
+        <translation>Kuva pühakirjade ristviiteid</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="82"/>
         <source>Show Greek accents</source>
-        <translation type="obsolete">Kuva kreeka keele rõhumärke</translation>
+        <translation>Kuva kreeka keele rõhumärke</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="83"/>
         <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">Kuva heebrea keele vokaalimärke</translation>
+        <translation>Kuva heebrea keele vokaalimärke</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="84"/>
         <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">Kuva heebrea keele laulumärke</translation>
+        <translation>Kuva heebrea keele laulumärke</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="85"/>
         <source>Show morph segmentation</source>
-        <translation type="obsolete">Kuva morfoloogilist segmentatsiooni</translation>
+        <translation>Kuva morfoloogilist segmentatsiooni</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="86"/>
         <source>Use textual variants</source>
-        <translation type="obsolete">Kasuta tekstivariante</translation>
+        <translation>Kasuta tekstivariante</translation>
     </message>
 </context>
 <context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
         <source>Add/remove/replace</source>
         <translation>Lisa/eemalda/asenda</translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Eemalda</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
         <source>Remove</source>
         <translation>Eemalda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
         <source>Replace</source>
         <translation>Asenda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
         <source>Add</source>
         <translation>Lisa</translation>
     </message>
@@ -1869,95 +1864,87 @@ kiirklahv</translation>
 <context>
     <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="69"/>
         <source>Tip Of The Day</source>
         <translation>Päeva vihje</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="83"/>
         <source>Show tips at startup</source>
         <translation>Näita vihjeid käivitamisel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="94"/>
         <source>Next Tip</source>
         <translation>Järgmine vihje</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
         <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
         <translation>Mitme piiblitõlke kõrvuti kuvamiseks valige see ikoon ja valige teine piiblitõlge.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
         <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
         <translation>Mitmete kommentaaride kõrvuti kuvamiseks valige see ikoon ja valige teine kommentaaridega teos.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="134"/>
         <source>To learn more about the BibleTime project please go to our web site.</source>
         <translation>BibleTime kohta lisainformatsiooni leidmiseks, palun külastage meie kodulehekülge.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="137"/>
         <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
         <translation>Kommentaariakna sünkroniseerimiseks aktiivse piibliaknaga aktiveerige kommentaariaken ja valige see ikoon.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
         <source>Select the icon again to stop the synchronization.</source>
         <translation>Sünkroniseerimise lõpetamiseks, valige ikoon uuesti.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="142"/>
         <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
         <translation>Järjehoidja loomiseks lohistage viide värsile piibli- või kommentaariaknast järjehoidjate kuvale. Ilmuv nool näitab kohta kuhu järjehoidja asetatakse kui te hiirekursori vabastate. Teistel teostel on ülemises vasakus nurgas viide, mida saab järjehoidja loomiseks kasutada.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="147"/>
         <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
         <translation>Järjehoidja nime või kirjelduse muutmiseks, vajutage hiire parema nupuga järjehoidjal ja valige hüpikmenüüst &quot;Muuda järjehoidjat&quot;. Pärast järjehoidja muutmist võib tema kirjeldust näha ka hiirekursorit järjehoidja kohal hoides.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="151"/>
         <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
         <translation>Mitmete paigaldusallikate laadimiseks avage &quot;Raamaturiiuli haldamine&quot;, valige &quot;Lisa...&quot; nupp ja vajutage &quot;Hangi nimekiri...&quot; nuppu.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="154"/>
         <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
         <translation>Mõne teose kohta lisainformatsiooni leidmiseks vajutage raamaturiiulis teosel parema hiirenupuga ja valige &quot;Info...&quot; menüü.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="157"/>
         <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
         <translation>Raamaturiiuli, järjehoidjate ja infokuva saab peaaknas ümber paigutada neid päistest lohistades. Neid saab paigaldada igasse peaakna äärde. Kui neid lohistada üksteise peale jäävad nad mõlemad ligipääsetavaks sakkide abil. Nende kuvade suurust saab muuta neid äärtest lohistades.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="163"/>
         <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
         <translation>Teosest Strongi numbrite järgi otsimiseks kasutage Strongi numbritega teost ja liigutage hiirekursor mõne sõna peale. Parema hiireklõpsuga avate hüpikmenüü, kust saate valida Strongi numbrite otsingu. Avanevas aknas näete samade Strongi numbrite kasutust teose teistes osades.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="178"/>
         <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
         <translation>Oma avatud aknad võite salvestada sessiooniks. Taolist sessiooni saab hiljem hõlpsasti taastada. Salvestatavate sessioonide hulk pole piiratud. Sessioone saab hallata &quot;Aken&quot;-menüü alt.</translation>
     </message>
     <message>
-        <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging theborder between the window and another window.</source>
-        <translation type="obsolete">Raamaturiiuli, järjehoidjate ja infokuva saab peaaknas ümber paigutada neid päistest lohistades. Neid saab paigaldada igasse peaakna äärde. Kui neid lohistada üksteise peale jäävad nad mõlemad ligipääsetavaks sakkide abil. Nende kuvade suurust saab muuta neid äärtest lohistades.</translation>
-    </message>
-    <message>
-        <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the sameStrong&apos;s number in other locations of the work.</source>
-        <translation type="obsolete">Teosest Strongi numbrite järgi otsimiseks kasutage Strongi numbritega teost ja liigutage hiirekursor mõne sõna peale. Parema hiireklõpsuga avate hüpikmenüü, kust saate valida Strongi numbrite otsingu. Avanevas aknas näete samade Strongi numbrite kasutust teose teistes osades.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="168"/>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
         <translation>Isiklikke märkmeid saate salvesta värsside viitade kohta. Selleks peate paigaldama kommentaaride teose &quot;Personal&quot;. Selleks avage &quot;Raamaturiiuli haldamine&quot;, valige allikaks Crosswire, leidke teos Personal ingliskeelsete kommentaaride alt ning paigaldage see. Märkete lisamiseks või muutmiseks vajutage raamaturiiulikuvas teose Personal peal parema hiirenupuga ja valige hüpikmenüüst &quot;Redigeeri&quot;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
         <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
         <translation>Strongi numbrite info vaatamiseks infokuvast liikuge hiirekursoriga mõne sõna peale piibliaknas, kus on avatus Strongi numbrite toega piiblitõlge. Selleks läheb vaja ka StrongsGreek ja StrongsHebrew leksikone Crosswire allikast.</translation>
     </message>
@@ -1973,49 +1960,49 @@ kiirklahv</translation>
 <context>
     <name>CAcceleratorSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="128"/>
         <source>Choose action group:</source>
         <translation>Valige tegevuste rühm:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="130"/>
         <source>Main Window</source>
         <translation>Peaaken</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
         <source>All text windows</source>
         <translation>Kõik tekstiaknad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="132"/>
         <source>Bible windows</source>
         <translation>Piibliaknad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
         <source>Commentary windows</source>
         <translation>Kommentaaride aknad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="134"/>
         <source>Lexicon windows</source>
         <translation>Leksikonide aknad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
         <source>Book windows</source>
         <translation>Raamatute aknad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
         <source>
    &quot;%1&quot; in the &quot;%2&quot; group</source>
         <translation>
    &quot;%1&quot; rühmas &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
         <source>Shortcuts</source>
         <translation>Kiirklahvid</translation>
     </message>
@@ -2023,103 +2010,95 @@ kiirklahv</translation>
 <context>
     <name>CBibleReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="64"/>
         <source>Next book</source>
         <translation>Järgmine raamat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="68"/>
         <source>Previous book</source>
         <translation>Eelmine raamat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="72"/>
         <source>Next chapter</source>
         <translation>Järgmine peatükk</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="76"/>
         <source>Previous chapter</source>
         <translation>Eelmine peatükk</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="80"/>
         <source>Next verse</source>
         <translation>Järgmine salm</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="84"/>
         <source>Previous verse</source>
         <translation>Eelmine salm</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="89"/>
         <source>Copy chapter</source>
         <translation>Kopeeri peatükk</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="92"/>
         <source>Save chapter as plain text</source>
         <translation>Salvesta peatükk tavalise tekstina</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="95"/>
         <source>Save chapter as HTML</source>
         <translation>Salvesta peatükk HTML&apos;ina</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="98"/>
         <source>Print chapter</source>
         <translation>Trüki peatükk</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="110"/>
         <source>Text of reference</source>
         <translation>Viidatud tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
         <source>Reference with text</source>
         <translation>Viide koos tekstiga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="253"/>
         <source>Bible window</source>
         <translation>Piibliaken</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="263"/>
         <source>Copy...</source>
         <translation>Kopeeri...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="274"/>
         <source>Save...</source>
         <translation>Salvesta...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="287"/>
         <source>Print...</source>
         <translation>Trüki...</translation>
     </message>
     <message>
-        <source>Copy chapter to clipboard ...</source>
-        <translation type="obsolete">Peatüki kopeerimine...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="371"/>
         <source>Copying</source>
         <translation>Kopeerimine</translation>
     </message>
     <message>
-        <source>Saving chapter ...</source>
-        <translation type="obsolete">Peatüki salvestamine...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="390"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="408"/>
         <source>Saving</source>
         <translation>Salvestamine</translation>
     </message>
@@ -2127,7 +2106,7 @@ kiirklahv</translation>
 <context>
     <name>CBookReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
+        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="70"/>
         <source>Toggle tree view</source>
         <translation>Kuva sisukord</translation>
     </message>
@@ -2135,97 +2114,93 @@ kiirklahv</translation>
 <context>
     <name>CBookmarkIndex</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
         <source>Bookmarks</source>
         <translation>Järjehoidjad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="92"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="583"/>
         <source>New folder</source>
         <translation>Uus kaust</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
         <source>Rename folder</source>
         <translation>Nimeta kaust ümber</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
         <source>Delete Items</source>
         <translation>Kustuta kirjed</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="704"/>
         <source>Do you really want to delete the selected items and child-items?</source>
         <translation>Kas Te tõesti soovite kustutada valitud kirjed ja alamkirjed?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="814"/>
         <source>The work to which the bookmark points to is not installed.</source>
         <translation>Teos, millele järjehoidja viitab, pole paigaldatud.</translation>
     </message>
     <message>
-        <source>Change bookmark description...</source>
-        <translation type="obsolete">Muuda järjehoidja kirjeldust...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
         <source>Print bookmarks...</source>
         <translation>Trüki järjehoidjad...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="103"/>
         <source>Remove selected items...</source>
         <translation>Eemalda valitud kirjed...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
         <source>Import to folder...</source>
         <translation>Impordi kaustast...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
         <source>Edit bookmark...</source>
         <translation>Muuda järjehoidjat...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
         <source>Sort folder bookmarks...</source>
         <translation>Sorteeri järjehoidjad kaustas...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
         <source>Sort all bookmarks...</source>
         <translation>Sorteeri kõik järjehoidjad...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="100"/>
         <source>Export from folder...</source>
         <translation>Ekspordi kausta...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="393"/>
         <source>Can drop only bookmarks or one folder</source>
         <translation>Ainult järjehoidjaid või üksikut kausta saab lohistada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="398"/>
         <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
         <translation>Kausta ei saa iseendasse või mõnda iseenda alamkausta asetada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
         <source>Copy</source>
         <translation>Kopeeri</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="406"/>
         <source>Move</source>
         <translation>Teisalda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="467"/>
         <source>Drag references from text views to this view</source>
         <translation>Lohistage viiteid tekstiakendest siia</translation>
     </message>
@@ -2233,42 +2208,42 @@ kiirklahv</translation>
 <context>
     <name>CCommentaryReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="31"/>
         <source>Next book</source>
         <translation>Järgmine raamat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="35"/>
         <source>Previous book</source>
         <translation>Eelmine raamat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="39"/>
         <source>Next chapter</source>
         <translation>Järgmine peatükk</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="43"/>
         <source>Previous chapter</source>
         <translation>Eelmine peatükk</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="47"/>
         <source>Next verse</source>
         <translation>Järgmine salm</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="51"/>
         <source>Previous verse</source>
         <translation>Eelmine salm</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="56"/>
         <source>Synchronize</source>
         <translation>Sünkroniseeri</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="59"/>
         <source>Synchronize the displayed entry of this work with the active Bible window</source>
         <translation>Sünkroniseeri selle teose kuvatud kirje aktiivse piibliaknaga</translation>
     </message>
@@ -2276,7 +2251,7 @@ kiirklahv</translation>
 <context>
     <name>CConfigurationDialog</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="41"/>
         <source>Configure BibleTime</source>
         <translation>Seadista BibleTime</translation>
     </message>
@@ -2284,67 +2259,67 @@ kiirklahv</translation>
 <context>
     <name>CDisplaySettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
         <source>Display templates</source>
         <translation>Kuvamallid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
         <source>Available display styles:</source>
         <translation>Saadaval olevad mallid:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="113"/>
         <source>Style preview</source>
         <translation>Malli eelvaade</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="131"/>
         <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
         <translation>Sest nõnda on Jumal maailma armastanud, et ta oma ainusündinud Poja on andnud, et ükski, kes temasse usub, ei hukkuks, vaid et tal oleks igavene elu.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="138"/>
         <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
         <translation>Jumal ei ole ju läkitanud oma Poega maailma, et ta kohut mõistaks maailma üle, vaid et maailm tema läbi päästetaks.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="145"/>
         <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
         <translation>Kes temasse usub, selle üle ei mõisteta kohut, ja kes ei usu, selle üle on kohus juba mõistetud, sest ta ei ole uskunud Jumala ainusündinud Poja nimesse.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="155"/>
         <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
         <translation>Igaüks, kes teeb halba, vihkab valgust ega tule valguse juurde, et ta tegusid ei paljastataks.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="160"/>
         <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
         <translation>Aga kes teeb tõtt, see tuleb valguse juurde, et ta teod saaksid avalikuks, sest need on tehtud Jumalas.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="106"/>
         <source>Display templates define how text is displayed.</source>
         <translation>Kuvamallid määravad, kuidas teksti kuvatakse.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="110"/>
         <source>Show the BibleTime logo on startup</source>
         <translation>Kuva käivitamisel BibleTime logo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
         <source>Show startup logo</source>
         <translation>Kuva käivituslogo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="150"/>
         <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
         <translation>Ent kohus on see, et valgus on tulnud maailma, aga inimesed on armastanud pimedust enam kui valgust, sest nende teod on kurjad.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="101"/>
         <source>Display</source>
         <translation>Kuva</translation>
     </message>
@@ -2357,154 +2332,129 @@ kiirklahv</translation>
 <context>
     <name>CDisplayWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="215"/>
         <source>Back in history</source>
         <translatorcomment>fuzzy; maybe just &quot;Tagasi&quot; (&quot;Back&quot;)</translatorcomment>
         <translation>Tagasi ajaloos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="223"/>
         <source>Forward in history</source>
         <translatorcomment>fuzzy; maybe just &quot;Edasi&quot; (&quot;Forward&quot;)</translatorcomment>
         <translation>Edasi ajaloos</translation>
     </message>
     <message>
-        <source>Zoom in</source>
-        <translatorcomment>&quot;Suurenda kirjasuurust&quot; would probably be better for zooming text</translatorcomment>
-        <translation type="obsolete">Suumi sisse</translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translatorcomment>&quot;Vähenda kirjasuurust&quot; would probably be better for zooming text</translatorcomment>
-        <translation type="obsolete">Suumi välja</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="192"/>
         <source>Select all</source>
         <translation>Vali kõik</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="196"/>
         <source>Copy</source>
         <translation>Kopeeri</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="200"/>
         <source>Find...</source>
         <translation>Otsi...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="204"/>
         <source>Change location</source>
         <translation>Muuda asukohta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="209"/>
         <source>Search with works of this window</source>
         <translation>Otsi selle akna teoste seast</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="393"/>
         <source>Work chooser buttons</source>
         <translation>Teose valimise nupud</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="403"/>
         <source>Text area header</source>
         <translation>Tekstiala päis</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="453"/>
         <source>Navigation</source>
         <translation>Navigeerimine</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="459"/>
         <source>Tool</source>
         <translation>Tööriistad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="465"/>
         <source>Format</source>
         <translation>Vormindus</translation>
     </message>
 </context>
 <context>
-    <name>CFontChooser</name>
-    <message>
-        <source>Size:</source>
-        <translation type="obsolete">Suurus:</translation>
-    </message>
-    <message>
-        <source>Font name:</source>
-        <translation type="obsolete">Kirjatüüp:</translation>
-    </message>
-    <message>
-        <source>Font style:</source>
-        <translation type="obsolete">Kirja stiil:</translation>
-    </message>
-</context>
-<context>
     <name>CHTMLWriteDisplay</name>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
         <source>Bold</source>
         <translation>Rasvane</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="60"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="67"/>
         <source>Italic</source>
         <translation>Kursiiv</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="79"/>
         <source>Underline</source>
         <translation>Allajoonitud</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="84"/>
         <source>Left</source>
         <translatorcomment>fuzzy</translatorcomment>
         <translation>Vasakule</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="94"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="99"/>
         <source>Center</source>
         <translatorcomment>fuzzy</translatorcomment>
         <translation>Keskele</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="104"/>
         <source>Right</source>
         <translatorcomment>fuzzy</translatorcomment>
         <translation>Paremale</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="231"/>
         <source>Font</source>
         <translation>Kirjatüüp</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="243"/>
         <source>Font size</source>
         <translation>Kirja suurus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="255"/>
         <source>Font color</source>
         <translation>Kirja värv</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="89"/>
         <source>Align left</source>
         <translation>Joonda vasakule</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="109"/>
         <source>Align right</source>
         <translation>Joonda paremale</translation>
     </message>
@@ -2512,60 +2462,22 @@ kiirklahv</translation>
 <context>
     <name>CHTMLWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="122"/>
         <source>Module not writable</source>
         <translation>Moodul pole kirjutatav</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="124"/>
         <source>Module is not writable.</source>
         <translation>Moodul ei ole kirjutatav.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="125"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Moodulit ei või redigeerida, või Teil puuduvad kirjutusõigused.</translation>
     </message>
 </context>
 <context>
-    <name>CInputDialog</name>
-    <message>
-        <source>Clear</source>
-        <translation type="obsolete">Tühjenda</translation>
-    </message>
-</context>
-<context>
-    <name>CKeyReferenceWidget</name>
-    <message>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="obsolete">Elemendi valimiseks vajutage seda nuppu ja liigutage hiirekursorit üles või alla.</translation>
-    </message>
-    <message>
-        <source>Next book</source>
-        <translation type="obsolete">Järgmine raamat</translation>
-    </message>
-    <message>
-        <source>Previous book</source>
-        <translation type="obsolete">Eelmine raamat</translation>
-    </message>
-    <message>
-        <source>Next chapter</source>
-        <translation type="obsolete">Järgmine peatükk</translation>
-    </message>
-    <message>
-        <source>Previous chapter</source>
-        <translation type="obsolete">Eelmine peatükk</translation>
-    </message>
-    <message>
-        <source>Next verse</source>
-        <translation type="obsolete">Järgmine salm</translation>
-    </message>
-    <message>
-        <source>Previous verse</source>
-        <translation type="obsolete">Eelmine salm</translation>
-    </message>
-</context>
-<context>
     <name>CLanguageSettingsPage</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/clanguagesettings.cpp" line="297"/>
@@ -2576,22 +2488,22 @@ kiirklahv</translation>
 <context>
     <name>CLexiconKeyChooser</name>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Elemendi valimiseks vajutage seda nuppu ja liigutage hiirekursorit üles või alla.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
         <source>Entries of the current work</source>
         <translation>Käesoleva teose kirjed</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Järgmine kirje</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="49"/>
         <source>Previous entry</source>
         <translation>Eelmine kirje</translation>
     </message>
@@ -2599,189 +2511,183 @@ kiirklahv</translation>
 <context>
     <name>CLexiconReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Järgmine kirje</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="51"/>
         <source>Previous entry</source>
         <translation>Eelmine kirje</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="55"/>
         <source>Copy reference only</source>
         <translation>Kopeeri ainult viide</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
         <source>Save entry as HTML</source>
         <translation>Salvesta kirje HTML&apos;ina</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
         <source>Print reference only</source>
         <translation>Trüki ainult viide</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
         <source>Strong&apos;s Search</source>
         <translation>Strongi numbrite otsing</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
         <source>Entry with text</source>
         <translation>Kirje tekstiga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="134"/>
         <source>Entry as plain text</source>
         <translation>Kirje tavalise tekstina</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="265"/>
         <source>Lexicon window</source>
         <translation>Leksikoni aken</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="272"/>
         <source>Copy...</source>
         <translation>Kopeeri...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="281"/>
         <source>Save...</source>
         <translation>Salvesta...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="297"/>
         <source>Print...</source>
         <translation>Trüki...</translation>
     </message>
     <message>
-        <source>Saving entry ...</source>
-        <translation type="obsolete">Kirje salvestamine...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="340"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="364"/>
         <source>Saving</source>
         <translation>Salvestamine</translation>
     </message>
 </context>
 <context>
-    <name>CModuleIndexDialog</name>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Katkesta</translation>
-    </message>
-    <message>
-        <source>Creating indices</source>
-        <translation type="obsolete">Indeksite loomine</translation>
-    </message>
-    <message>
-        <source>Creating index for work: %1</source>
-        <translation type="obsolete">Teose %1 indekseerimine</translation>
-    </message>
-    <message>
-        <source>Indexing Is Cancelled</source>
-        <translation type="obsolete">Indekseerimine on katkestatud</translation>
-    </message>
-    <message>
-        <source>Indexing is cancelled because modules are removed.</source>
-        <translation type="obsolete">Indekseerimine katkestati, sest mooduleid eemaldatakse.</translation>
-    </message>
-</context>
-<context>
     <name>CPlainWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="235"/>
         <source>Sync with active Bible</source>
         <translation>Sünkroniseeri aktiivse Piibliga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="245"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="249"/>
         <source>Save text</source>
         <translation>Salvesta tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="254"/>
         <source>Delete current entry</source>
         <translation>Kustuta see kirje</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="263"/>
         <source>Restore original text</source>
         <translation>Taasta esialgne tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="163"/>
         <source>Module not writable</source>
         <translation>Moodul pole kirjutatav</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="165"/>
         <source>Module is not writable.</source>
         <translation>Moodul ei ole kirjutatav.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="166"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Moodulit ei või redigeerida, või Teil puuduvad kirjutusõigused.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="240"/>
         <source>Synchronize (show the same verse) with the active Bible window</source>
         <translation>Sünkroniseeri (näita sama salmi) aktiivse piibliaknaga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="258"/>
         <source>Delete current entry (no undo)</source>
         <translation>Kustuta see kirje (kustutamist ei saa tagasi võtta)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="267"/>
         <source>Restore original text, new text will be lost</source>
         <translation>Taasta originaaltekst, uus tekst kaotatakse</translation>
     </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save Text?</source>
+        <translation>Salvestada tekst?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <source>Save text before closing?</source>
+        <translation>Salvestada tekst enne sulgemist?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save changed text?</source>
+        <translation>Salvestada muudetud tekst?</translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="232"/>
         <source>Save Search Analysis</source>
         <translation>Salvesta otsinguanalüüs</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation>HTML failid (*.html;*.HTML;*.HTM;*.htm)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="243"/>
         <source>BibleTime Search Analysis</source>
         <translation>BibleTime otsinguanalüüs</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="234"/>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
+        <translation>XHTML failid (*.html;*.HTML;*.HTM;*.htm);;Kõik failid (*)</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="259"/>
+        <source>Search text:</source>
         <translation>Otsingutekst:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="263"/>
+        <source>Results by work and book</source>
+        <translation>Tulemused teose ja raamatu järgi</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="265"/>
         <source>Book</source>
         <translation>Raamat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="293"/>
         <source>Total hits</source>
         <translation>Tulemusi kokku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="303"/>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
         <translation>Genereeritud&lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt; poolt</translation>
     </message>
@@ -2789,168 +2695,168 @@ kiirklahv</translation>
 <context>
     <name>CSwordModuleInfo</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="763"/>
         <source>Version</source>
         <translation>Versioon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="766"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="774"/>
         <source>unknown</source>
         <translation>teadmata</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="771"/>
         <source>Markup</source>
         <translation>Märgendus</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
         <source>Location</source>
         <translation>Asukoht</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="782"/>
         <source>Language</source>
         <translation>Keel</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="787"/>
         <source>Category</source>
         <translation>Kategooria</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="792"/>
         <source>LCSH</source>
         <translation>LCSH</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="796"/>
         <source>Writable</source>
         <translation>Kirjutamisõigustega</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>yes</source>
         <translation>jah</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>no</source>
         <translation>ei</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="801"/>
         <source>Unlock key</source>
         <translation>Avamiskood</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="822"/>
         <source>Features</source>
         <translation>Funktsionaalsus</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="830"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Hoiatus, see teos sisaldab kultuslikku või küsitavat materjali!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="834"/>
         <source>About</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="856"/>
         <source>Distribution license</source>
         <translation>Distributsiooni litsents</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="857"/>
         <source>Distribution source</source>
         <translation>Distributsiooni allikas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="858"/>
         <source>Distribution notes</source>
         <translation>Distributsiooni märkmed</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="859"/>
         <source>Text source</source>
         <translation>Teksti allikas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="860"/>
         <source>Copyright notes</source>
         <translation>Autoriõiguste märkmed</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
         <source>Copyright holder</source>
         <translation>Autoriõiguste omanik</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
         <source>Copyright date</source>
         <translation>Autoriõiguste kuupäev</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
         <source>Copyright contact name</source>
         <translation>Autoriõiguste omaniku kontaktisiku nimi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
         <source>Copyright contact address</source>
         <translation>Autoriõiguste omaniku kontaktisiku aadress</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
         <source>Copyright contact email</source>
         <translation>Autoriõiguste omaniku kontaktisiku e-post</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="956"/>
         <source>Bibles</source>
         <translation>Piiblid</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="958"/>
         <source>Commentaries</source>
         <translation>Kommentaarid</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="960"/>
         <source>Books</source>
         <translation>Raamatud</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="962"/>
         <source>Cults/Unorthodox</source>
         <translation>Kultuslik/mitteortodoksne</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="964"/>
         <source>Maps and Images</source>
         <translation>Kaardid ja pildid</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="966"/>
         <source>Daily Devotionals</source>
         <translation>Igapäevane harduskirjandus</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="968"/>
         <source>Lexicons and Dictionaries</source>
         <translation>Leksikonid ja sõnaraamatud</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="970"/>
         <source>Glossaries</source>
         <translation>Sõnastikud</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="972"/>
         <source>Unknown</source>
         <translation>Teadmata</translation>
     </message>
@@ -2958,17 +2864,17 @@ kiirklahv</translation>
 <context>
     <name>CSwordSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="43"/>
         <source>Standard works</source>
         <translation>Eelistatud teosed</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="44"/>
         <source>Text filters</source>
         <translation>Tekstifiltrid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="41"/>
         <source>Desk</source>
         <translation>Kirjutuslaud</translation>
     </message>
@@ -2981,37 +2887,37 @@ kiirklahv</translation>
 <context>
     <name>CSwordSetupInstallSourcesDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="47"/>
         <source>Caption</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
         <source>Type</source>
         <translation>Tüüp</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="68"/>
         <source>Path</source>
         <translation>Asukoht</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="91"/>
         <source>Get list...</source>
         <translation>Hangi nimekiri...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
         <source>A source with this caption already exists. Please provide a different caption.</source>
         <translation>Sellise nimega allikas juba eksisteerib. Palun sisestage erinev nimi.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="160"/>
         <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
 
 Do you want to continue?</source>
@@ -3020,140 +2926,121 @@ Do you want to continue?</source>
 Kas soovite jätkata?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
         <source>Get source list from remote server?</source>
         <translation>Kas laadida allikate nimekiri välisest serverist?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="167"/>
         <source>Cancel</source>
         <translation>Katkesta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="168"/>
         <source>Downloading List</source>
         <translation>Nimekirja allalaadimine</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="178"/>
         <source>Connecting...</source>
         <translation>Ãœhendumine...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="197"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="198"/>
         <source>Refreshing...</source>
         <translation>Värskendamine...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="92"/>
         <source>Download a list of sources from CrossWire server and add sources</source>
         <translation>Lae alla allikate nimekiri CrossWire serverist ja lisa need allikad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
         <source>Please provide a caption.</source>
         <translation>Palun sisestage ka allika nimetus.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
         <source>Please provide a server name.</source>
         <translation>Palun sisestage ka serveri nimi.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
         <source>Please provide a valid, readable path.</source>
         <translation>Palun sisestage kehtiv, lugemisõigustega asukoht.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Please provide a path.</source>
         <translation>Palun sisestage ka asukoht.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="39"/>
         <source>New  Installation Source</source>
         <translation>Uus paigalduse allikas</translation>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>Salvestada tekst enne sulgemist?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>Salvestada muudetud tekst?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>Salvestada tekst?</translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
         <source>Select all</source>
         <translation>Vali kõik</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="60"/>
         <source>Copy</source>
         <translation>Kopeeri</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="80"/>
         <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
         <translation>&lt;small&gt;See on infokuva, kus näidatakse peale lühikest viivitust infot mitmete teoste elementide (hüperlinkide jms) kohta, kui hiirekursoriga nende kohale satutakse. Liigutage hiirekursor kiiresti infokuva peale või hoidke all tõsteklahvi (&lt;i&gt;shift&lt;/i&gt;) hiirt liigutades.&lt;/small&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="178"/>
         <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
         <translation>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Versioon: %3&lt;/p&gt;&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="194"/>
         <source>Abbreviation</source>
         <translation>Lühend</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="203"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="290"/>
         <source>Cross references</source>
         <translation>Ristviited</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="343"/>
         <source>Footnote</source>
         <translation>Allmärkus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="374"/>
         <source>Strongs</source>
         <translation>Strongi numbrid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="451"/>
         <source>Morphology</source>
         <translation>Morfoloogia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="472"/>
         <source>Word lookup</source>
         <translation>Sõnaotsing</translation>
     </message>
@@ -3161,28 +3048,28 @@ Kas soovite jätkata?</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="412"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="422"/>
         <source>Indexing aborted</source>
         <translation>Indekseerimine katkestatud</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="413"/>
         <source>An internal error occurred while building the index: %1</source>
         <translation>Indekseerimisel esines programmisisene viga: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="423"/>
         <source>An internal error occurred while building the index.</source>
         <translation>Indekseerimisel esines programmisisene viga.</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="522"/>
         <source>Search aborted</source>
         <translation>Otsing katkestatud</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="523"/>
         <source>An internal error occurred while executing your search.</source>
         <translation>Otsimisel esines programmisisene viga.</translation>
     </message>
@@ -3223,7 +3110,7 @@ Kas soovite jätkata?</translation>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="122"/>
         <source>Bibles</source>
         <translation>Piiblid</translation>
     </message>
@@ -3240,740 +3127,740 @@ Kas soovite jätkata?</translation>
         <translation>Raamatud</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="390"/>
         <source>Added text</source>
         <translation>Lisatud tekst</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="143"/>
         <source>Names of languages</source>
         <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
         <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
         <translation>Keelte nimed</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="148"/>
         <source>Afrikaans</source>
         <extracomment>Language name af</extracomment>
         <translation>afrikaani</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="151"/>
         <source>Amuzgo, Guerrero</source>
         <extracomment>Language name amu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="153"/>
         <source>English, Old (ca.450-1100)</source>
         <extracomment>Language name ang</extracomment>
         <translation>vanainglise (~450-1100)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="155"/>
         <source>Arabic</source>
         <extracomment>Language name ar</extracomment>
         <translation>araabia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="158"/>
         <source>Azerbaijani</source>
         <extracomment>Language name az</extracomment>
         <translation>aserbaidžaani</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="160"/>
         <source>Azerbaijani, South</source>
         <extracomment>Language name azb</extracomment>
         <translation>lõuna-aserbaidžaani</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="165"/>
         <source>Belarusian</source>
         <extracomment>Language name be</extracomment>
         <translation>valgevene</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="167"/>
         <source>Bulgarian</source>
         <extracomment>Language name bg</extracomment>
         <translation>bulgaaria</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="173"/>
         <source>Breton</source>
         <extracomment>Language name br</extracomment>
         <translation>bretooni</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="175"/>
         <source>Bosnian</source>
         <extracomment>Language name bs</extracomment>
         <translation>bosnia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="177"/>
         <source>Catalan</source>
         <extracomment>Language name ca</extracomment>
         <translation>katalaani</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="180"/>
         <source>Chinantec, Comaltepec</source>
         <extracomment>Language name cco</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="182"/>
         <source>Cebuano</source>
         <extracomment>Language name ceb</extracomment>
         <translation>sebu</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
         <source>Chamorro</source>
         <extracomment>Language name ch</extracomment>
         <translation>tšamorro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
         <source>Chontal, Highland Oaxaca</source>
         <extracomment>Language name chd</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
         <source>Chinantec, Quiotepec</source>
         <extracomment>Language name chq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="190"/>
         <source>Chinantec, Ozumacu00edn</source>
         <extracomment>Language name chz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="193"/>
         <source>Cakchiquel, Western</source>
         <extracomment>Language name ckw</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="195"/>
         <source>Chinantec, Lalana</source>
         <extracomment>Language name cnl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="197"/>
         <source>Chinantec, Tepetotutla</source>
         <extracomment>Language name cnt</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="199"/>
         <source>Coptic</source>
         <extracomment>Language name cop</extracomment>
         <translation>kopti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
         <source>Czech</source>
         <extracomment>Language name cs</extracomment>
         <translation>tšehhi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
         <source>Chinantec, Sochiapan</source>
         <extracomment>Language name cso</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
         <source>Chol, Tila</source>
         <extracomment>Language name cti</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
         <source>Chatino, Western Highland</source>
         <extracomment>Language name ctp</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
         <source>Church Slavic</source>
         <extracomment>Language name cu</extracomment>
         <translation>kirikuslaavi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="212"/>
         <source>Welsh</source>
         <extracomment>Language name cy</extracomment>
         <translation>kõmri</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
         <source>Danish</source>
         <extracomment>Language name da</extracomment>
         <translation>taani</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
         <source>German</source>
         <extracomment>Language name de</extracomment>
         <translation>saksa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
         <source>Duruma</source>
         <extracomment>Language name dug</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="221"/>
         <source>Greek, Modern (1453-)</source>
         <extracomment>Language name el</extracomment>
         <translation>kreeka (1453-)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
         <source>English</source>
         <extracomment>Language name en</extracomment>
         <translation>inglise</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="225"/>
         <source>American English</source>
         <extracomment>Language name en_US</extracomment>
         <translation>ameerika-inglise</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="227"/>
         <source>English, Middle (1100-1500)</source>
         <extracomment>Language name enm</extracomment>
         <translation>keskinglise (1100-1500)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="229"/>
         <source>Esperanto</source>
         <extracomment>Language name eo</extracomment>
         <translation>esperanto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="231"/>
         <source>Spanish</source>
         <extracomment>Language name es</extracomment>
         <translation>hispaania</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
         <source>Estonian</source>
         <extracomment>Language name et</extracomment>
         <translation>eesti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
         <source>Basque</source>
         <extracomment>Language name eu</extracomment>
         <translation>baski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
         <source>Persian</source>
         <extracomment>Language name fa</extracomment>
         <translation>pärsia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
         <source>Finnish</source>
         <extracomment>Language name fi</extracomment>
         <translation>soome</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="243"/>
         <source>French</source>
         <extracomment>Language name fr</extracomment>
         <translation>prantsuse</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="245"/>
         <source>Frisian</source>
         <extracomment>Language name fy</extracomment>
         <translation>friisi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="247"/>
         <source>Irish</source>
         <extracomment>Language name ga</extracomment>
         <translation>iiri</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="249"/>
         <source>Gaelic (Scots)</source>
         <extracomment>Language name gd</extracomment>
         <translation>gaeli</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="251"/>
         <source>Geez</source>
         <extracomment>Language name gez</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
         <source>Gothic</source>
         <extracomment>Language name got</extracomment>
         <translation>gooti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
         <source>Manx</source>
         <extracomment>Language name gv</extracomment>
         <translation>mänksi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
         <source>Greek, Ancient (to 1453)</source>
         <extracomment>Language name grc</extracomment>
         <translation>vanakreeka (kuni 1453)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="262"/>
         <source>Hebrew</source>
         <extracomment>Language name he</extracomment>
         <translation>heebrea</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
         <source>Hausa</source>
         <extracomment>Language name hau</extracomment>
         <translation>hausa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
         <source>Hawaiian</source>
         <extracomment>Language name haw</extracomment>
         <translation>havai</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
         <source>Hindi</source>
         <extracomment>Language name hi</extracomment>
         <translation>hindi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="271"/>
         <source>Croatian</source>
         <extracomment>Language name hr</extracomment>
         <translation>horvaadi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="275"/>
         <source>Hungarian</source>
         <extracomment>Language name hu</extracomment>
         <translation>ungari</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
         <source>Huave, San Mateo Del Mar</source>
         <extracomment>Language name huv</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
         <source>Armenian</source>
         <extracomment>Language name hy</extracomment>
         <translation>armeenia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
         <source>Indonesian</source>
         <extracomment>Language name id</extracomment>
         <translation>indoneesia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
         <source>Icelandic</source>
         <extracomment>Language name is</extracomment>
         <translation>islandi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
         <source>Italian</source>
         <extracomment>Language name it</extracomment>
         <translation>itaalia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="291"/>
         <source>Itzu00e1</source>
         <extracomment>Language name itz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="293"/>
         <source>Ixil, San Juan Cotzal</source>
         <extracomment>Language name ixl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
         <source>Japanese</source>
         <extracomment>Language name ja</extracomment>
         <translation>jaapani</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
         <source>Jacalteco, Eastern</source>
         <extracomment>Language name jac</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
         <source>Javanese, Caribbean</source>
         <extracomment>Language name jvn</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="302"/>
         <source>Georgian</source>
         <extracomment>Language name ka</extracomment>
         <translation>kruusia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
         <source>Korean</source>
         <extracomment>Language name ko</extracomment>
         <translation>korea</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="315"/>
         <source>Kurdish</source>
         <extracomment>Language name ku</extracomment>
         <translation>kurdi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
         <source>Kirghiz</source>
         <extracomment>Language name ky</extracomment>
         <translation>komi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
         <source>Latin</source>
         <extracomment>Language name la</extracomment>
         <translation>ladina</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
         <source>Lacandon</source>
         <extracomment>Language name lac</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
         <source>Lithuanian</source>
         <extracomment>Language name lt</extracomment>
         <translation>leedu</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="332"/>
         <source>Latvian</source>
         <extracomment>Language name lv</extracomment>
         <translation>läti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="334"/>
         <source>Malagasy</source>
         <extracomment>Language name mg</extracomment>
         <translation>malagassi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="337"/>
         <source>Maori</source>
         <extracomment>Language name mi</extracomment>
         <translation>maoori</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="339"/>
         <source>Mixe, Isthmus</source>
         <extracomment>Language name mir</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="341"/>
         <source>Mixtec, Coatzospan</source>
         <extracomment>Language name miz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="343"/>
         <source>Macedonian</source>
         <extracomment>Language name mk</extracomment>
         <translation>makedoonia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="345"/>
         <source>Mixtec, Silacayoapan</source>
         <extracomment>Language name mks</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="350"/>
         <source>More</source>
         <extracomment>Language name mos</extracomment>
         <translation>more</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
         <source>Malay</source>
         <extracomment>Language name ms</extracomment>
         <translation>malai</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
         <source>Maltese</source>
         <extracomment>Language name mt</extracomment>
         <translation>malta</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="375"/>
         <source>Low German; Low Saxon</source>
         <extracomment>Language name nds</extracomment>
         <translation>alamsaksa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="377"/>
         <source>Nepali</source>
         <extracomment>Language name ne</extracomment>
         <translation>nepali</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="379"/>
         <source>Nahuatl, Guerrero</source>
         <extracomment>Language name ngu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
         <source>Nahuatl, Northern Oaxaca</source>
         <extracomment>Language name nhy</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
         <source>Dutch</source>
         <extracomment>Language name nl</extracomment>
         <translation>hollandi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
         <source>Norwegian Nynorsk</source>
         <extracomment>Language name nn</extracomment>
         <translation>uusnorra</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
         <source>Norwegian</source>
         <extracomment>Language name no</extracomment>
         <translation>norra</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="397"/>
         <source>Otomi, Queru00e9taro</source>
         <extracomment>Language name otq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
         <source>Papiamento</source>
         <extracomment>Language name pap</extracomment>
         <translation>papiamento</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
         <source>Polish</source>
         <extracomment>Language name pl</extracomment>
         <translation>poola</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="411"/>
         <source>Persian (Dari)</source>
         <extracomment>Language name prs</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="415"/>
         <source>Portuguese</source>
         <extracomment>Language name pt</extracomment>
         <translation>portugali</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
         <source>Brasilian Portuguese</source>
         <extracomment>Language name pt_BR</extracomment>
         <translation>portugali (Brasiilia)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
         <source>Quichu00e9, West Central</source>
         <extracomment>Language name qut</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
         <source>Romanian</source>
         <extracomment>Language name ro</extracomment>
         <translation>rumeenia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
         <source>Russian</source>
         <extracomment>Language name ru</extracomment>
         <translation>vene</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="431"/>
         <source>Scots</source>
         <extracomment>Language name sco</extracomment>
         <translation>Å¡oti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="437"/>
         <source>Slovak</source>
         <extracomment>Language name sk</extracomment>
         <translation>slovaki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="439"/>
         <source>Slovenian</source>
         <extracomment>Language name sl</extracomment>
         <translation>sloveeni</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="443"/>
         <source>Somali</source>
         <extracomment>Language name so</extracomment>
         <translation>somaali</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
         <source>Albanian</source>
         <extracomment>Language name sq</extracomment>
         <translation>albaania</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="453"/>
         <source>Swedish</source>
         <extracomment>Language name sv</extracomment>
         <translation>rootsi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="455"/>
         <source>Swahili</source>
         <extracomment>Language name sw</extracomment>
         <translation>suahiili</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="457"/>
         <source>Syriac</source>
         <extracomment>Language name syr</extracomment>
         <translation>süüria</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="459"/>
         <source>Tamil</source>
         <extracomment>Language name ta</extracomment>
         <translation>tamili</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="463"/>
         <source>Thai</source>
         <extracomment>Language name th</extracomment>
         <translation>tai</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
         <source>Tagalog</source>
         <extracomment>Language name tl</extracomment>
         <translation>tagalogi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="470"/>
         <source>Tswana</source>
         <extracomment>Language name tn</extracomment>
         <translation>tsvana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="472"/>
         <source>Turkish</source>
         <extracomment>Language name tr</extracomment>
         <translation>türgi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
         <source>Tektiteko</source>
         <extracomment>Language name ttc</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="479"/>
         <source>Tahitian</source>
         <extracomment>Language name ty</extracomment>
         <translation>tahiti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="481"/>
         <source>Tzotzil, Zinacantu00e1n</source>
         <extracomment>Language name tzz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
         <source>Ukrainian</source>
         <extracomment>Language name uk</extracomment>
         <translation>ukraina</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
         <source>Orya</source>
         <extracomment>Language name ury</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
         <source>Uspanteco</source>
         <extracomment>Language name usp</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="492"/>
         <source>Vietnamese</source>
         <extracomment>Language name vi</extracomment>
         <translation>vietnami</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="496"/>
         <source>Xhosa</source>
         <extracomment>Language name xh</extracomment>
         <translation>koosa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="163"/>
         <source>Bavarian</source>
         <extracomment>Language name bar</extracomment>
         <translation>baieri</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="326"/>
         <source>Lombard</source>
         <extracomment>Language name lmo</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="403"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
         <source>Uma</source>
         <extracomment>Language name ppk
 ----------
@@ -3981,457 +3868,421 @@ Language name ppk</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="448"/>
         <source>Sranan</source>
         <extracomment>Language name srn</extracomment>
         <translation>sranani</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
         <source>Yiddish</source>
         <extracomment>Language name yi</extracomment>
         <translation>jidiši</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
         <source>Zapotec, San Juan Guelavu00eda</source>
         <extracomment>Language name zab</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="507"/>
         <source>Zapotec, Mitla</source>
         <extracomment>Language name zaw</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="509"/>
         <source>Chinese</source>
         <extracomment>Language name zh</extracomment>
         <translation>hiina</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="511"/>
         <source>Zapotec, Amatlu00e1n</source>
         <extracomment>Language name zpo</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
         <source>Zapotec, Zoogocho</source>
         <extracomment>Language name zpq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="515"/>
         <source>Zapotec, Yalu00e1lag</source>
         <extracomment>Language name zpu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
         <source>Zapotec, Chichicapan</source>
         <extracomment>Language name zpv</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
         <source>Zapotec, Southern Rincon</source>
         <extracomment>Language name zsr</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
         <source>Zapotec, Quioquitani-Quieru00ed</source>
         <extracomment>Language name ztq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
         <source>Zapotec, Yatee</source>
         <extracomment>Language name zty</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="525"/>
         <source>Zulu</source>
         <extracomment>Language name zu</extracomment>
         <translation>suulu</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="314"/>
         <source>Footnotes</source>
         <translation>Allmärkused</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="316"/>
         <source>Strong&apos;s numbers</source>
         <translation>Strongi numbrid</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="318"/>
         <source>Headings</source>
         <translation>Pealkirjad</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="320"/>
         <source>Morphological tags</source>
         <translation>Morfoloogilised märgised</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="322"/>
         <source>Lemmas</source>
         <translation>Lemmad</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="324"/>
         <source>Hebrew vowel points</source>
         <translation>Heebrea keele vokaalimärgid</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="326"/>
         <source>Hebrew cantillation marks</source>
         <translation>Heebrea keele laulumärgid</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="328"/>
         <source>Greek accents</source>
         <translation>Kreeka keele rõhumärgid</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="330"/>
         <source>Red letter words</source>
         <translation>Jeesuse sõnad</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="332"/>
         <source>Textual variants</source>
         <translation>Tekstivariandid</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="334"/>
         <source>Scripture cross-references</source>
         <translation>Pühakirjade ristviited</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="336"/>
         <source>Morph segmentation</source>
         <translation>Morfoloogiline segmentatsioon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation>Ekspordi</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
         <source>Local</source>
         <translation>Kohalik</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>Võrgusolev</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Vana Testament</translation>
+        <source>Remote FTP</source>
+        <translation>FTP server</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Viis Moosese raamatut/Pentateuh/Toora</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>Ajalugu</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Prohvetid</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>Uus Testament</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Evangeeliumid</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="32"/>
+        <source>Remote SFTP</source>
+        <translation>SFTP server</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>Kirjad/epistlid</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="33"/>
+        <source>Remote HTTP</source>
+        <translation>HTTP server</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Pauluse kirjad</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="34"/>
+        <source>Remote HTTPS</source>
+        <translation>HTTPS server</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
         <source>HTML files</source>
         <translation>HTML-failid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="438"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>All files</source>
         <translation>Kõik failid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>Text files</source>
         <translation>Tekstifailid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="444"/>
         <source>Save file</source>
         <translation>Salvesta fail</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="130"/>
         <source>Save document ...</source>
         <translation>Salvesta dokument...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
         <source>BibleTime bookmark files</source>
         <translation>BibleTime järjehoidjate failid</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="127"/>
         <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <source>Change description ...</source>
-        <translation type="obsolete">Muuda kirjeldust...</translation>
-    </message>
-    <message>
-        <source>Enter a new description for the chosen bookmark.</source>
-        <translation type="obsolete">Sisestage valitud järjehoidja jaoks uus kirjeldus.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="60"/>
         <source>New folder</source>
         <translation>Uus kaust</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
+        <location filename="../../src/util/tool.cpp" line="48"/>
         <source>The file already exists.</source>
         <translation>Fail juba eksisteerib.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
+        <location filename="../../src/util/tool.cpp" line="49"/>
         <source>Do you want to overwrite it?</source>
         <translation>Kas soovite selle üle kirjutada?</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
+        <location filename="../../src/util/tool.cpp" line="69"/>
+        <location filename="../../src/util/tool.cpp" line="75"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>Faili ei saanud salvestada.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
+        <location filename="../../src/util/tool.cpp" line="78"/>
         <source>Please check permissions etc.</source>
         <translation>Palun kontrollige failiõigusi jms.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
+        <location filename="../../src/util/tool.cpp" line="197"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Hoiatus, see teos sisaldab kultuslikku või küsitavat materjali!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
+        <location filename="../../src/util/tool.cpp" line="218"/>
         <source>Version</source>
         <translation>Versioon</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
+        <location filename="../../src/util/tool.cpp" line="207"/>
         <source>Encrypted - needs unlock key</source>
         <translation>Krüpteeritud - vajab võtit</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
-        <source>Updated version available!</source>
-        <translation>Uuendatud versioon on saadaval!</translation>
+        <location filename="../../src/util/tool.cpp" line="71"/>
+        <source>Error while writing to file.</source>
+        <translation>Viga faili kirjutamisel.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
-        <source>Double click for more information</source>
-        <translation>Lisainformatsiooni jaoks tehke siin topeltklikk</translation>
+        <location filename="../../src/util/tool.cpp" line="72"/>
+        <source>Please check that enough disk space is available.</source>
+        <translation>Palun kontrollige, kas on saadaval piisavalt kettaruumi.</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="77"/>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation>Faili ei õnnestunud salvestamiseks avada.</translation>
     </message>
     <message>
-        <source>Settings Migration</source>
-        <translation type="obsolete">Seadete ületoomine</translation>
+        <location filename="../../src/util/tool.cpp" line="213"/>
+        <source>Updated version available!</source>
+        <translation>Uuendatud versioon on saadaval!</translation>
     </message>
     <message>
-        <source>It appears you have a BibleTime configuration from KDE 3 stored in %1, and you have not migrated it to this version.  Would you like to import it?</source>
-        <translation type="obsolete">Näib, et Teil on kataloogi %1 salvestatud BibleTime konfiguratsioon KDE versioon 3-st, ja Te pole veel uuele versioonile üle läinud. Kas Te soovite selle konfiguratsiooni importida?</translation>
+        <location filename="../../src/util/tool.cpp" line="231"/>
+        <source>Double click for more information</source>
+        <translation>Lisainformatsiooni jaoks tehke siin topeltklikk</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
+        <location filename="../../src/util/tool.cpp" line="226"/>
         <source>Installed version</source>
         <translation>Paigaldatud versioon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="273"/>
         <source>Haitian Creole</source>
         <extracomment>Language name ht</extracomment>
         <translation>haiti kreooli</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
         <source>Kekchu00ed</source>
         <comment>kek</comment>
         <extracomment>Language name kek</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="357"/>
         <source>(Multiple languages)</source>
         <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
         <translation>(Mitmes keeles)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="359"/>
         <source>Mam, Central</source>
         <extracomment>Language name mvc</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
         <source>Mam, Todos Santos Cuchumatu00e1n</source>
         <extracomment>Language name mvj</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="363"/>
         <source>Mixe, Juquila</source>
         <extracomment>Language name mxq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="365"/>
         <source>Mixtec, Jamiltepec</source>
         <extracomment>Language name mxt</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="367"/>
         <source>Burmese</source>
         <extracomment>Language name my</extracomment>
         <translation>birma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="370"/>
         <source>Norwegian Bokmu00e5l</source>
         <extracomment>Language name nb</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="372"/>
         <source>Nahuatl, Michoacu00e1n</source>
         <extracomment>Language name ncl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
         <source>Potawatomi</source>
         <extracomment>Language name pot</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="468"/>
         <source>Klingon</source>
         <extracomment>Language name tlh</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="498"/>
         <source>Mixtec, Diuxi-Tilantongo</source>
         <extracomment>Language name xtd</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
         <source>Yoryba</source>
         <extracomment>Language name yo</extracomment>
         <translation>joruba</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="407"/>
         <source>Verb tense changed</source>
         <translation>Verbi ajavorm muutus</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>Can&apos;t write file</source>
         <translation>Ei saa faili kirjutada</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>The Sword config file can&apos;t be written!</source>
         <translation>Ei saa kirjutada Sword&apos;i konfiguratsioonifaili!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="39"/>
         <source>Export Bookmarks</source>
         <translation>Ekspordi järjehoidjad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="50"/>
         <source>Import bookmarks</source>
         <translation>Impordi järjehoidjad</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
+        <location filename="../../src/util/tool.cpp" line="46"/>
         <source>Overwrite File?</source>
         <translation>Kirjutada fail üle?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="276"/>
         <source>Parsing Strong&apos;s Numbers</source>
         <translation>Strongi numbrite parsimine</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="154"/>
         <source>This shortcut conflicts with the shortcut for the following actions:</source>
         <translation>See kiirklahv on vastuolus järgnevate tegevuste kiirklahvidega:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
         <source>Do you want to clear the conflicting shortcuts and continue?</source>
         <translation>Kas tühistada vastuolulised kiirklahvide seadistused ja jätkata?</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="23"/>
         <source>Indexed works</source>
         <translation>Indekseeritud teosed</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="24"/>
         <source>Unindexed works</source>
         <translation>Indekseerimata teosed</translation>
     </message>
@@ -4461,10 +4312,6 @@ Language name ppk</extracomment>
         <translation>Täpsema info jaoks kasutage --help võtit.</translation>
     </message>
     <message>
-        <source>open a clean session</source>
-        <translation type="obsolete">Ava puhas sessioon</translation>
-    </message>
-    <message>
         <location filename="../../src/main.cpp" line="53"/>
         <source>Open the default Bible with the reference &lt;ref&gt;</source>
         <translation>Ava vaikimisi piibel kohalt &lt;ref&gt;</translation>
@@ -4475,30 +4322,22 @@ Language name ppk</extracomment>
         <translation>Qt raamistiku poolt toetatud käsurea argumentide jaoks vaadake %1.</translation>
     </message>
     <message>
-        <source>All command-line arguments not recognized by BibleTime or Qt will be silently ignored.</source>
-        <translation type="obsolete">Kõiki käsurea argumente, mida BibleTime või Qt raamistik ei tuvasta, ignoreeritakse vaikselt.</translation>
-    </message>
-    <message>
-        <source>Error: %1 expects an argument. See --help for details.</source>
-        <translation type="obsolete">Viga: %1 vajab argumenti. Vaata --help detailide kohta.</translation>
-    </message>
-    <message>
         <location filename="../../src/main.cpp" line="111"/>
         <source>Error: Invalid command-line argument: %1</source>
         <translation>Viga: Vale käsureaargument: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="57"/>
         <source>CSS base template not found!</source>
-        <translation type="unfinished"></translation>
+        <translation>CSS baasmalli ei leitud!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="74"/>
         <source>Default template &quot;%1&quot; not found!</source>
         <translation>Vaikemalli &quot;%1&quot; ei leitud!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="113"/>
         <source>Replace</source>
         <translation>Asenda</translation>
     </message>
@@ -4506,91 +4345,91 @@ Language name ppk</extracomment>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="58"/>
         <source>OK</source>
         <comment>Dialog Button</comment>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="59"/>
         <source>Open</source>
         <comment>Dialog Button</comment>
         <translation>Ava</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="60"/>
         <source>Save</source>
         <comment>Dialog Button</comment>
         <translation>Salvesta</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="61"/>
         <source>Cancel</source>
         <comment>Dialog Button</comment>
         <translation>Tühista</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="62"/>
         <source>Close</source>
         <comment>Dialog Button</comment>
         <translation>Sule</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="63"/>
         <source>Discard</source>
         <comment>Dialog Button</comment>
         <translation>Unusta</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="64"/>
         <source>Apply</source>
         <comment>Dialog Button</comment>
         <translation>Rakenda</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="65"/>
         <source>Reset</source>
         <comment>Dialog Button</comment>
         <translation>Lähtesta</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="66"/>
         <source>Restore defaults</source>
         <comment>Dialog Button</comment>
         <translation>Taasta vaikeväärtused</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="67"/>
         <source>Help</source>
         <comment>Dialog Button</comment>
         <translation>Abi</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="68"/>
         <source>Save All</source>
         <comment>Dialog Button</comment>
         <translation>Salvesta kõik</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="69"/>
         <source>Yes</source>
         <comment>Dialog Button</comment>
         <translation>Jah</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="70"/>
         <source>Yes to all</source>
         <comment>Dialog Button</comment>
         <translation>Jah kõigile</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="71"/>
         <source>No</source>
         <comment>Dialog Button</comment>
         <translation>Ei</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="72"/>
         <source>No to all</source>
         <comment>Dialog Button</comment>
         <translation>Ei kõigile</translation>
@@ -4599,103 +4438,103 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchOptionsArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="97"/>
         <source>Search for:</source>
         <translatorcomment>&quot;Päring:&quot; is estonian for &quot;query&quot;</translatorcomment>
         <translation>Päring:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="104"/>
         <source>&amp;Search</source>
         <translation>&amp;Otsi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="106"/>
         <source>Start to search the text in the chosen works</source>
         <translation>Alusta otsingut valitud teostest</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="109"/>
         <source>Ch&amp;oose...</source>
         <translation>&amp;Vali...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="111"/>
         <source>Choose works for the search</source>
         <translation>Vali teosed, millest otsida</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="114"/>
         <source>S&amp;etup...</source>
         <translation>&amp;Häälestus...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="133"/>
         <source>All of the words (AND is added between the words)</source>
         <translation>Otsib kõiki sisestatud sõnu (justkui oleks täieliku otsingusüntaksi korral sõnade vahel AND)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="137"/>
         <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
         <translation> (kasutab &lt;a href=&apos;syntax_help&apos;&gt;täielikku otsingusüntaksit&lt;/a&gt;)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="148"/>
         <source>Scope:</source>
         <translation>Otsingu skoop:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="169"/>
         <source>The text you want to search for</source>
         <translation>Tekst, mida soovite otsida</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="173"/>
         <source>Works:</source>
         <translation>Teosed:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="346"/>
         <source>No search scope</source>
         <translation>Otsingu skoop on määramata</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="128"/>
         <source>All words</source>
         <translation>Kõik sõnad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="116"/>
         <source>Configure predefined scopes for search</source>
         <translation>Halda otsingu skoope</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="130"/>
         <source>Some words</source>
         <translation>Mõned sõnad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
         <source>Free</source>
         <translation>Vaba</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
         <source>Some of the words (OR is added between the words)</source>
         <translation>Otsib salme, kus esinevad vaid osad sisestatud sõnadest (justkui oleks täieliku otsingusüntaksi korral sõnade vahel OR)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
         <source>Full lucene syntax</source>
         <translation>Täielik Lucene&apos; süntaks</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
         <source>Click the link to get help for search syntax</source>
         <translation>Klikkige siia, et saada abi otsingusüntaksi kasutamiseks</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="159"/>
         <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
         <translation>Valige otsinguskoop (raamatud/peatükid/salmid mille hulgast otsida).&lt;br /&gt;Kehtib piiblite ja kommentaaride puhul.</translation>
     </message>
@@ -4703,17 +4542,17 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchResultArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="85"/>
         <source>Text of the selected search result item</source>
         <translation>Valitud otsingutulemuse elemendi tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="88"/>
         <source>Select all</source>
         <translation>Vali kõik</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="92"/>
         <source>Copy</source>
         <translation>Kopeeri</translation>
     </message>
@@ -4721,242 +4560,242 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchSyntaxHelpDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="47"/>
         <source>Search Syntax Help</source>
         <translation>Lähemalt otsingusüntaksist</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="94"/>
         <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
         <translation>See abitekst on põhiliselt mõeldud aitamaks kasutada täieliku otsingusüntaksit. Otsinguvalikute &quot;Kõik sõnad&quot; ja &quot;Mõned sõnad&quot; korral on kasutatav vaid piiratud süntaks, toetades vaid &lt;a href=&quot;#wildcards&quot;&gt;jokkereid&lt;/a&gt; ja &lt;a href=&quot;#fields&quot;&gt;tekstivälju&lt;/a&gt;. Teiste täieliku otsingusüntaksi konstruktsioonide kasutamine võib nendel juhtudel tagastada imelikke või valesid tulemusi.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
         <source>Which words to find</source>
         <translation>Otsitavad sõnad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="101"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
         <source>Grouping and order</source>
         <translation>Grupeerimine ja järjekord</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="103"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
         <source>Wildcards (partial words)</source>
         <translation>Jokkerid (osaliste sõnade korral)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
         <source>Text fields (different parts of text)</source>
         <translation>Tekstiväljad (teksti eri osad)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="208"/>
         <source>Other syntax features</source>
         <translation>Teisi süntaksi võimalusi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
         <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
         <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
         <translation>Otsinguterminid eraldatakse tühikutega. Terminite vahele võib sisestada märgendeid &lt;strong&gt;AND&lt;/strong&gt; (konjuktsioon, mõlemad terminid), &lt;strong&gt;OR&lt;/strong&gt; (disjunktsioon, üks terminitest) ja &lt;strong&gt;NOT&lt;/strong&gt; (negatsioon - mitte järgnevat terminit). Kui terminite vahel pole AND või OR terminit, eeldatakse automaatselt, et seal on OR. &apos;&lt;strong&gt;+&lt;/strong&gt;sõna&apos; tähendab, et sõna peab tulemuses esinema, &apos;&lt;strong&gt;-&lt;/strong&gt;sõna&apos; tähendab, et sõna ei tohi tulemustes esineda.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="119"/>
         <source>jesus AND god</source>
         <comment>Do not translate &quot;AND&quot;.</comment>
         <translation>jeesus AND jumal</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="121"/>
         <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
         <translation>Otsib salme, kus esinevad nii &apos;Jeesus&apos; kui ka &apos;Jumal&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="123"/>
         <source>jesus OR god</source>
         <comment>Do not translate &quot;OR&quot;.</comment>
         <translation>jeesus OR jumal</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="125"/>
         <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
         <translation>Otsib salme, kus esineb &apos;Jeesus&apos; või &apos;Jumal&apos; või mõlemad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="127"/>
         <source>jesus NOT god</source>
         <comment>Do not translate &quot;NOT&quot;.</comment>
         <translation>jeesus NOT jumal</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="133"/>
         <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
         <translation>Otsib salme, kus esineb &apos;Jeesus&apos; kuid mitte &apos;Jumal&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="131"/>
         <source>+jesus -god</source>
         <translation>+jeesus -jumal</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
         <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
         <translation>Sõnasid saab grupeerida &lt;strong&gt;sulgudega&lt;/strong&gt;. Kindlat järjestust saab defineerida &lt;strong&gt;jutumärkidega&lt;/strong&gt;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
         <source>(a AND b) OR c</source>
         <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
         <translation>(a AND b) OR c</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
         <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
         <translation>Leiab salmid, kus esinevad &quot;a&quot; ja &quot;b&quot;, ja salmid, kus esineb &quot;c&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="145"/>
         <source>&quot;says lord&quot;</source>
         <translation>&quot;ütleb Jumal&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="149"/>
         <source>&quot;says the lord&quot;</source>
         <translation>&quot;ütleb Issand Jumal&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="151"/>
         <source>Finds all verses with &apos;says the LORD&apos;</source>
         <translation>Leiab kõik salmid, kus esineb &quot;ütleb Issand Jumal&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
         <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
         <translation>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; tähistab 0 või enamat suvalist tähemärki, &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; tähistab ühte suvalist tähemärki. Jokkereid ei saa kasutada sõnade alguses.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="160"/>
         <source>a*</source>
         <translation>a*</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="162"/>
         <source>All words beginning with &apos;a&apos;</source>
         <translation>Kõik A-ga algavad sõnad</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="164"/>
         <source>a*a</source>
         <translation>a*a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="166"/>
         <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
         <translation>&quot;aeda&quot;, &quot;taevad&quot; jne.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="168"/>
         <source>a?</source>
         <translation>al?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="170"/>
         <source>&apos;at&apos; and &apos;an&apos;</source>
         <translation>&quot;alt&quot;, &quot;all&quot;, &quot;ala&quot; jne</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="172"/>
         <source>a??a</source>
         <translation>k??la</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="174"/>
         <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
         <translation>&quot;kulla&quot;, &quot;keela&quot; jne.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
         <source>Available text fields:</source>
         <translation>Saadaval olevad tekstiväljad:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="181"/>
         <source>Searches headings</source>
         <translation>Otsib pealkirjadest</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="183"/>
         <source>Searches footnotes</source>
         <translation>Otsib allmärkuste hulgast</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="185"/>
         <source>Searches Strong&apos;s numbers</source>
         <translation>Otsib Strongi numbrite hulgast</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="187"/>
         <source>Searches morphology codes</source>
         <translation>Otsib morfoloogiliste koodide hulgast</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="189"/>
         <source>Examples:</source>
         <translation>Näited:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="191"/>
         <source>heading:Jesus</source>
         <comment>Do not translate &quot;heading:&quot;.</comment>
         <translation>heading:Jeesus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="193"/>
         <source>Finds headings with &apos;Jesus&apos;</source>
         <translation>Leiab pealkirjad, kus esineb nimi &quot;Jeesus&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="195"/>
         <source>footnote:Jesus AND footnote:said</source>
         <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
         <translation>footnote:Jeesus AND footnote:ütles</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
         <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
         <translation>Otsib allmärkusi, kus esineb nii &quot;Jeesus&quot; kui ka &quot;ütles&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
         <source>strong:G846</source>
         <comment>Do not translate &quot;strong:&quot;.</comment>
         <translation>strong:G846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="202"/>
         <source>Finds verses with Strong&apos;s Greek number 846</source>
         <translation>Leiab salmid Strongi kreeka numbriga 846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="204"/>
         <source>morph:&quot;N-NSF&quot;</source>
         <comment>Do not translate &quot;morph:&quot;.</comment>
         <translation>morph:&quot;N-NSF&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="206"/>
         <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
         <translation>Leiab salmid morfoloogilise koodiga &quot;N-NSF&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="210"/>
         <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
         <translation>BibleTime kasutab CLucene otsingumootorit. Lisaks võite lugeda &lt;a href=&quot;%1&quot;&gt;lucene süntaksi koduleheküljelt&lt;/a&gt; (välises veebilehitsejas).</translation>
     </message>
@@ -5002,31 +4841,19 @@ Language name ppk</extracomment>
         <translation>Trüki...</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Kopeeri otsingu tulemus...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="231"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="241"/>
         <source>Copying search result</source>
         <translation>Otsingu tulemuse kopeerimine</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Salvesta otsingu tulemus...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="250"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="259"/>
         <source>Saving search result</source>
         <translation>Otsingu tulemuse salvestamine</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Trüki otsingu tulemus...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="268"/>
         <source>Printing search result</source>
         <translation>Otsingu tulemuse trükkimine</translation>
     </message>
@@ -5074,14 +4901,6 @@ Language name ppk</extracomment>
         <translation>Uus ulatus</translation>
     </message>
     <message>
-        <source>&lt;invalid name of search range&gt;</source>
-        <translation type="obsolete">&lt;Vigane skoobi nimi&gt;</translation>
-    </message>
-    <message>
-        <source>Select a scope from the list to edit the search ranges</source>
-        <translation type="obsolete">Skoobi ulatuse muutmiseks valige listist vastav skoop</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="140"/>
         <source>&amp;Add new scope</source>
         <translation>&amp;Lisa uus skoop</translation>
@@ -5107,10 +4926,6 @@ Language name ppk</extracomment>
         <translation>Muuda valitud otsinguskoobi nimi</translation>
     </message>
     <message>
-        <source>Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="obsolete">Muuda valitud otsinguskoobi ulatusi. Otsingu ulatuste määramiseks palun uurige eeldefineeritud otsinguskoopide ulatusi.</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="158"/>
         <source>The search ranges which will be used for the search, parsed to the canonical form</source>
         <translation>Otsingu ulatused, mida lõpuks otsinguks kasutatakse, esitatuna kanoonilises süntaksis</translation>
@@ -5124,48 +4939,42 @@ Language name ppk</extracomment>
 <context>
     <name>Search::CSearchDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="87"/>
         <source>Search</source>
         <translation>Otsing</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="130"/>
         <source>Missing indices</source>
         <translation>Puuduvad indeksid</translation>
     </message>
     <message>
-        <source>One or more works need indexing before they can be searched.
-This could take a long time. Proceed with indexing?</source>
-        <translation type="obsolete">Üks või enam teost vajab indekseerimist enne kui nende peal saab otsingut teostada.
-See võib võtta kaua aega. Kas jätkata indekseerimisega?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="131"/>
         <source>The following modules need to be indexed before they can be searched in:</source>
         <translation>Järgmised teosed vajavad indekseerimist enne kui nendest saab otsinguid teostada:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="132"/>
         <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
         <translation>Indekseerimine võib võtta kaua aega. Vajutage &quot;Jah&quot; kõikide moodulite indekseerimiseks ja otsingu alustamiseks, või &quot;Ei&quot; otsingu katkestamiseks.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="236"/>
         <source>Drag any verse reference onto an open Bible window</source>
         <translation>Lohistage värsside viiteid avatud piibliaknasse</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="241"/>
         <source>&amp;Analyze results...</source>
         <translation>&amp;Analüüsi tulemusi...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="242"/>
         <source>Show a graphical analysis of the search result</source>
         <translation>Näita graafilist analüüsi otsingutulemuste kohta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="248"/>
         <source>&amp;Close</source>
         <translation>&amp;Sule</translation>
     </message>
@@ -5206,31 +5015,19 @@ See võib võtta kaua aega. Kas jätkata indekseerimisega?</translation>
         <translation>Trüki...</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Trüki otsingu tulemus...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="164"/>
         <source>Printing search result</source>
         <translation>Otsingu tulemuse trükkimine</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Salvesta otsingu tulemus...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="192"/>
         <source>Saving search result</source>
         <translation>Otsingu tulemuse salvestamine</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Kopeeri otsingu tulemus...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="210"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="228"/>
         <source>Copying search result</source>
         <translation>Otsingu tulemuse kopeerimine</translation>
     </message>
@@ -5243,91 +5040,6 @@ See võib võtta kaua aega. Kas jätkata indekseerimisega?</translation>
 <context>
     <name>StandardWorksTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation>Eelistatud teoseid kasutatake kui ei ole määratud konkreetset teost, näiteks kui kasutatakse hüperlinki, mis viitab Piiblisse või mõnda leksikoni.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>Piibel:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>Eelistatud Piiblit kasutatakse siis kui vajutatakse mõnele Piibli kirjakohale viitavale hüperlingile</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>Kommentaarid:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>Eelistatud kommentaare kasutatakse siis kui vajutatakse mõnele kommentaaridele viitavale hüperlingile</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation>Leksikon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>Eelistatud leksikoni kasutatakse siis kui vajutatakse mõnele leksikoni viitavale hüperlingile</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>Igapäevane harduskirjandus:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>Eelistatud igapäevast harduskirjanduse teost kasutatakse sellest lühikeste lõikude kuvamiseks BibleTime käivitamisel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>Heebreakeelne Strongi leksikon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>Eelistatud heebreakeelset leksikoni kasutatakse, kui klikitakse hüperlingil, mis viitab heebreakeelsesse leksikoni</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>Kreekakeelne Strongi leksikon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>Eelistatud kreekakeelset leksikoni kasutatakse, kui klikitakse hüperlingil, mis viitab kreekakeelsesse leksikoni</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>Heebreakeelne morfoloogiline leksikon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>Eelistatud heebreakeelset morfoloogilist leksikoni kasutatakse, kui klikitakse morfoloogilise märgendi hüperlingil heebreakeelses tekstis</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation>Kreekakeelne morfoloogiline leksikon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>Eelistatud kreekakeelset morfoloogilist leksikoni kasutatakse, kui klikitakse morfoloogilise märgendi hüperlingil kreekakeelses tekstis</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="62"/>
         <source></source>
         <translation></translation>
@@ -5336,112 +5048,97 @@ See võib võtta kaua aega. Kas jätkata indekseerimisega?</translation>
 <context>
     <name>TextFiltersTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation>Alusta iga salmi uuelt realt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation>Kuva salmide numbreid</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation>Kuva tekstiosade pealkirju</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation>Kuva pühakirjade ristviiteid</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation>Kuva kreeka keele rõhumärke</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation>Kuva heebrea keele vokaalimärke</translation>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
+        <source></source>
+        <translation></translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallProgress</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation>Kuva heebrea keele laulumärke</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="81"/>
+        <source>Failed</source>
+        <translation>Ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation>Kuva morfoloogilist segmentatsiooni</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="84"/>
+        <source>Completed</source>
+        <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation>Kasuta tekstivariante</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="90"/>
+        <source>Cancelled</source>
+        <translation>Katkestatud</translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallSources</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation>Filtrid reguleerivad teksti välimust. Siin võite Te seadistada vaikimisi sätteid kõikidele filtritele. Te saate filtrite sätteid ka igas aknas eraldi muuta.</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installsources.cpp" line="63"/>
+        <source>Failed to refresh source %1</source>
+        <translation>Allika %1 värskendamine ebaõnnestus</translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source></source>
-        <translation></translation>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="59"/>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="62"/>
+        <source>The text you want to search for</source>
+        <translation>Tekst, mida soovite otsida</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation>Otsi teksti</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="135"/>
+        <source>New Window</source>
+        <translation>Uus aken</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation>Tekst, mida soovite otsida</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="136"/>
+        <source>View Window</source>
+        <translation type="unfinished">Kuva aken</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation>Otsi tõstutundlikult</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="137"/>
+        <source>Text Font Size</source>
+        <translation>Teksti kirja suurus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation>&amp;Tõstutundlik otsing</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="138"/>
+        <source>User Interface Font Size</source>
+        <translation>Kasutajaliidese kirja suurus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation>Leia teksti eelmine esinemine</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="141"/>
+        <source>Bookshelf Manager</source>
+        <translation>Raamaturiiuli haldamine</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation>&amp;Eelmine</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="187"/>
+        <source>Single</source>
+        <translation type="unfinished">Ãœksik</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation>Leia teksti järgmine esinemine</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="188"/>
+        <source>Tabbed</source>
+        <translation>Sakkidesse</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation>&amp;Järgmine</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="189"/>
+        <source>Auto-tile</source>
+        <translation>Automaatne asutus ruudustikku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation>Sule dialoog</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="190"/>
+        <source>Auto-tile horizontally</source>
+        <translation>Automaatne horisontaalasetus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Sule</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="191"/>
+        <source>Auto-tile vertically</source>
+        <translation>Automaatne vertikaalasetus</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/messages/bibletime_ui_fi.ts b/i18n/messages/bibletime_ui_fi.ts
index 9c29bb1..12dd91b 100644
--- a/i18n/messages/bibletime_ui_fi.ts
+++ b/i18n/messages/bibletime_ui_fi.ts
@@ -6,7 +6,7 @@
     <message>
         <source></source>
         <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
 This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
@@ -22,452 +22,457 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTime</name>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
+        <location filename="../../src/bibletime_init.cpp" line="741"/>
         <source>&amp;File</source>
         <translation>&amp;Tiedosto</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&amp;View</source>
         <translation>&amp;Näkymä</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&amp;Search</source>
         <translation>&amp;Etsi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&amp;Window</source>
         <translation>&amp;Ikkuna</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&amp;ttings</source>
         <translation>&amp;Asetukset</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&amp;Help</source>
         <translation>&amp;Ohje</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&amp;Show toolbar</source>
         <translation>&amp;Näytä työkalupalkki</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&amp;Fullscreen mode</source>
         <translation>Täysnäytt&amp;ötila</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&amp;Quit</source>
         <translation>&amp;Lopeta</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
+        <location filename="../../src/bibletime_init.cpp" line="251"/>
         <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
         <translation>Avaa Raamatuntutkimisopas, joka tulee BibleTime-ohjelman kanssa.&lt;BR/&gt;Opas on johdatus tehokkaaseen raamatuntutkimiseen.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
+        <location filename="../../src/bibletime_init.cpp" line="256"/>
         <source>Information about the BibleTime program</source>
         <translation>Tietoja BibleTime-ohjelmistosta</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation type="unfinished">Tallenna i&amp;stunto</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>&amp;Lataa istunto</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&amp;Delete session</source>
         <translation>&amp;Poista istunto</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&amp;Arrangement mode</source>
         <translation>&amp;Sijoittelutila</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&amp;Manual mode</source>
         <translation>&amp;Manuaalinen</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &amp;vertically</source>
         <translation>Pinoa automaattisesti &amp;vierekkäin</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &amp;horizontally</source>
         <translation>Pinoa automaattisesti &amp;päällekkäin</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&amp;cascade</source>
         <translation>Lomit&amp;a automaattisesti</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&amp;Cascade</source>
         <translation>Lomit&amp;a</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &amp;vertically</source>
         <translation>Pinoa &amp;vierekkäin</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &amp;horizontally</source>
         <translation>Pinoa &amp;päällekkäin</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&amp;ose all windows</source>
         <translation>Sulje &amp;kaikki ikkunat</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
+        <location filename="../../src/bibletime_init.cpp" line="224"/>
         <source>Close all open windows inside BibleTime</source>
         <translation>Sulje kaikki avoimet ikkunat BibleTimen sisällä</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
+        <location filename="../../src/bibletime_init.cpp" line="241"/>
         <source>&amp;Handbook</source>
         <translation>Käsikir&amp;ja</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&amp;Bible Study Howto</source>
         <translation>&amp;Raamatuntutkimisopas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
+        <location filename="../../src/bibletime_slots.cpp" line="533"/>
         <source>Please enter a name for the new session.</source>
         <translation>Anna nimi uudelle istunnolle.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
+        <location filename="../../src/bibletime_slots.cpp" line="541"/>
+        <source>Session already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_slots.cpp" line="542"/>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="107"/>
         <source>Quit BibleTime</source>
         <translation>Poistu BibleTime -ohjelmasta</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
+        <location filename="../../src/bibletime_init.cpp" line="114"/>
         <source>Toggle fullscreen mode of the main window</source>
         <translation>Vaihda pääikkuna koko ruudun kokoiseksi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
+        <location filename="../../src/bibletime_init.cpp" line="123"/>
         <source>Search in &amp;open works...</source>
         <translation>Etsi av&amp;oimesta teoksesta...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &amp;Bible...</source>
         <translation>Etsi oletus&amp;raamatusta...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &amp;new session...</source>
         <translation>Talleta uudeksi istu&amp;nnoksi...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
+        <location filename="../../src/bibletime_init.cpp" line="140"/>
         <source>Create and save a new session</source>
         <translation>Luo ja talleta uusi istunto</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
+        <location filename="../../src/bibletime_init.cpp" line="147"/>
         <source>Manually arrange the open windows</source>
         <translation>Järjestä avoimet ikkunat käsin</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
+        <location filename="../../src/bibletime_init.cpp" line="154"/>
         <source>Automatically tile the open windows vertically (arrange side by side)</source>
         <translation>Järjestä avoimet ikkunat automaattisesti vaakasuoraan järjestykseen</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
+        <location filename="../../src/bibletime_init.cpp" line="161"/>
         <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
         <translation>Järjestä avoimet ikkunat automaattisesti pystysuoraan järjestykseen</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
+        <location filename="../../src/bibletime_init.cpp" line="165"/>
         <source>Auto-&amp;tile</source>
         <translation>Järjestä &amp;ruudukkoon</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
+        <location filename="../../src/bibletime_init.cpp" line="168"/>
         <source>Automatically tile the open windows</source>
         <translation>Järjestä ikkunat automaattisesti ruudukkoon</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
+        <location filename="../../src/bibletime_init.cpp" line="172"/>
         <source>Ta&amp;bbed</source>
         <translation>V&amp;älilehdet</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
+        <location filename="../../src/bibletime_init.cpp" line="175"/>
         <source>Automatically tab the open windows</source>
         <translation>Aseta ikkunat automaattisesti välilehdiksi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
+        <location filename="../../src/bibletime_init.cpp" line="182"/>
         <source>Automatically cascade the open windows</source>
         <translation>Lomita automaattisesti avoimet ikkunat</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
+        <location filename="../../src/bibletime_init.cpp" line="189"/>
         <source>Cascade the open windows</source>
         <translation>Lomita avoin ikkuna</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
+        <location filename="../../src/bibletime_init.cpp" line="193"/>
         <source>&amp;Tile</source>
         <translation>Järjestä &amp;ruudukkoon</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
+        <location filename="../../src/bibletime_init.cpp" line="196"/>
         <source>Tile the open windows</source>
         <translation>Järjestä avoimet ikkunat ruudukkoon</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
+        <location filename="../../src/bibletime_init.cpp" line="203"/>
         <source>Vertically tile (arrange side by side) the open windows</source>
         <translation>Järjestä avoin ikkuna pystysuoraan</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
+        <location filename="../../src/bibletime_init.cpp" line="210"/>
         <source>Horizontally tile (arrange on top of each other) the open windows</source>
         <translation>Järjestä avoin ikkuna vaakasuoraan</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
+        <location filename="../../src/bibletime_init.cpp" line="228"/>
         <source>&amp;Configure BibleTime...</source>
         <translation>BibleTimen &amp;asetukset...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime&apos;s preferences</source>
         <translation>Aseta Bibletimen asetukset</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
+        <location filename="../../src/bibletime_init.cpp" line="234"/>
         <source>Bookshelf &amp;Manager...</source>
         <translation>Kirjahyllyn &amp;hallinta...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
+        <location filename="../../src/bibletime_init.cpp" line="237"/>
         <source>Configure your bookshelf and install/update/remove/index works</source>
         <translation>Määrittele kirjahyllyn asetukset ja asenna/päivitä/poista/indeksoi teoksia</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
+        <location filename="../../src/bibletime_init.cpp" line="244"/>
         <source>Open BibleTime&apos;s handbook</source>
         <translation>Avaa BibleTimen käsikirja</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&amp;Tip of the day...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
+        <location filename="../../src/bibletime_init.cpp" line="263"/>
         <source>Show tips about BibleTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
+        <location filename="../../src/bibletime_init.cpp" line="402"/>
         <source>Toggle visibility of the bookshelf window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
+        <location filename="../../src/bibletime_init.cpp" line="406"/>
         <source>Toggle visibility of the bookmarks window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
+        <location filename="../../src/bibletime_init.cpp" line="410"/>
         <source>Toggle visibility of the mag window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
+        <location filename="../../src/bibletime_init.cpp" line="735"/>
         <source>Main toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
+        <location filename="../../src/bibletime_init.cpp" line="736"/>
         <source>Navigation toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
+        <location filename="../../src/bibletime_init.cpp" line="737"/>
         <source>Works toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
+        <location filename="../../src/bibletime_init.cpp" line="738"/>
         <source>Tools toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
+        <location filename="../../src/bibletime_init.cpp" line="739"/>
         <source>Format toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
+        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <source>Sw&amp;itch session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="777"/>
         <source>Show main toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
+        <location filename="../../src/bibletime_init.cpp" line="780"/>
         <source>Show navigation bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
+        <location filename="../../src/bibletime_init.cpp" line="783"/>
         <source>Show works toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
+        <location filename="../../src/bibletime_init.cpp" line="786"/>
         <source>Show tools toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
+        <location filename="../../src/bibletime_init.cpp" line="789"/>
         <source>Show formatting toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
+        <location filename="../../src/bibletime_init.cpp" line="792"/>
         <source>Show bookshelf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
+        <location filename="../../src/bibletime_init.cpp" line="795"/>
         <source>Show bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
+        <location filename="../../src/bibletime_init.cpp" line="798"/>
         <source>Show mag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
+        <location filename="../../src/bibletime_init.cpp" line="743"/>
         <source>Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <location filename="../../src/bibletime_init.cpp" line="774"/>
         <source>Show toolbars in text windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
+        <location filename="../../src/bibletime_init.cpp" line="801"/>
         <source>Show parallel text headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
+        <location filename="../../src/bibletime_init.cpp" line="747"/>
         <source>O&amp;pen windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show &quot;Whats this widget&quot; dialog</source>
         <translation>Näytä &quot;Mikä tämä käyttöliittymäelementti on&quot;-dialogi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
+        <location filename="../../src/bibletime_init.cpp" line="954"/>
         <source>Whats this widget?</source>
         <translation>Mikä tämä käyttöliittymäelementti on?</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
+        <location filename="../../src/bibletime_init.cpp" line="126"/>
         <source>Search in all works that are currently open</source>
         <translation>Etsi kaikista nyt auki olevista teoksista</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
+        <location filename="../../src/bibletime_init.cpp" line="133"/>
         <source>Search in the standard Bible</source>
         <translation>Hae oletusraamatusta</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
+        <location filename="../../src/bibletime_slots.cpp" line="532"/>
         <source>New Session</source>
         <translation>Uusi istunto</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
+        <location filename="../../src/bibletime.cpp" line="77"/>
         <source>Initializing the SWORD engine...</source>
         <translation>Alustetaan SWORD...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
+        <location filename="../../src/bibletime.cpp" line="85"/>
         <source>Creating BibleTime&apos;s user interface...</source>
         <translation>Luodaan BibleTimen käyttöliittymä...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
+        <location filename="../../src/bibletime.cpp" line="92"/>
         <source>Initializing menu- and toolbars...</source>
         <translation>Alustetaan valikot ja työkalupalkit...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Unlock Work</source>
         <translation>Poista teoksen lukitus</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Enter the unlock key for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
+        <location filename="../../src/bibletime.cpp" line="214"/>
         <source>Warning: Invalid unlock key!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
+        <location filename="../../src/bibletime.cpp" line="215"/>
         <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
+        <location filename="../../src/bibletime_init.cpp" line="255"/>
         <source>&amp;About BibleTime</source>
         <translation>&amp;Tietoja BibleTimesta</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
+        <location filename="../../src/bibletime_init.cpp" line="733"/>
         <source>Bookmarks</source>
         <translation>Kirjanmerkit</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
+        <location filename="../../src/bibletime_init.cpp" line="734"/>
         <source>Mag</source>
         <translation>Suurennuslasi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
+        <location filename="../../src/bibletime_init.cpp" line="214"/>
         <source>Close &amp;window</source>
         <translation>Sulje &amp;ikkuna</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
+        <location filename="../../src/bibletime_init.cpp" line="217"/>
         <source>Close the current open window</source>
         <translation>Sulje nykyinen avoin ikkuna</translation>
     </message>
@@ -475,7 +480,8 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTimeApp</name>
     <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
+        <location filename="../../src/bibletimeapp.cpp" line="59"/>
+        <location filename="../../src/mobile/bibletimeapp.cpp" line="63"/>
         <source>Fatal error!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -483,7 +489,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtAboutDialog</name>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
         <source>BibleTime is an easy to use but powerful Bible study tool.</source>
         <translation>BibleTime on helppokäyttöinen ja tehokas Raamatun opiskelun työkalu.</translation>
     </message>
@@ -498,52 +504,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Täydellinen, laillisesti sitova lisenssi on alla.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="109"/>
         <source>About BibleTime</source>
         <translation>Tietoja BibleTimesta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="121"/>
         <source>&amp;BibleTime</source>
         <translation>&amp;BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="126"/>
         <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
         <translation>Etsimme kehittäjiä ja kääntäjiä. Jos haluat liittyä tiimiimme, lähetä sähköpostia osoitteeseen %1.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation>(c)1999-2013, BibleTime-tiimi</translation>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="130"/>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished">(c)1999-2014, BibleTime-tiimi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="137"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Tekijät</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="148"/>
         <source>The following people contributed to BibleTime:</source>
         <translation>Seuraavat henkilöt ovat osallistuneet BibleTimen tekemiseen:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="150"/>
         <source>documentation and translation manager</source>
         <translation>ohjeiden ja käännösten hallinta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="172"/>
         <source>project manager</source>
         <translation>projektinhallinta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>tester</source>
         <translation>testaus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>usability expert</source>
         <translation>käytettävyysasiantuntija</translation>
     </message>
@@ -583,52 +589,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>&amp;Lisenssi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
         <source>designer</source>
         <translation>suunnittelija</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="139"/>
         <source>developer</source>
         <translation>kehittäjä</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
         <source>project founder</source>
         <translation>projektin perustaja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="157"/>
         <source>packager</source>
         <translation>paketoija</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="158"/>
         <source>creator of The Sword Project</source>
         <translation>SWORD-projektin luoja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
         <source>domain sponsor</source>
         <translation>internetosoitteen sponsori</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
         <source>howto</source>
         <translation>raamatunlukuopas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="141"/>
         <source>artist</source>
         <translation>taiteilija</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="173"/>
         <source>documentation</source>
         <translation>ohjeet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="188"/>
         <source>The following people translated BibleTime into their language:</source>
         <translation>Seuraavat henkilöt ovat kääntäneet BibleTimen omalle kielelleen:</translation>
     </message>
@@ -656,37 +662,37 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBibleKeyWidget</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="110"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation type="unfinished">Selaa luetteloa. Paina painiketta ja siirrä hiirellä kohdetta ylöspäin tai alaspäin.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
         <source>Next book</source>
         <translation type="unfinished">Seuraava kirja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
         <source>Previous book</source>
         <translation type="unfinished">Edellinen kirja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="117"/>
         <source>Next chapter</source>
         <translation type="unfinished">Seuraava luku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
         <source>Previous chapter</source>
         <translation type="unfinished">Edellinen luku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="122"/>
         <source>Next verse</source>
         <translation type="unfinished">Seuraava jae</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
         <source>Previous verse</source>
         <translation type="unfinished">Edellinen jae</translation>
     </message>
@@ -765,27 +771,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfGroupingMenu</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
         <source>Category/Language</source>
         <translation type="unfinished">Kategoria/Kieli</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
         <source>Category</source>
         <translation type="unfinished">Kategoria</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
         <source>Language/Category</source>
         <translation type="unfinished">Kieli/Kategoria</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="105"/>
         <source>Language</source>
         <translation type="unfinished">Kieli</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="108"/>
         <source>No grouping</source>
         <translation type="unfinished">Ei ryhmittelyä</translation>
     </message>
@@ -793,7 +799,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfModel</name>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
+        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="78"/>
         <source>Module</source>
         <translation>Teos</translation>
     </message>
@@ -801,123 +807,160 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfWidget</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="157"/>
         <source>Fi&amp;lter:</source>
         <translation>&amp;Suodata:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="158"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
         <source>Grouping</source>
         <translation>Ryhmitä</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="159"/>
         <source>Change the grouping of items in the bookshelf.</source>
         <translation>Muuta teosten ryhmittelyä.</translation>
     </message>
     <message>
-        <source>Use grouping from bookshelf dock</source>
-        <translation type="obsolete">Käytä Kirjahylly-ikkunan ryhmittelyä</translation>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
+        <source>Show/hide works</source>
+        <translation>Piilota/näytä teoksia</translation>
     </message>
+</context>
+<context>
+    <name>BtChapterDropdownChooserButton</name>
     <message>
-        <source>Category/Language</source>
-        <translation type="obsolete">Kategoria/Kieli</translation>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
+        <source>Select chapter</source>
+        <translation>Valitse luku</translation>
     </message>
+</context>
+<context>
+    <name>BtConfig</name>
     <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategoria</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="46"/>
+        <source>Old testament</source>
+        <translation type="unfinished">Vanha testamentti</translation>
     </message>
     <message>
-        <source>Language/Category</source>
-        <translation type="obsolete">Kieli/Kategoria</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="47"/>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation type="unfinished">Mooses/Pentateukki/Toora</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation type="obsolete">Kieli</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="48"/>
+        <source>History</source>
+        <translation type="unfinished">Historia</translation>
     </message>
     <message>
-        <source>No grouping</source>
-        <translation type="obsolete">Ei ryhmittelyä</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="49"/>
+        <source>Prophets</source>
+        <translation type="unfinished">Profeetat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
-        <source>Show/hide works</source>
-        <translation>Piilota/näytä teoksia</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="50"/>
+        <source>New testament</source>
+        <translation type="unfinished">Uusi testamentti</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="51"/>
+        <source>Gospels</source>
+        <translation type="unfinished">Evankeliumit</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="52"/>
+        <source>Letters/Epistles</source>
+        <translation type="unfinished">Kirjeet/Epistolat</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="53"/>
+        <source>Paul&apos;s Epistles</source>
+        <translation type="unfinished">Paavalin kirjeet</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="89"/>
+        <source>Error loading configuration!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="90"/>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>BtChapterDropdownChooserButton</name>
+    <name>BtConfigCore</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
-        <source>Select chapter</source>
-        <translation>Valitse luku</translation>
+        <location filename="../../src/backend/config/btconfigcore.cpp" line="62"/>
+        <source>Default Session</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BtDisplaySettingsButton</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="103"/>
         <source>Use linebreaks after each verse</source>
         <translation>Käytä rivinvaihtoja jakeiden perässä</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
         <source>Show verse numbers</source>
         <translation>Näytä jaenumerot</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
         <source>Show headings</source>
         <translation>Näytä otsikot</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
         <source>Highlight words of Jesus</source>
         <translation>Korosta Jeesuksen sanat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
         <source>Show Hebrew vowel points</source>
         <translation>Näytä heprean vokaalipisteet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
         <source>Show Hebrew cantillation marks</source>
         <translation>Näytä heprean kantillaatiomerkit</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
         <source>Show Greek accents</source>
         <translation>Näytä kreikan korkomerkit</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
         <source>Use alternative textual variant</source>
         <translation>Käytä vaihtoehtoisia tekstivariantteja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
         <source>Show scripture cross-references</source>
         <translation>Näytä kirjoitusten ristiviitteet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
         <source>Show footnotes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
         <source>Show morph segmentation</source>
         <translation>Näytä morfologinen segmentointi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="120"/>
         <source>Display settings</source>
         <translation>Näyttöasetukset</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="123"/>
         <source>Display settings: No options available</source>
         <translation>Näyttöasetukset: Ei määrityksiä saatavilla</translation>
     </message>
@@ -925,27 +968,45 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtEditBookmarkDialog</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="71"/>
         <source>Edit Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>BtFindWidget</name>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="28"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="29"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="74"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtFontChooserWidget</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
@@ -966,31 +1027,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <source>You can specify a custom font for each language.</source>
-        <translation type="obsolete">Voit määritellä oman kirjasimen jokaiselle kielelle.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="151"/>
         <source>&amp;Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
         <source>The font selection below will apply to all texts in this language</source>
         <translation>Allaoleva kirjasinvalinta tulee voimaan kaikille tämän kielen teksteille</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
         <source>Use custom font</source>
         <translation>Käytä omaa kirjasinta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
         <source>Optionally specify a custom font for each language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="150"/>
         <source>Fonts</source>
         <translation>Kirjasimet</translation>
     </message>
@@ -998,75 +1055,67 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtIndexPage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="107"/>
         <source>%1 KiB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="114"/>
         <source>0 KiB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="124"/>
         <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
         <translation>Poista BibleTimen käynnistyksessä indeksit, joille ei ole vastaavaa teosta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
         <source>Automatically delete orphaned indexes when BibleTime starts</source>
         <translation>Poista automaattisesti orvot indeksit BibleTimen käynnistyksessä</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="127"/>
         <source>Delete the selected indexes</source>
         <translation>Poista valitut indeksit</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
         <source>Delete</source>
         <translation>Poista</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="130"/>
         <source>Create new indexes for the selected works</source>
         <translation>Luo uudet indeksit valituille teoksille</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Work</source>
         <translation>Teos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Index size</source>
         <translation>Hakemiston koko</translation>
     </message>
     <message>
-        <source>Create new search indexes and delete created indexes for the installed works.</source>
-        <translation type="obsolete">Luo uudet hakuindeksit asennetuille teoksille ja poista jo luodut indeksit.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="122"/>
         <source>Search Indexes</source>
         <translation>Hakuindeksit</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="91"/>
         <source>Indexed Works</source>
         <translation>Indeksoidut teokset</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="96"/>
         <source>Unindexed Works</source>
         <translation>Indeksoimattomat teokset</translation>
     </message>
     <message>
-        <source>KiB</source>
-        <translation type="obsolete">KiB</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
         <source>Create...</source>
         <translation>Luo...</translation>
     </message>
@@ -1092,17 +1141,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallModuleChooserDialogModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="88"/>
         <source>Work</source>
         <translation>Teos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="89"/>
         <source>Installation source</source>
         <translation>Asennuslähde</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="90"/>
         <source>Version</source>
         <translation type="unfinished">Versio</translation>
     </message>
@@ -1115,14 +1164,6 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Asenna/Päivitä</translation>
     </message>
     <message>
-        <source>Install and update works. Add remote or local sources, refresh them, select the works to be installed/updated and click Install.&lt;br/&gt;&lt;b&gt;WARNING:&lt;/b&gt; If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="obsolete">Asenna ja päivitä teoksia. Lisää paikallisia tai verkkolähteitä, virkistä ne, valitse asennettavat/päivitettävät teokset ja napsauta Asenna.&lt;br/&gt;&lt;b&gt;VAROITUS:&lt;/b&gt; Jos asut maassa, jossa kristinuskoa vainotaan ja et halua riskeerata kiinnijoutumista, älä käytä verkkolähteitä.</translation>
-    </message>
-    <message>
-        <source>Install folder:</source>
-        <translation type="obsolete">Asennuskansio:</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="265"/>
         <source>WARNING!!!</source>
         <translation type="unfinished"></translation>
@@ -1203,20 +1244,16 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation type="unfinished">Kohdekansioon ei ole kirjoitusoikeuksia tai sitä ei ole. Asennus epäonnistuu, kunnes tämä tilanne on korjattu.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="388"/>
         <source>Delete Source?</source>
         <translation type="unfinished">Poista lähde?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="389"/>
         <source>Do you really want to delete this source?</source>
         <translation type="unfinished">Haluatko todella poistaa tämän lähteen?</translation>
     </message>
     <message>
-        <source>Install...</source>
-        <translation type="obsolete">Asenna...</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="281"/>
         <source>Install or update selected works</source>
         <translation>Asenna tai päivitä valitut teokset</translation>
@@ -1225,17 +1262,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPageModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="75"/>
         <source>Work</source>
         <translation type="unfinished">Teos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="76"/>
         <source>Version</source>
         <translation type="unfinished">Versio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="77"/>
         <source>Description</source>
         <translation type="unfinished">Kuvaus</translation>
     </message>
@@ -1251,99 +1288,99 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPathDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="35"/>
         <source>Bookshelf Folders</source>
         <translation>Kirjahyllyn kansiot</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
         <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
         <translation>Teoksia voi asentaa yhteen tai useampaan kansioon. Kun olet luonut kansiot tähän, voit valita yhden niistä asennussivulla.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="45"/>
         <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
         <translation>BibleTime ja SWORD-kirjasto löytävät teokset kaikista näistä kansioista. Jos kansio poistetaan tästä, se ja kaikki siinä olevat teokset jäävät tiedostojärjestelmään.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="48"/>
         <source>Configure bookshelf folders</source>
         <translation>Aseta kirjahyllyn kansiot</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="53"/>
         <source>Configuration file for the folders is: </source>
         <translation>Kansioiden asetustiedosto on:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="61"/>
         <source>Folders where new works can be installed</source>
         <translation>Kansiot, joihin uudet teokset voidaan asentaa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
         <source>Read-only folders</source>
         <translation>Kansiot, joista voidaan vain lukea</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="66"/>
         <source>Nonexistent folders</source>
         <translation>Ei olemassaolevat kansiot</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="80"/>
         <source>&amp;Add...</source>
         <translation>Lisää...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="81"/>
         <source>Add new folder</source>
         <translation>Lisää uusi kansio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="86"/>
         <source>&amp;Edit...</source>
         <translation>Muokkaa...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="87"/>
         <source>Edit the selected folder</source>
         <translation>Muokkaa valittua kansiota</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="92"/>
         <source>&amp;Remove</source>
         <translation>Poista</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="93"/>
         <source>Remove the selected folder</source>
         <translation>Poista valittu kansio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="167"/>
         <source>This default folder in your home directory can&apos;t be removed</source>
         <translation>Tätä kotihakemistossasi sijaitsevaa oletuskansiota ei voi poistaa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="194"/>
         <source>Choose Folder</source>
         <translation>Valitse kansio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>Use Folder?</source>
         <translation>Käytä kansiota?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
         <translation>Sinulla ei ole oikeuksia kirjoittaa tähän kansioon. Teoksia ei siis voi asentaa tänne BibleTimella. Haluatko käyttää tätä kansiota alkuperäisen sijasta?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
         <translation>Sinulla ei ole oikeuksia kirjoittaa tähän kansioon. Teoksia ei siis voi asentaa tänne BibleTimella. Haluatko yhä lisätä sen kirjahyllyn kansioiden luetteloon?</translation>
     </message>
@@ -1351,52 +1388,42 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallProgressDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Work</source>
         <translation>Teos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Progress</source>
         <translation>Edistyminen</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>Pysäytä</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="60"/>
         <source>Stop All</source>
         <translation>Pysäytä kaikki</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Completed</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>Keskeytetty</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="55"/>
         <source>Waiting for turn...</source>
         <translation>Odotetaan vuoroa...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="113"/>
         <source>Preparing install...</source>
         <translation>Valmistellaan asennusta...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="37"/>
         <source>Install Progress</source>
         <translation>Asennuksen edistyminen</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Failed</source>
         <translation>Epäonnistui</translation>
     </message>
@@ -1404,21 +1431,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <source>Select the language in which the Biblical book names are displayed.</source>
-        <translation type="obsolete">Valitse kieli, jolla Raamatun kirjojen nimet näytetään.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
         <source>Language for names of Bible books:</source>
         <translation>Raamatun kirjojen nimien kieli:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation>Kielet, joita voidaan käyttää Raamatun kirjojen nimissä</translation>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="136"/>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="133"/>
         <source>Languages</source>
         <translation>Kielet</translation>
     </message>
@@ -1468,7 +1491,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtModuleManagerDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="57"/>
         <source>Bookshelf Manager</source>
         <translation>Kirjahyllyn hallinta</translation>
     </message>
@@ -1476,7 +1499,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkAction</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="103"/>
         <source>&amp;Open work</source>
         <translation>&amp;Avaa teos</translation>
     </message>
@@ -1484,12 +1507,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkActionMenu</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="42"/>
         <source>&amp;Grouping order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="43"/>
         <source>Sets the grouping order for the items in this menu.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1525,59 +1548,47 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtRemovePage</name>
     <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">Poista</translation>
-    </message>
-    <message>
-        <source>Remove installed works. Select the works and click Remove button.</source>
-        <translation type="obsolete">Poista asennettuja teoksia. Valitse teokset ja napsauta Poista-painiketta.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="100"/>
         <source>Select &amp;works to uninstall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&amp;Remove...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="98"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="111"/>
         <source>Start removal of %1 works:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="114"/>
         <source>Start removal:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="145"/>
         <source>You selected the following work(s): </source>
         <translation>Valitsit seuraavat teokset: </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="149"/>
         <source>Do you really want to remove them from your system?</source>
         <translation>Haluatko todella poistaa ne järjestelmästäsi?</translation>
     </message>
     <message>
-        <source>Remove...</source>
-        <translation type="obsolete">Poista...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
         <source>Remove the selected works</source>
         <translation>Poista valitut teokset</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="151"/>
         <source>Remove Works?</source>
         <translation>Poista teokset?</translation>
     </message>
@@ -1598,12 +1609,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtSearchModuleChooserDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="47"/>
         <source>Works to Search in</source>
         <translation>Teokset, joista haetaan</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="49"/>
         <source>Select the works which should be searched.</source>
         <translation>Valitse teokset, joista tulee hakea.</translation>
     </message>
@@ -1687,176 +1698,165 @@ pikanäppäin</translation>
     </message>
 </context>
 <context>
-    <name>BtSourceArea</name>
+    <name>BtStandardWorksTab</name>
     <message>
-        <source>Work</source>
-        <translation type="obsolete">Teos</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="obsolete">Kuvaus</translation>
-    </message>
-    <message>
-        <source>&amp;Add...</source>
-        <translation type="obsolete">Lisää...</translation>
-    </message>
-    <message>
-        <source>Refresh...</source>
-        <translation type="obsolete">Päivitä...</translation>
-    </message>
-    <message>
-        <source>Refresh the list of works from this source</source>
-        <translation type="obsolete">Päivitä tämän lähteen teosluettelo</translation>
-    </message>
-    <message>
-        <source>&amp;Delete...</source>
-        <translation type="obsolete">Poista...</translation>
-    </message>
-    <message>
-        <source>Delete this source</source>
-        <translation type="obsolete">Poista tämä lähde</translation>
-    </message>
-    <message>
-        <source>Add new source</source>
-        <translation type="obsolete">Lisää uusi lähde</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="169"/>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>BtSourceAreaModel</name>
     <message>
-        <source>Work</source>
-        <translation type="obsolete">Teos</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
+        <translation type="unfinished">Raamattu:</translation>
     </message>
     <message>
-        <source>Version</source>
-        <translation type="obsolete">Versio</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="174"/>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation type="unfinished">Oletusraamattua käytetään kun hyperlinkki Raamattuun valitaan</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Kuvaus</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</source>
+        <translation type="unfinished">Kommentaari:</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceWidget</name>
     <message>
-        <source>Delete Source?</source>
-        <translation type="obsolete">Poista lähde?</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="178"/>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation type="unfinished">Oletuskommentaaria käytetään kun hyperlinkki kommentaariin valitaan</translation>
     </message>
     <message>
-        <source>Do you really want to delete this source?</source>
-        <translation type="obsolete">Haluatko todella poistaa tämän lähteen?</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
+        <translation type="unfinished">Sanakirja:</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Peruuta</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="182"/>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation type="unfinished">Oletussanakirjaa käytetään kun hyperlinkki sanakirjaan valitaan</translation>
     </message>
     <message>
-        <source>Refreshing source</source>
-        <translation type="obsolete">Virkistetään lähde</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</source>
+        <translation type="unfinished">Päivittäinen hartaus:</translation>
     </message>
     <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Yhdistetään...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="186"/>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation type="unfinished">Oletushartauskirjasta näytetään päivittäinen Raamatun jae käynnistettäessä</translation>
     </message>
     <message>
-        <source>Refreshing...</source>
-        <translation type="obsolete">Virkistetään...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation type="unfinished">Hepreankielinen Strongin sanasto:</translation>
     </message>
     <message>
-        <source>No sources were found in the SWORD configuration and BibleTime couldn&apos;t create a default source. Check your SWORD configuration and that the configuration path is writable. Then restart the Bookshelf Manager.</source>
-        <translation type="obsolete">Lähteitä ei löytynyt SWORD-asetuksista ja BibleTime ei pystynyt luomaan oletuslähdettä. Tarkista SWORD-asetukset ja ettei asetusten tiedostopolku ole kirjoitussuojattu. Käynnistä sitten Kirjahyllyn hallinta uudelleen.</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="190"/>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation type="unfinished">Standardia hepreankielistä sanastoa käyteään kun hyperlinkki hepreankieliseen sanastoon valitaan</translation>
     </message>
     <message>
-        <source>Remote:</source>
-        <translation type="obsolete">Etä:</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation type="unfinished">Kreikankielinen Strongin sanasto:</translation>
     </message>
     <message>
-        <source>Local:</source>
-        <translation type="obsolete">Paikallinen:</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="194"/>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation type="unfinished">Standardia kreikankielistä sanastoa käytetään kun hyperlinkki kreikankielen sanastoon valitaan</translation>
     </message>
     <message>
-        <source>Not a directory!</source>
-        <translation type="obsolete">Ei ole kansio!</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</source>
+        <translation type="unfinished">Heprealainen morfologinen sanasto:</translation>
     </message>
     <message>
-        <source>Not readable!</source>
-        <translation type="obsolete">Ei luettavissa!</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="198"/>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation type="unfinished">Standardia hepreankielen morfologista sanastoa käytetään kun morfologinen linkki valitaan heprealaisissa teksteissä</translation>
     </message>
     <message>
-        <source>Warning</source>
-        <translation type="obsolete">Varoitus</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</source>
+        <translation type="unfinished">Kreikkalainen morfologinen sanasto:</translation>
     </message>
     <message>
-        <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="obsolete">Kohdekansioon ei ole kirjoitusoikeuksia tai sitä ei ole. Asennus epäonnistuu, kunnes tämä tilanne on korjattu.</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="202"/>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation type="unfinished">Standardia kreikankielen morfologista sanastoa käytetään kun morfologinen linkki valitaan kreikkalaisissa teksteissä</translation>
     </message>
 </context>
 <context>
     <name>BtTextFiltersTab</name>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="74"/>
         <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="obsolete">Näyttösuotimet määrittelevät millä tavoin teksti näytetään. Tässä voit asettaa oletusasetukset kaikille suotimille. Voit kuitenkin ohittaa nämä ja määritellä erikseen jokaiselle ikkunalle omat asetukset.</translation>
+        <translation type="unfinished">Näyttösuotimet määrittelevät millä tavoin teksti näytetään. Tässä voit asettaa oletusasetukset kaikille suotimille. Voit kuitenkin ohittaa nämä ja määritellä erikseen jokaiselle ikkunalle omat asetukset.</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="78"/>
         <source>Insert line break after each verse</source>
-        <translation type="obsolete">Lisää rivinvaihto jokaisen jakeen perään</translation>
+        <translation type="unfinished">Lisää rivinvaihto jokaisen jakeen perään</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
         <source>Show verse numbers</source>
-        <translation type="obsolete">Näytä jaenumerot</translation>
+        <translation type="unfinished">Näytä jaenumerot</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
         <source>Show section headings</source>
-        <translation type="obsolete">Näytä kappaleiden otsikot</translation>
+        <translation type="unfinished">Näytä kappaleiden otsikot</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
         <source>Show scripture cross-references</source>
-        <translation type="obsolete">Näytä kirjoitusten ristiviitteet</translation>
+        <translation type="unfinished">Näytä kirjoitusten ristiviitteet</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="82"/>
         <source>Show Greek accents</source>
-        <translation type="obsolete">Näytä kreikan korkomerkit</translation>
+        <translation type="unfinished">Näytä kreikan korkomerkit</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="83"/>
         <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">Näytä heprean vokaalipisteet</translation>
+        <translation type="unfinished">Näytä heprean vokaalipisteet</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="84"/>
         <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">Näytä heprean kantillaatiomerkit</translation>
+        <translation type="unfinished">Näytä heprean kantillaatiomerkit</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="85"/>
         <source>Show morph segmentation</source>
-        <translation type="obsolete">Näytä morfologinen segmentointi</translation>
+        <translation type="unfinished">Näytä morfologinen segmentointi</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="86"/>
         <source>Use textual variants</source>
-        <translation type="obsolete">Käytä tekstivariantteja</translation>
+        <translation type="unfinished">Käytä tekstivariantteja</translation>
     </message>
 </context>
 <context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
         <source>Add/remove/replace</source>
         <translation>Lisää/poista/korvaa</translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">Poista</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
         <source>Replace</source>
         <translation>Korvaa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
         <source>Add</source>
         <translation>Lisää</translation>
     </message>
@@ -1864,87 +1864,87 @@ pikanäppäin</translation>
 <context>
     <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="69"/>
         <source>Tip Of The Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="83"/>
         <source>Show tips at startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="94"/>
         <source>Next Tip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
         <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
         <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="134"/>
         <source>To learn more about the BibleTime project please go to our web site.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="137"/>
         <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
         <source>Select the icon again to stop the synchronization.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="142"/>
         <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="147"/>
         <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="151"/>
         <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="154"/>
         <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="157"/>
         <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="163"/>
         <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="178"/>
         <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="168"/>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
         <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1960,49 +1960,49 @@ pikanäppäin</translation>
 <context>
     <name>CAcceleratorSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="128"/>
         <source>Choose action group:</source>
         <translation>Valitse toimintojen ryhmä:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="130"/>
         <source>Main Window</source>
         <translation>Pääikkuna</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
         <source>All text windows</source>
         <translation>Kaikki teksti-ikkunat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="132"/>
         <source>Bible windows</source>
         <translation>Raamattuikkunat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
         <source>Commentary windows</source>
         <translation>Kommentaari-ikkunat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="134"/>
         <source>Lexicon windows</source>
         <translation>Sanakirjaikkunat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
         <source>Book windows</source>
         <translation>Kirjaikkunat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
         <source>
    &quot;%1&quot; in the &quot;%2&quot; group</source>
         <translation> 
 &quot;%1&quot; ryhmässä &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
         <source>Shortcuts</source>
         <translation>Pikanäppäimet</translation>
     </message>
@@ -2010,103 +2010,95 @@ pikanäppäin</translation>
 <context>
     <name>CBibleReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="64"/>
         <source>Next book</source>
         <translation>Seuraava kirja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="68"/>
         <source>Previous book</source>
         <translation>Edellinen kirja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="72"/>
         <source>Next chapter</source>
         <translation>Seuraava luku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="76"/>
         <source>Previous chapter</source>
         <translation>Edellinen luku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="80"/>
         <source>Next verse</source>
         <translation>Seuraava jae</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="84"/>
         <source>Previous verse</source>
         <translation>Edellinen jae</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="89"/>
         <source>Copy chapter</source>
         <translation>Kopioi luku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="92"/>
         <source>Save chapter as plain text</source>
         <translation>Tallenna luku pelkkänä tekstinä</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="95"/>
         <source>Save chapter as HTML</source>
         <translation>Tallenna luku HTML:nä</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="98"/>
         <source>Print chapter</source>
         <translation>Tulosta luku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="110"/>
         <source>Text of reference</source>
         <translation>Viittauksen teksti</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
         <source>Reference with text</source>
         <translation>Viittaus ja teksti</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="253"/>
         <source>Bible window</source>
         <translation>Raamattuikkuna</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="263"/>
         <source>Copy...</source>
         <translation>Kopioi...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="274"/>
         <source>Save...</source>
         <translation>Tallenna...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="287"/>
         <source>Print...</source>
         <translation>Tulosta...</translation>
     </message>
     <message>
-        <source>Copy chapter to clipboard ...</source>
-        <translation type="obsolete">Kopioi luku leikepöydälle...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="371"/>
         <source>Copying</source>
         <translation>Kopioidaan</translation>
     </message>
     <message>
-        <source>Saving chapter ...</source>
-        <translation type="obsolete">Tallennetaan lukua...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="390"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="408"/>
         <source>Saving</source>
         <translation>Tallennetaan</translation>
     </message>
@@ -2114,7 +2106,7 @@ pikanäppäin</translation>
 <context>
     <name>CBookReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
+        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="70"/>
         <source>Toggle tree view</source>
         <translation>Näytä/piilota puu</translation>
     </message>
@@ -2122,97 +2114,93 @@ pikanäppäin</translation>
 <context>
     <name>CBookmarkIndex</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
         <source>Bookmarks</source>
         <translation>Kirjanmerkit</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="92"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="583"/>
         <source>New folder</source>
         <translation>Uusi kansio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
         <source>Rename folder</source>
         <translation>Nimeä kansio uudelleen</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
         <source>Delete Items</source>
         <translation>Tuhoa tietueet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="704"/>
         <source>Do you really want to delete the selected items and child-items?</source>
         <translation>Tuhotaanko valitut tietueet ja niiden alla olevat tietueet?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="814"/>
         <source>The work to which the bookmark points to is not installed.</source>
         <translation>Kirjanmerkki osoittaa asentamattomaan teokseen.</translation>
     </message>
     <message>
-        <source>Change bookmark description...</source>
-        <translation type="obsolete">Muuta kirjanmerkin kuvausta...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
         <source>Print bookmarks...</source>
         <translation>Tulosta kirjanmerkit...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="103"/>
         <source>Remove selected items...</source>
         <translation>Poista valitut kohteet...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
         <source>Import to folder...</source>
         <translation>Tuo kansioon...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
         <source>Edit bookmark...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
         <source>Sort folder bookmarks...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
         <source>Sort all bookmarks...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="100"/>
         <source>Export from folder...</source>
         <translation>Vie kansiosta...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="393"/>
         <source>Can drop only bookmarks or one folder</source>
         <translation>Vain kirjanmerkkejä tai yksi kansio voidaan pudottaa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="398"/>
         <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
         <translation>Kansiota ei voi pudottaa itseensä tai sen alikansioon</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
         <source>Copy</source>
         <translation>Kopioi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="406"/>
         <source>Move</source>
         <translation>Siirrä</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="467"/>
         <source>Drag references from text views to this view</source>
         <translation>Vedä viittauksia tekstinäytöltä tähän näyttöön</translation>
     </message>
@@ -2220,42 +2208,42 @@ pikanäppäin</translation>
 <context>
     <name>CCommentaryReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="31"/>
         <source>Next book</source>
         <translation>Seuraava kirja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="35"/>
         <source>Previous book</source>
         <translation>Edellinen kirja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="39"/>
         <source>Next chapter</source>
         <translation>Seuraava luku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="43"/>
         <source>Previous chapter</source>
         <translation>Edellinen luku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="47"/>
         <source>Next verse</source>
         <translation>Seuraava jae</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="51"/>
         <source>Previous verse</source>
         <translation>Edellinen jae</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="56"/>
         <source>Synchronize</source>
         <translation>Synkronisoi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="59"/>
         <source>Synchronize the displayed entry of this work with the active Bible window</source>
         <translation>Synkronisoi tämän teoksen näytetty kohta aktiivisen raamattuikkunan kanssa</translation>
     </message>
@@ -2263,7 +2251,7 @@ pikanäppäin</translation>
 <context>
     <name>CConfigurationDialog</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="41"/>
         <source>Configure BibleTime</source>
         <translation>BibleTimen asetukset</translation>
     </message>
@@ -2271,67 +2259,67 @@ pikanäppäin</translation>
 <context>
     <name>CDisplaySettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
         <source>Display templates</source>
         <translation>Näyttömallit</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
         <source>Available display styles:</source>
         <translation>Saatavilla olevat näyttömallit:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="113"/>
         <source>Style preview</source>
         <translation>Mallin esikatselu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="131"/>
         <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
         <translation>Jumala on rakastanut maailmaa niin paljon, että antoi ainoan Poikansa, jottei yksikään, joka häneen uskoo, joutuisi kadotukseen, vaan saisi iankaikkisen elämän.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="138"/>
         <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
         <translation>Ei Jumala lähettänyt Poikaansa tuomitsemaan maailmaa, vaan pelastamaan sen.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="145"/>
         <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
         <translation>Sitä, joka uskoo häneen, ei tuomita, mutta se, joka ei usko, on jo tuomittu, koska hän ei uskonut Jumalan ainoaan Poikaan. </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="155"/>
         <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
         <translation>Sillä jokainen, joka pahaa tekee, vihaa valkeutta eikä tule valkeuteen, ettei hänen tekojansa nuhdeltaisi. </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="160"/>
         <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
         <translation>Mutta joka totuuden tekee, se tulee valkeuteen, että hänen tekonsa tulisivat julki, sillä ne ovat Jumalassa tehdyt.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="106"/>
         <source>Display templates define how text is displayed.</source>
         <translation>Tekstien näyttömallit määrittelevät miten teksti näytetään.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="110"/>
         <source>Show the BibleTime logo on startup</source>
         <translation>Näytä BibleTimen logo käynnistettäessä</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
         <source>Show startup logo</source>
         <translation>Näytä aloituslogo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="150"/>
         <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
         <translation>Mutta tämä on tuomio, että valkeus on tullut maailmaan, ja ihmiset rakastivat pimeyttä enemmän kuin valkeutta; sillä heidän tekonsa olivat pahat.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="101"/>
         <source>Display</source>
         <translation>Näyttö</translation>
     </message>
@@ -2344,147 +2332,124 @@ pikanäppäin</translation>
 <context>
     <name>CDisplayWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="215"/>
         <source>Back in history</source>
         <translation>Taaksepäin historiassa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="223"/>
         <source>Forward in history</source>
         <translation>Eteenpäin historiassa</translation>
     </message>
     <message>
-        <source>Zoom in</source>
-        <translation type="obsolete">Lähennä</translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation type="obsolete">Loitonna</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="192"/>
         <source>Select all</source>
         <translation>Valitse kaikki</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="196"/>
         <source>Copy</source>
         <translation>Kopioi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="200"/>
         <source>Find...</source>
         <translation>Löydä...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="204"/>
         <source>Change location</source>
         <translation>Vaihda sijainti</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="209"/>
         <source>Search with works of this window</source>
         <translation>Etsi tämän ikkunan teoksista</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="393"/>
         <source>Work chooser buttons</source>
         <translation>Teosten valintapainikkeet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="403"/>
         <source>Text area header</source>
         <translation>Tekstialueen otsake</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="453"/>
         <source>Navigation</source>
         <translation>Navigointi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="459"/>
         <source>Tool</source>
         <translation>Työkalu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="465"/>
         <source>Format</source>
         <translation>Muotoilu</translation>
     </message>
 </context>
 <context>
-    <name>CFontChooser</name>
-    <message>
-        <source>Size:</source>
-        <translation type="obsolete">Koko:</translation>
-    </message>
-    <message>
-        <source>Font name:</source>
-        <translation type="obsolete">Kirjasimen nimi:</translation>
-    </message>
-    <message>
-        <source>Font style:</source>
-        <translation type="obsolete">Kirjasimen tyyli:</translation>
-    </message>
-</context>
-<context>
     <name>CHTMLWriteDisplay</name>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
         <source>Bold</source>
         <translation>Lihavoitu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="60"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="67"/>
         <source>Italic</source>
         <translation>Kursivoitu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="79"/>
         <source>Underline</source>
         <translation>Alleviivaus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="84"/>
         <source>Left</source>
         <translation>Vasen</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="94"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="99"/>
         <source>Center</source>
         <translation>Keski</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="104"/>
         <source>Right</source>
         <translation>Oikea</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="231"/>
         <source>Font</source>
         <translation>Kirjasin</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="243"/>
         <source>Font size</source>
         <translation>Kirjasimen koko</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="255"/>
         <source>Font color</source>
         <translation>Kirjasimen väri</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="89"/>
         <source>Align left</source>
         <translation>Sijoita vasemmalle</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="109"/>
         <source>Align right</source>
         <translation>Sijoita oikealle</translation>
     </message>
@@ -2492,60 +2457,22 @@ pikanäppäin</translation>
 <context>
     <name>CHTMLWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="122"/>
         <source>Module not writable</source>
         <translation>Teokseen ei voi kirjoittaa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="124"/>
         <source>Module is not writable.</source>
         <translation>Teokseen ei voi kirjoittaa.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="125"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Joko teos ei ole kirjoitettava tai sinulla ei ole kirjoitusoikeuksia siihen.</translation>
     </message>
 </context>
 <context>
-    <name>CInputDialog</name>
-    <message>
-        <source>Clear</source>
-        <translation type="obsolete">Tyhjennä</translation>
-    </message>
-</context>
-<context>
-    <name>CKeyReferenceWidget</name>
-    <message>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="obsolete">Selaa luetteloa. Paina painiketta ja siirrä hiirellä kohdetta ylöspäin tai alaspäin.</translation>
-    </message>
-    <message>
-        <source>Next book</source>
-        <translation type="obsolete">Seuraava kirja</translation>
-    </message>
-    <message>
-        <source>Previous book</source>
-        <translation type="obsolete">Edellinen kirja</translation>
-    </message>
-    <message>
-        <source>Next chapter</source>
-        <translation type="obsolete">Seuraava luku</translation>
-    </message>
-    <message>
-        <source>Previous chapter</source>
-        <translation type="obsolete">Edellinen luku</translation>
-    </message>
-    <message>
-        <source>Next verse</source>
-        <translation type="obsolete">Seuraava jae</translation>
-    </message>
-    <message>
-        <source>Previous verse</source>
-        <translation type="obsolete">Edellinen jae</translation>
-    </message>
-</context>
-<context>
     <name>CLanguageSettingsPage</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/clanguagesettings.cpp" line="263"/>
@@ -2556,22 +2483,22 @@ pikanäppäin</translation>
 <context>
     <name>CLexiconKeyChooser</name>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Selaa luetteloa. Paina painiketta ja siirrä hiirellä kohdetta ylöspäin tai alaspäin.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
         <source>Entries of the current work</source>
         <translation>Nykyisen teoksen tietueet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Seuraava</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="49"/>
         <source>Previous entry</source>
         <translation>Edellinen</translation>
     </message>
@@ -2579,189 +2506,183 @@ pikanäppäin</translation>
 <context>
     <name>CLexiconReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Seuraava tietue</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="51"/>
         <source>Previous entry</source>
         <translation>Edellinen tietue</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="55"/>
         <source>Copy reference only</source>
         <translation>Kopioi vain viite</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
         <source>Save entry as HTML</source>
         <translation>Tallenna tietue HTML:nä</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
         <source>Print reference only</source>
         <translation>Tulosta vain viite</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
         <source>Strong&apos;s Search</source>
         <translation>Strongien haku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
         <source>Entry with text</source>
         <translation>Tietue tekstillä</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="134"/>
         <source>Entry as plain text</source>
         <translation>Tietue pelkkänä tekstinä</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="265"/>
         <source>Lexicon window</source>
         <translation>Sanakirjaikkuna</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="272"/>
         <source>Copy...</source>
         <translation>Kopioi...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="281"/>
         <source>Save...</source>
         <translation>Tallenna...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="297"/>
         <source>Print...</source>
         <translation>Tulosta...</translation>
     </message>
     <message>
-        <source>Saving entry ...</source>
-        <translation type="obsolete">Tallennetaan tietuetta ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="340"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="364"/>
         <source>Saving</source>
         <translation>Tallennetaan</translation>
     </message>
 </context>
 <context>
-    <name>CModuleIndexDialog</name>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Keskeytä</translation>
-    </message>
-    <message>
-        <source>Creating indices</source>
-        <translation type="obsolete">Luodaan indeksejä</translation>
-    </message>
-    <message>
-        <source>Creating index for work: %1</source>
-        <translation type="obsolete">Luodaan indeksiä teokselle: %1</translation>
-    </message>
-    <message>
-        <source>Indexing Is Cancelled</source>
-        <translation type="obsolete">Indeksien luonti keskeytetty</translation>
-    </message>
-    <message>
-        <source>Indexing is cancelled because modules are removed.</source>
-        <translation type="obsolete">Indeksointi on keskeytetty, koska moduulit on poistettu.</translation>
-    </message>
-</context>
-<context>
     <name>CPlainWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="235"/>
         <source>Sync with active Bible</source>
         <translation>Synkronoi aktiivisen Raamatun kanssa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="245"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="249"/>
         <source>Save text</source>
         <translation>Tallenna teksti</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="254"/>
         <source>Delete current entry</source>
         <translation>Poista nykyinen tietue</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="263"/>
         <source>Restore original text</source>
         <translation>Palauta alkuperäinen teksti</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="163"/>
         <source>Module not writable</source>
         <translation>Teos ei ole kirjoitettava</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="165"/>
         <source>Module is not writable.</source>
         <translation>Teos ei ole kirjoitettava.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="166"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Joko teos ei ole kirjoitettava tai sinulla ei ole kirjoitusoikeuksia siihen.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="240"/>
         <source>Synchronize (show the same verse) with the active Bible window</source>
         <translation>Synkronisoi (näytä sama jae) aktiivisen raamattuikkunan kanssa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="258"/>
         <source>Delete current entry (no undo)</source>
         <translation>Poista nykyinen tietue (ei voi perua)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="267"/>
         <source>Restore original text, new text will be lost</source>
         <translation>Palauta alkuperäinen teksti. Uusi teksti katoaa.</translation>
     </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save Text?</source>
+        <translation type="unfinished">Tallenna teksti?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <source>Save text before closing?</source>
+        <translation type="unfinished">Tallenna teksti ennen sulkemista?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save changed text?</source>
+        <translation type="unfinished">Tallenna muutokset?</translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="232"/>
         <source>Save Search Analysis</source>
         <translation>Tallenna hakuanalyysi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation>HTML-tiedostot (*.html;*.HTML;*.HTM;*.htm)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="243"/>
         <source>BibleTime Search Analysis</source>
         <translation>BibleTime hakuanalyysi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation>Hakuteksti: </translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="234"/>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="259"/>
+        <source>Search text:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="263"/>
+        <source>Results by work and book</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="265"/>
         <source>Book</source>
         <translation>Kirja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="293"/>
         <source>Total hits</source>
         <translation>Osumia yhteensä</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="303"/>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
         <translation>Tekijä &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</translation>
     </message>
@@ -2769,168 +2690,168 @@ pikanäppäin</translation>
 <context>
     <name>CSwordModuleInfo</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="763"/>
         <source>Version</source>
         <translation>Versio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="766"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="774"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="771"/>
         <source>Markup</source>
         <translation>Merkkaus</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
         <source>Location</source>
         <translation>Sijainti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="782"/>
         <source>Language</source>
         <translation>Kieli</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="787"/>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="792"/>
         <source>LCSH</source>
         <translation>LCSH</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="796"/>
         <source>Writable</source>
         <translation>Muokattavissa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>yes</source>
         <translation>kyllä</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>no</source>
         <translation>ei</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="801"/>
         <source>Unlock key</source>
         <translation>Salauksen purkuavain</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="822"/>
         <source>Features</source>
         <translation>Ominaisuudet</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="830"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Huomio, tämä teos sisältää kultti- / kyseenalaista materiaalia!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="834"/>
         <source>About</source>
         <translation>Tietoja</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="856"/>
         <source>Distribution license</source>
         <translation>Levitysversion lisenssi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="857"/>
         <source>Distribution source</source>
         <translation>Levitysversion lähde</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="858"/>
         <source>Distribution notes</source>
         <translation>Levitysversion huomiot</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="859"/>
         <source>Text source</source>
         <translation>Tekstin lähde</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="860"/>
         <source>Copyright notes</source>
         <translation>Tekijänoikeushuomiot</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
         <source>Copyright holder</source>
         <translation>Tekijänoikeuksien haltija</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
         <source>Copyright date</source>
         <translation>Tekijänoikeuksien päiväys</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
         <source>Copyright contact name</source>
         <translation>Tekijänoikeuksien kontaktin nimi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
         <source>Copyright contact address</source>
         <translation>Tekijänoikeuksien kontaktin osoite</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
         <source>Copyright contact email</source>
         <translation>Tekijänoikeuksien kontaktin sähköpostiosoite</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="956"/>
         <source>Bibles</source>
         <translation>Raamatut</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="958"/>
         <source>Commentaries</source>
         <translation>Kommentaarit</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="960"/>
         <source>Books</source>
         <translation>Kirjat</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="962"/>
         <source>Cults/Unorthodox</source>
         <translation>Kultit/Väärät opit</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="964"/>
         <source>Maps and Images</source>
         <translation>Kartat ja kuvat</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="966"/>
         <source>Daily Devotionals</source>
         <translation>Hartauskirjallisuus</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="968"/>
         <source>Lexicons and Dictionaries</source>
         <translation>Sanakirjat</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="970"/>
         <source>Glossaries</source>
         <translation>Sanastot</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="972"/>
         <source>Unknown</source>
         <translation>Tuntematon</translation>
     </message>
@@ -2938,17 +2859,17 @@ pikanäppäin</translation>
 <context>
     <name>CSwordSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="43"/>
         <source>Standard works</source>
         <translation>Oletusteokset</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="44"/>
         <source>Text filters</source>
         <translation>Tekstisuotimet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="41"/>
         <source>Desk</source>
         <translation>Työpöytä</translation>
     </message>
@@ -2961,71 +2882,71 @@ pikanäppäin</translation>
 <context>
     <name>CSwordSetupInstallSourcesDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="47"/>
         <source>Caption</source>
         <translation>Otsikko</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
         <source>Type</source>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
         <source>Server</source>
         <translation>Palvelin</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="68"/>
         <source>Path</source>
         <translation>Polku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="91"/>
         <source>Get list...</source>
         <translation>Hae lista...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="92"/>
         <source>Download a list of sources from CrossWire server and add sources</source>
         <translation>Lataa lähdelista CrossWiren palvelimelta ja lisää lähteet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
         <source>Please provide a caption.</source>
         <translation>Määritä otsikko.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
         <source>A source with this caption already exists. Please provide a different caption.</source>
         <translation>Lähde tällä otsikolla on jo olemassa. Anna toinen otsikko.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
         <source>Please provide a server name.</source>
         <translation>Määritä palvelimen nimi.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
         <source>Please provide a valid, readable path.</source>
         <translation>Määritä lukukelpoinen kelvollinen polku.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Please provide a path.</source>
         <translation>Määritä polku.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="160"/>
         <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
 
 Do you want to continue?</source>
@@ -3034,106 +2955,87 @@ Do you want to continue?</source>
 Haluatko jatkaa?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
         <source>Get source list from remote server?</source>
         <translation>Hae lähdelista etäpalvelimelta?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="167"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="168"/>
         <source>Downloading List</source>
         <translation>Ladataan listaa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="178"/>
         <source>Connecting...</source>
         <translation>Yhdistetään...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="197"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="198"/>
         <source>Refreshing...</source>
         <translation>Virkistetään...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="39"/>
         <source>New  Installation Source</source>
         <translation>Uusi asennuslähde</translation>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>Tallenna teksti ennen sulkemista?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>Tallenna muutokset?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>Tallenna teksti?</translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="178"/>
         <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="194"/>
         <source>Abbreviation</source>
         <translation>Lyhenne</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="203"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="290"/>
         <source>Cross references</source>
         <translation>Ristiviittaukset</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="343"/>
         <source>Footnote</source>
         <translation>Alaviite</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="374"/>
         <source>Strongs</source>
         <translation>Strongin numerot</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="451"/>
         <source>Morphology</source>
         <translation>Morfologia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="472"/>
         <source>Word lookup</source>
         <translation>Sanahaku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="60"/>
         <source>Copy</source>
         <translation>Kopioi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
         <source>Select all</source>
         <translation type="unfinished">Valitse kaikki</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="80"/>
         <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
         <translation>&lt;small&gt;Tämä on suurennuslasin alue. Vie hiiren osoitin linkkien päälle tai muiden tietoja sisältävien kohteiden päälle ja sisältö ilmestyy suurennuslasiin pienen viiveen jälkeen. Siirrä hiiri suurennuslasiin nopeasti tai lukitse näyttö painamalla ja pitämällä alhaalla vaihtonäppäintä (shift) samalla aikaa kun siirrät hiirtä.&lt;/small&gt;</translation>
     </message>
@@ -3141,28 +3043,28 @@ Haluatko jatkaa?</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="412"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="422"/>
         <source>Indexing aborted</source>
         <translation>Indeksointi keskeytynyt</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="413"/>
         <source>An internal error occurred while building the index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="423"/>
         <source>An internal error occurred while building the index.</source>
         <translation>Sisäinen virhe indeksiä luotaessa.</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="522"/>
         <source>Search aborted</source>
         <translation>Haku keskeytynyt</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="523"/>
         <source>An internal error occurred while executing your search.</source>
         <translation>Sisäinen virhe hakua suoritettaessa.</translation>
     </message>
@@ -3203,7 +3105,7 @@ Haluatko jatkaa?</translation>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="122"/>
         <source>Bibles</source>
         <translation>Raamatut</translation>
     </message>
@@ -3220,777 +3122,777 @@ Haluatko jatkaa?</translation>
         <translation>Kirjat</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="390"/>
         <source>Added text</source>
         <translation>Lisätty teksti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="143"/>
         <source>Names of languages</source>
         <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
         <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
         <translation>Kielten nimet</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="148"/>
         <source>Afrikaans</source>
         <extracomment>Language name af</extracomment>
         <translation>Afrikaans</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="151"/>
         <source>Amuzgo, Guerrero</source>
         <extracomment>Language name amu</extracomment>
         <translation>Amuzgo, Guerrero</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="153"/>
         <source>English, Old (ca.450-1100)</source>
         <extracomment>Language name ang</extracomment>
         <translation>Englanti, vanha (n. 450-1100)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="155"/>
         <source>Arabic</source>
         <extracomment>Language name ar</extracomment>
         <translation>Arabia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="158"/>
         <source>Azerbaijani</source>
         <extracomment>Language name az</extracomment>
         <translation>Azerbaizani</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="160"/>
         <source>Azerbaijani, South</source>
         <extracomment>Language name azb</extracomment>
         <translation>Azerbaidžani, eteläinen</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="165"/>
         <source>Belarusian</source>
         <extracomment>Language name be</extracomment>
         <translation>Valkovenäjä</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="167"/>
         <source>Bulgarian</source>
         <extracomment>Language name bg</extracomment>
         <translation>Bulgaria</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="173"/>
         <source>Breton</source>
         <extracomment>Language name br</extracomment>
         <translation>Bretoni</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="175"/>
         <source>Bosnian</source>
         <extracomment>Language name bs</extracomment>
         <translation>Bosnia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="177"/>
         <source>Catalan</source>
         <extracomment>Language name ca</extracomment>
         <translation>Katalaani</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="180"/>
         <source>Chinantec, Comaltepec</source>
         <extracomment>Language name cco</extracomment>
         <translation>Chinantec, Comaltepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="182"/>
         <source>Cebuano</source>
         <extracomment>Language name ceb</extracomment>
         <translation>Cebuano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
         <source>Chamorro</source>
         <extracomment>Language name ch</extracomment>
         <translation>Chamorro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
         <source>Chontal, Highland Oaxaca</source>
         <extracomment>Language name chd</extracomment>
         <translation>Chontal, Oaxacan ylämaa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
         <source>Chinantec, Quiotepec</source>
         <extracomment>Language name chq</extracomment>
         <translation>Chinantec, Quiotepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="190"/>
         <source>Chinantec, Ozumacu00edn</source>
         <extracomment>Language name chz</extracomment>
         <translation>Chinantec, Ozumacín</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="193"/>
         <source>Cakchiquel, Western</source>
         <extracomment>Language name ckw</extracomment>
         <translation>Cakchiquel, läntinen</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="195"/>
         <source>Chinantec, Lalana</source>
         <extracomment>Language name cnl</extracomment>
         <translation>Chinantec, Lalana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="197"/>
         <source>Chinantec, Tepetotutla</source>
         <extracomment>Language name cnt</extracomment>
         <translation>Chinantec, Tepetotutla</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="199"/>
         <source>Coptic</source>
         <extracomment>Language name cop</extracomment>
         <translation>Kopti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
         <source>Czech</source>
         <extracomment>Language name cs</extracomment>
         <translation>Tsekki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
         <source>Chinantec, Sochiapan</source>
         <extracomment>Language name cso</extracomment>
         <translation>Chinantec, Sochiapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
         <source>Chol, Tila</source>
         <extracomment>Language name cti</extracomment>
         <translation>Chol, Tila</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
         <source>Chatino, Western Highland</source>
         <extracomment>Language name ctp</extracomment>
         <translation>Chatino, läntinen ylämaa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
         <source>Church Slavic</source>
         <extracomment>Language name cu</extracomment>
         <translation>Kirkkoslaavi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="212"/>
         <source>Welsh</source>
         <extracomment>Language name cy</extracomment>
         <translation>Wales</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
         <source>Danish</source>
         <extracomment>Language name da</extracomment>
         <translation>Tanska</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
         <source>German</source>
         <extracomment>Language name de</extracomment>
         <translation>Saksa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
         <source>Duruma</source>
         <extracomment>Language name dug</extracomment>
         <translation>Duruma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="221"/>
         <source>Greek, Modern (1453-)</source>
         <extracomment>Language name el</extracomment>
         <translation>Kreikka, moderni (1453-)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
         <source>English</source>
         <extracomment>Language name en</extracomment>
         <translation>Englanti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="225"/>
         <source>American English</source>
         <extracomment>Language name en_US</extracomment>
         <translation>Amerikanenglanti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="227"/>
         <source>English, Middle (1100-1500)</source>
         <extracomment>Language name enm</extracomment>
         <translation>Englanti, keskiaikainen (1100-1500)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="229"/>
         <source>Esperanto</source>
         <extracomment>Language name eo</extracomment>
         <translation>Esperanto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="231"/>
         <source>Spanish</source>
         <extracomment>Language name es</extracomment>
         <translation>Espanja</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
         <source>Estonian</source>
         <extracomment>Language name et</extracomment>
         <translation>Viro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
         <source>Basque</source>
         <extracomment>Language name eu</extracomment>
         <translation>Baski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
         <source>Persian</source>
         <extracomment>Language name fa</extracomment>
         <translation>Persia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
         <source>Finnish</source>
         <extracomment>Language name fi</extracomment>
         <translation>Suomi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="243"/>
         <source>French</source>
         <extracomment>Language name fr</extracomment>
         <translation>Ranska</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="245"/>
         <source>Frisian</source>
         <extracomment>Language name fy</extracomment>
         <translation>Friisi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="247"/>
         <source>Irish</source>
         <extracomment>Language name ga</extracomment>
         <translation>Iiri</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="249"/>
         <source>Gaelic (Scots)</source>
         <extracomment>Language name gd</extracomment>
         <translation>Gaeli (skotti)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="251"/>
         <source>Geez</source>
         <extracomment>Language name gez</extracomment>
         <translation>Geez</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
         <source>Gothic</source>
         <extracomment>Language name got</extracomment>
         <translation>Gootti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
         <source>Manx</source>
         <extracomment>Language name gv</extracomment>
         <translation>Manx</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
         <source>Greek, Ancient (to 1453)</source>
         <extracomment>Language name grc</extracomment>
         <translation>Kreikka, vanha (1453 asti)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="262"/>
         <source>Hebrew</source>
         <extracomment>Language name he</extracomment>
         <translation>Heprea</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
         <source>Hausa</source>
         <extracomment>Language name hau</extracomment>
         <translation>Hausa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
         <source>Hawaiian</source>
         <extracomment>Language name haw</extracomment>
         <translation>Havaiji</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
         <source>Hindi</source>
         <extracomment>Language name hi</extracomment>
         <translation>Hindi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="271"/>
         <source>Croatian</source>
         <extracomment>Language name hr</extracomment>
         <translation>Kroatia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="275"/>
         <source>Hungarian</source>
         <extracomment>Language name hu</extracomment>
         <translation>Unkari</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
         <source>Huave, San Mateo Del Mar</source>
         <extracomment>Language name huv</extracomment>
         <translation>Huave, San Mateo Del Mar</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
         <source>Armenian</source>
         <extracomment>Language name hy</extracomment>
         <translation>Armenia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
         <source>Indonesian</source>
         <extracomment>Language name id</extracomment>
         <translation>Indonesia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
         <source>Icelandic</source>
         <extracomment>Language name is</extracomment>
         <translation>Islanti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
         <source>Italian</source>
         <extracomment>Language name it</extracomment>
         <translation>Italia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="291"/>
         <source>Itzu00e1</source>
         <extracomment>Language name itz</extracomment>
         <translation>Itzá</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="293"/>
         <source>Ixil, San Juan Cotzal</source>
         <extracomment>Language name ixl</extracomment>
         <translation>Ixil, San Juan Cotzal</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
         <source>Japanese</source>
         <extracomment>Language name ja</extracomment>
         <translation>Japani</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
         <source>Jacalteco, Eastern</source>
         <extracomment>Language name jac</extracomment>
         <translation>Jacalteco, itäinen</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
         <source>Javanese, Caribbean</source>
         <extracomment>Language name jvn</extracomment>
         <translation>Jaava, Caribian</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="302"/>
         <source>Georgian</source>
         <extracomment>Language name ka</extracomment>
         <translation>Georgia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
         <source>Kekchu00ed</source>
         <comment>kek</comment>
         <extracomment>Language name kek</extracomment>
         <translation>Kekchí</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
         <source>Korean</source>
         <extracomment>Language name ko</extracomment>
         <translation>Korea</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="315"/>
         <source>Kurdish</source>
         <extracomment>Language name ku</extracomment>
         <translation>Kurdi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
         <source>Kirghiz</source>
         <extracomment>Language name ky</extracomment>
         <translation>Kirgiisi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
         <source>Latin</source>
         <extracomment>Language name la</extracomment>
         <translation>Latina</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
         <source>Lacandon</source>
         <extracomment>Language name lac</extracomment>
         <translation>Lacandon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
         <source>Lithuanian</source>
         <extracomment>Language name lt</extracomment>
         <translation>Liettua</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="332"/>
         <source>Latvian</source>
         <extracomment>Language name lv</extracomment>
         <translation>Latvia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="337"/>
         <source>Maori</source>
         <extracomment>Language name mi</extracomment>
         <translation>Maori</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="339"/>
         <source>Mixe, Isthmus</source>
         <extracomment>Language name mir</extracomment>
         <translation>Mixe, Isthmus</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="341"/>
         <source>Mixtec, Coatzospan</source>
         <extracomment>Language name miz</extracomment>
         <translation>Mixtec, Coatzospan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="343"/>
         <source>Macedonian</source>
         <extracomment>Language name mk</extracomment>
         <translation>Makedonia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="345"/>
         <source>Mixtec, Silacayoapan</source>
         <extracomment>Language name mks</extracomment>
         <translation>Mixtec, Silacayoapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="350"/>
         <source>More</source>
         <extracomment>Language name mos</extracomment>
         <translation>More</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
         <source>Malay</source>
         <extracomment>Language name ms</extracomment>
         <translation>Malaji</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
         <source>Maltese</source>
         <extracomment>Language name mt</extracomment>
         <translation>Malta</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="357"/>
         <source>(Multiple languages)</source>
         <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
         <translation>(Useita kieliä)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="359"/>
         <source>Mam, Central</source>
         <extracomment>Language name mvc</extracomment>
         <translation>Mam, keskinen</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
         <source>Mam, Todos Santos Cuchumatu00e1n</source>
         <extracomment>Language name mvj</extracomment>
         <translation>Mam, Todos Santos Cuchumatán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="363"/>
         <source>Mixe, Juquila</source>
         <extracomment>Language name mxq</extracomment>
         <translation>Mixe, Juquila</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="365"/>
         <source>Mixtec, Jamiltepec</source>
         <extracomment>Language name mxt</extracomment>
         <translation>Mixtec, Jamiltepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="370"/>
         <source>Norwegian Bokmu00e5l</source>
         <extracomment>Language name nb</extracomment>
         <translation>Norja, Bokmål</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="372"/>
         <source>Nahuatl, Michoacu00e1n</source>
         <extracomment>Language name ncl</extracomment>
         <translation>Nahuatl, Michoacán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="375"/>
         <source>Low German; Low Saxon</source>
         <extracomment>Language name nds</extracomment>
         <translation>Alasaksa; alasaksi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="377"/>
         <source>Nepali</source>
         <extracomment>Language name ne</extracomment>
         <translation>Nepali</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="379"/>
         <source>Nahuatl, Guerrero</source>
         <extracomment>Language name ngu</extracomment>
         <translation>Nahuatl, Guerrero</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
         <source>Nahuatl, Northern Oaxaca</source>
         <extracomment>Language name nhy</extracomment>
         <translation>Nahuatl, pohjoinen Oaxaca</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
         <source>Dutch</source>
         <extracomment>Language name nl</extracomment>
         <translation>Hollanti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
         <source>Norwegian Nynorsk</source>
         <extracomment>Language name nn</extracomment>
         <translation>Uusnorja</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
         <source>Norwegian</source>
         <extracomment>Language name no</extracomment>
         <translation>Norja</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="397"/>
         <source>Otomi, Queru00e9taro</source>
         <extracomment>Language name otq</extracomment>
         <translation>Otomi, Querétaro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
         <source>Papiamento</source>
         <extracomment>Language name pap</extracomment>
         <translation>Papiamento</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
         <source>Polish</source>
         <extracomment>Language name pl</extracomment>
         <translation>Puola</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="411"/>
         <source>Persian (Dari)</source>
         <extracomment>Language name prs</extracomment>
         <translation>Persia (Dari)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="415"/>
         <source>Portuguese</source>
         <extracomment>Language name pt</extracomment>
         <translation>Portugali</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
         <source>Brasilian Portuguese</source>
         <extracomment>Language name pt_BR</extracomment>
         <translation>Brasilian portugali</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
         <source>Quichu00e9, West Central</source>
         <extracomment>Language name qut</extracomment>
         <translation>Quiché, keskilänsi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
         <source>Romanian</source>
         <extracomment>Language name ro</extracomment>
         <translation>Romania</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
         <source>Russian</source>
         <extracomment>Language name ru</extracomment>
         <translation>Venäjä</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="431"/>
         <source>Scots</source>
         <extracomment>Language name sco</extracomment>
         <translation>Skottienglanti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="437"/>
         <source>Slovak</source>
         <extracomment>Language name sk</extracomment>
         <translation>Slovakki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="439"/>
         <source>Slovenian</source>
         <extracomment>Language name sl</extracomment>
         <translation>Sloveeni</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="443"/>
         <source>Somali</source>
         <extracomment>Language name so</extracomment>
         <translation>Somali</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
         <source>Albanian</source>
         <extracomment>Language name sq</extracomment>
         <translation>Albania</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="453"/>
         <source>Swedish</source>
         <extracomment>Language name sv</extracomment>
         <translation>Ruotsi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="455"/>
         <source>Swahili</source>
         <extracomment>Language name sw</extracomment>
         <translation>Suahili</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="457"/>
         <source>Syriac</source>
         <extracomment>Language name syr</extracomment>
         <translation>Syyria</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="459"/>
         <source>Tamil</source>
         <extracomment>Language name ta</extracomment>
         <translation>Tamili</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="463"/>
         <source>Thai</source>
         <extracomment>Language name th</extracomment>
         <translation>Thai</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
         <source>Tagalog</source>
         <extracomment>Language name tl</extracomment>
         <translation>Tagalog</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="470"/>
         <source>Tswana</source>
         <extracomment>Language name tn</extracomment>
         <translation>Tswana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="472"/>
         <source>Turkish</source>
         <extracomment>Language name tr</extracomment>
         <translation>Turkki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
         <source>Tektiteko</source>
         <extracomment>Language name ttc</extracomment>
         <translation>Tektiteko</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="479"/>
         <source>Tahitian</source>
         <extracomment>Language name ty</extracomment>
         <translation>Tahiti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="481"/>
         <source>Tzotzil, Zinacantu00e1n</source>
         <extracomment>Language name tzz</extracomment>
         <translation>Tzotzil, Zinacantán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
         <source>Ukrainian</source>
         <extracomment>Language name uk</extracomment>
         <translation>Ukraina</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
         <source>Uspanteco</source>
         <extracomment>Language name usp</extracomment>
         <translation>Uspanteco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="492"/>
         <source>Vietnamese</source>
         <extracomment>Language name vi</extracomment>
         <translation>Vietnam</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="496"/>
         <source>Xhosa</source>
         <extracomment>Language name xh</extracomment>
         <translation>Xhosa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="163"/>
         <source>Bavarian</source>
         <extracomment>Language name bar</extracomment>
         <translation>Bavaria</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="326"/>
         <source>Lombard</source>
         <extracomment>Language name lmo</extracomment>
         <translation>Lombard</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="403"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
         <source>Uma</source>
         <extracomment>Language name ppk
 ----------
@@ -3998,424 +3900,384 @@ Language name ppk</extracomment>
         <translation>Uma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="448"/>
         <source>Sranan</source>
         <extracomment>Language name srn</extracomment>
         <translation>Sranan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="498"/>
         <source>Mixtec, Diuxi-Tilantongo</source>
         <extracomment>Language name xtd</extracomment>
         <translation>Mixtec, Diuxi-Tilantongo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
         <source>Yiddish</source>
         <extracomment>Language name yi</extracomment>
         <translation>Jiddish</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
         <source>Zapotec, San Juan Guelavu00eda</source>
         <extracomment>Language name zab</extracomment>
         <translation>Zapotec, San Juan Guelavía</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="507"/>
         <source>Zapotec, Mitla</source>
         <extracomment>Language name zaw</extracomment>
         <translation>Zapotec, Mitla</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="509"/>
         <source>Chinese</source>
         <extracomment>Language name zh</extracomment>
         <translation>Kiina</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="511"/>
         <source>Zapotec, Amatlu00e1n</source>
         <extracomment>Language name zpo</extracomment>
         <translation>Zapotec, Amatlán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
         <source>Zapotec, Zoogocho</source>
         <extracomment>Language name zpq</extracomment>
         <translation>Zapotec, Zoogocho</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="515"/>
         <source>Zapotec, Yalu00e1lag</source>
         <extracomment>Language name zpu</extracomment>
         <translation>Zapotec, Yalálag</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
         <source>Zapotec, Chichicapan</source>
         <extracomment>Language name zpv</extracomment>
         <translation>Zapotec, Chichicapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
         <source>Zapotec, Southern Rincon</source>
         <extracomment>Language name zsr</extracomment>
         <translation>Zapotec, eteläinen Rincon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
         <source>Zapotec, Quioquitani-Quieru00ed</source>
         <extracomment>Language name ztq</extracomment>
         <translation>Zapotec, Quioquitani-Quierí</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
         <source>Zapotec, Yatee</source>
         <extracomment>Language name zty</extracomment>
         <translation>Zapotec, Yatee</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="525"/>
         <source>Zulu</source>
         <extracomment>Language name zu</extracomment>
         <translation>Zulu</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="314"/>
         <source>Footnotes</source>
         <translation>Alaviitteet</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="316"/>
         <source>Strong&apos;s numbers</source>
         <translation>Strongin numerot</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="318"/>
         <source>Headings</source>
         <translation>Otsikot</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="320"/>
         <source>Morphological tags</source>
         <translation>Morfologiset tunnisteet</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="322"/>
         <source>Lemmas</source>
         <translation>Lemmat</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="324"/>
         <source>Hebrew vowel points</source>
         <translation>Heprean vokaalipisteet</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="326"/>
         <source>Hebrew cantillation marks</source>
         <translation>Heprean kantillaatiomerkit</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="328"/>
         <source>Greek accents</source>
         <translation>Kreikan korkomerkit</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="330"/>
         <source>Red letter words</source>
         <translation>Punaisilla kirjaimilla olevat sanat</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="332"/>
         <source>Textual variants</source>
         <translation>Tekstivariantit</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="334"/>
         <source>Scripture cross-references</source>
         <translation>Ristiviittaukset</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="336"/>
         <source>Morph segmentation</source>
         <translation>Morfologinen segmentointi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation>Vie</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
         <source>Local</source>
         <translation>Paikallinen</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>Verkko</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Vanha testamentti</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Mooses/Pentateukki/Toora</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>Historia</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Profeetat</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>Uusi testamentti</translation>
+        <source>Remote FTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Evankeliumit</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="32"/>
+        <source>Remote SFTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>Kirjeet/Epistolat</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="33"/>
+        <source>Remote HTTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Paavalin kirjeet</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="34"/>
+        <source>Remote HTTPS</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
         <source>HTML files</source>
         <translation>HTML-tiedostot</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="438"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>All files</source>
         <translation>Kaikki tiedostot</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>Text files</source>
         <translation>Tekstitiedostot</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="444"/>
         <source>Save file</source>
         <translation>Tallenna tiedosto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="130"/>
         <source>Save document ...</source>
         <translation>Tallenna asiakirja...</translation>
     </message>
     <message>
-        <source>Print keys</source>
-        <translation type="obsolete">Tulosta avaimet</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
         <source>BibleTime bookmark files</source>
         <translation>BibleTimen kirjanmerkkitiedostot</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="127"/>
         <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <source>Change description ...</source>
-        <translation type="obsolete">Muuta kuvausta ...</translation>
-    </message>
-    <message>
-        <source>Enter a new description for the chosen bookmark.</source>
-        <translation type="obsolete">Anna uusi kuvaus valitulle kirjanmerkille.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="60"/>
         <source>New folder</source>
         <translation>Uusi kansio</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
+        <location filename="../../src/util/tool.cpp" line="48"/>
         <source>The file already exists.</source>
         <translation>Tiedosto on jo olemassa.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
+        <location filename="../../src/util/tool.cpp" line="49"/>
         <source>Do you want to overwrite it?</source>
         <translation>Haluatko ylikirjoittaa sen?</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
+        <location filename="../../src/util/tool.cpp" line="69"/>
+        <location filename="../../src/util/tool.cpp" line="75"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>Tiedostoa ei voitu tallentaa.</translation>
+        <location filename="../../src/util/tool.cpp" line="71"/>
+        <source>Error while writing to file.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
+        <location filename="../../src/util/tool.cpp" line="72"/>
+        <source>Please check that enough disk space is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="77"/>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="78"/>
         <source>Please check permissions etc.</source>
         <translation>Tarkista oikeudet jne.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
+        <location filename="../../src/util/tool.cpp" line="197"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Huomio, tämä teos sisältää kultti- / kyseenalaista materiaalia!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
+        <location filename="../../src/util/tool.cpp" line="218"/>
         <source>Version</source>
         <translation>Versio</translation>
     </message>
     <message>
-        <source>Settings Migration</source>
-        <translation type="obsolete">Asetusten siirto</translation>
-    </message>
-    <message>
-        <source>It appears you have a BibleTime configuration from KDE 3 stored in %1, and you have not migrated it to this version.  Would you like to import it?</source>
-        <translation type="obsolete">Sinulla näyttää olevan BibleTimen vanhasta versiosta peräisin olevat asetukset talletettuna tiedostoon %1, ja että et ole siirtänyt niitä tähän versioon.  Haluatko tuoda asetukset nyt?</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
+        <location filename="../../src/util/tool.cpp" line="207"/>
         <source>Encrypted - needs unlock key</source>
         <translation>Salattu - tarvitsee avausavaimen</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
+        <location filename="../../src/util/tool.cpp" line="231"/>
         <source>Double click for more information</source>
         <translation>Kaksoisnapsauta saadaksesi lisätietoja</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
+        <location filename="../../src/util/tool.cpp" line="213"/>
         <source>Updated version available!</source>
         <translation>Päivitetty versio saatavilla!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="273"/>
         <source>Haitian Creole</source>
         <extracomment>Language name ht</extracomment>
         <translation>Haitinkreoli</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="367"/>
         <source>Burmese</source>
         <extracomment>Language name my</extracomment>
         <translation>Burma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
         <source>Potawatomi</source>
         <extracomment>Language name pot</extracomment>
         <translation>Potawatomi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="468"/>
         <source>Klingon</source>
         <extracomment>Language name tlh</extracomment>
         <translation>Klingon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
         <source>Yoryba</source>
         <extracomment>Language name yo</extracomment>
         <translation>Joruba</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
+        <location filename="../../src/util/tool.cpp" line="226"/>
         <source>Installed version</source>
         <translation>Asennettu versio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="407"/>
         <source>Verb tense changed</source>
         <translation>Verbin aikamuoto vaihdettu</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>Can&apos;t write file</source>
         <translation>Ei voi kirjoittaa tiedostoon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>The Sword config file can&apos;t be written!</source>
         <translation>Swordin asetustiedostoon ei voi kirjoittaa!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="39"/>
         <source>Export Bookmarks</source>
         <translation>Vie kirjanmerkit</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="50"/>
         <source>Import bookmarks</source>
         <translation>Tuo kirjanmerkit</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
+        <location filename="../../src/util/tool.cpp" line="46"/>
         <source>Overwrite File?</source>
         <translation>Korvaa tiedosto?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="276"/>
         <source>Parsing Strong&apos;s Numbers</source>
         <translation>Jäsennetään Strongin numeroita</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="334"/>
         <source>Malagasy</source>
         <extracomment>Language name mg</extracomment>
         <translation>Malagassi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
         <source>Orya</source>
         <extracomment>Language name ury</extracomment>
         <translation>Orya</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="154"/>
         <source>This shortcut conflicts with the shortcut for the following actions:</source>
         <translation>Tämä pikanäppäin on ristiriidassa seuraavien toimintojen pikanäppäinten kanssa:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
         <source>Do you want to clear the conflicting shortcuts and continue?</source>
         <translation>Haluatko poistaa ristiriitaiset pikanäppäimet ja jatkaa?</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="23"/>
         <source>Indexed works</source>
         <translation>Indeksoidut teokset</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="24"/>
         <source>Unindexed works</source>
         <translation>Indeksoimattomat teokset</translation>
     </message>
@@ -4460,17 +4322,17 @@ Language name ppk</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="57"/>
         <source>CSS base template not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="74"/>
         <source>Default template &quot;%1&quot; not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="113"/>
         <source>Replace</source>
         <translation type="unfinished">Korvaa</translation>
     </message>
@@ -4478,91 +4340,91 @@ Language name ppk</extracomment>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="58"/>
         <source>OK</source>
         <comment>Dialog Button</comment>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="59"/>
         <source>Open</source>
         <comment>Dialog Button</comment>
         <translation>Avaa</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="60"/>
         <source>Save</source>
         <comment>Dialog Button</comment>
         <translation>Tallenna</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="61"/>
         <source>Cancel</source>
         <comment>Dialog Button</comment>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="62"/>
         <source>Close</source>
         <comment>Dialog Button</comment>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="63"/>
         <source>Discard</source>
         <comment>Dialog Button</comment>
         <translation>Hylkää</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="64"/>
         <source>Apply</source>
         <comment>Dialog Button</comment>
         <translation>Käytä</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="65"/>
         <source>Reset</source>
         <comment>Dialog Button</comment>
         <translation>Resetoi</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="66"/>
         <source>Restore defaults</source>
         <comment>Dialog Button</comment>
         <translation>Palauta oletukset</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="67"/>
         <source>Help</source>
         <comment>Dialog Button</comment>
         <translation>Ohje</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="68"/>
         <source>Save All</source>
         <comment>Dialog Button</comment>
         <translation>Tallenna kaikki</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="69"/>
         <source>Yes</source>
         <comment>Dialog Button</comment>
         <translation>Kyllä</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="70"/>
         <source>Yes to all</source>
         <comment>Dialog Button</comment>
         <translation>Kyllä kaikkiin</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="71"/>
         <source>No</source>
         <comment>Dialog Button</comment>
         <translation>Ei</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="72"/>
         <source>No to all</source>
         <comment>Dialog Button</comment>
         <translation>Ei kaikkiin</translation>
@@ -4571,102 +4433,102 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchOptionsArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="97"/>
         <source>Search for:</source>
         <translation>Etsi:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="104"/>
         <source>&amp;Search</source>
         <translation>&amp;Etsi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="106"/>
         <source>Start to search the text in the chosen works</source>
         <translation>Aloita haku valituista teoksista</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="109"/>
         <source>Ch&amp;oose...</source>
         <translation>&amp;Valitse...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="111"/>
         <source>Choose works for the search</source>
         <translation>Valitse teoksia hakuun</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="114"/>
         <source>S&amp;etup...</source>
         <translation>As&amp;eta...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="133"/>
         <source>All of the words (AND is added between the words)</source>
         <translation>Kaikista sanoista (looginen JA lisätään sanojen väliin)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="137"/>
         <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
         <translation>(&lt;a href=&apos;syntax_help&apos;&gt;koko syntaksi&lt;/a&gt;)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="148"/>
         <source>Scope:</source>
         <translation>Hakualue:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="169"/>
         <source>The text you want to search for</source>
         <translation>Haluamasi hakuteksti</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="173"/>
         <source>Works:</source>
         <translation>Teokset:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="346"/>
         <source>No search scope</source>
         <translation>Ei hakualuetta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="128"/>
         <source>All words</source>
         <translation>Kaikki sanat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="130"/>
         <source>Some words</source>
         <translation>Joitakin sanoja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
         <source>Free</source>
         <translation>Vapaa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
         <source>Some of the words (OR is added between the words)</source>
         <translation>Joitakin sanoja (sanojen väliin lisätään looginen TAI)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
         <source>Full lucene syntax</source>
         <translation>Lucenen koko syntaksi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="159"/>
         <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
         <translation>Valitse hakualue (kirjat/luvut/jakeet).&lt;br /&gt;Käytettävissä Raamattuun tai kommentaareihin.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
         <source>Click the link to get help for search syntax</source>
         <translation>Klikkaa linkkiä avataksesi haun syntaksin ohje</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="116"/>
         <source>Configure predefined scopes for search</source>
         <translation>Määrittele hakualueita hakua varten</translation>
     </message>
@@ -4674,17 +4536,17 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchResultArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="85"/>
         <source>Text of the selected search result item</source>
         <translation>Valitun haun tuloksen teksti</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="88"/>
         <source>Select all</source>
         <translation type="unfinished">Valitse kaikki</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="92"/>
         <source>Copy</source>
         <translation type="unfinished">Kopioi</translation>
     </message>
@@ -4692,242 +4554,242 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchSyntaxHelpDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="47"/>
         <source>Search Syntax Help</source>
         <translation>Haun syntaksin avuste</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="94"/>
         <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
         <source>Which words to find</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="101"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
         <source>Grouping and order</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="103"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
         <source>Wildcards (partial words)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
         <source>Text fields (different parts of text)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="208"/>
         <source>Other syntax features</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
         <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
         <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="119"/>
         <source>jesus AND god</source>
         <comment>Do not translate &quot;AND&quot;.</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="121"/>
         <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="123"/>
         <source>jesus OR god</source>
         <comment>Do not translate &quot;OR&quot;.</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="125"/>
         <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="127"/>
         <source>jesus NOT god</source>
         <comment>Do not translate &quot;NOT&quot;.</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="133"/>
         <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="131"/>
         <source>+jesus -god</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
         <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
         <source>(a AND b) OR c</source>
         <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
         <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="145"/>
         <source>&quot;says lord&quot;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="149"/>
         <source>&quot;says the lord&quot;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="151"/>
         <source>Finds all verses with &apos;says the LORD&apos;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
         <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="160"/>
         <source>a*</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="162"/>
         <source>All words beginning with &apos;a&apos;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="164"/>
         <source>a*a</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="166"/>
         <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="168"/>
         <source>a?</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="170"/>
         <source>&apos;at&apos; and &apos;an&apos;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="172"/>
         <source>a??a</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="174"/>
         <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
         <source>Available text fields:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="181"/>
         <source>Searches headings</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="183"/>
         <source>Searches footnotes</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="185"/>
         <source>Searches Strong&apos;s numbers</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="187"/>
         <source>Searches morphology codes</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="189"/>
         <source>Examples:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="191"/>
         <source>heading:Jesus</source>
         <comment>Do not translate &quot;heading:&quot;.</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="193"/>
         <source>Finds headings with &apos;Jesus&apos;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="195"/>
         <source>footnote:Jesus AND footnote:said</source>
         <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
         <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
         <source>strong:G846</source>
         <comment>Do not translate &quot;strong:&quot;.</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="202"/>
         <source>Finds verses with Strong&apos;s Greek number 846</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="204"/>
         <source>morph:&quot;N-NSF&quot;</source>
         <comment>Do not translate &quot;morph:&quot;.</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="206"/>
         <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="210"/>
         <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
         <translation></translation>
     </message>
@@ -4973,31 +4835,19 @@ Language name ppk</extracomment>
         <translation>Tulosta...</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Kopioi hakutulos...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="231"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="241"/>
         <source>Copying search result</source>
         <translation>Kopioidaan hakutulosta</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Tallenna hakutulos...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="250"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="259"/>
         <source>Saving search result</source>
         <translation>Tallennetaan hakutulosta</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Tulosta hakutulos...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="268"/>
         <source>Printing search result</source>
         <translation>Tulostetaan hakutulosta</translation>
     </message>
@@ -5045,14 +4895,6 @@ Language name ppk</extracomment>
         <translation>Uusi alue</translation>
     </message>
     <message>
-        <source>&lt;invalid name of search range&gt;</source>
-        <translation type="obsolete">&lt;hakualueella virheellinen nimi&gt;</translation>
-    </message>
-    <message>
-        <source>Select a scope from the list to edit the search ranges</source>
-        <translation type="obsolete">Valitse hakualue luettelosta muokataksesi hakua</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="140"/>
         <source>&amp;Add new scope</source>
         <translation>&amp;Lisää uusi hakualue</translation>
@@ -5078,10 +4920,6 @@ Language name ppk</extracomment>
         <translation>Muuta valitun hakualueen nimeä</translation>
     </message>
     <message>
-        <source>Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="obsolete">Muuta valitun hakualueen laajuutta. Katso valmiiksi määriteltyjä hakualueita nähdäksesi miten hakualueita muodostetaan.</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="158"/>
         <source>The search ranges which will be used for the search, parsed to the canonical form</source>
         <translation>Lopulliseen muotoon jäsennetyt alueet, joita käytetään haussa</translation>
@@ -5095,48 +4933,42 @@ Language name ppk</extracomment>
 <context>
     <name>Search::CSearchDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="130"/>
         <source>Missing indices</source>
         <translation>Puuttuvat hakemistot</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="87"/>
         <source>Search</source>
         <translation>Etsi</translation>
     </message>
     <message>
-        <source>One or more works need indexing before they can be searched.
-This could take a long time. Proceed with indexing?</source>
-        <translation type="obsolete">Yksi tai useampi teos tulee indeksoida ennenkuin niitä voi käyttää haussa.
-Tämä voi viedä pitkän ajan. Haluatko indeksoida?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="131"/>
         <source>The following modules need to be indexed before they can be searched in:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="132"/>
         <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="236"/>
         <source>Drag any verse reference onto an open Bible window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="241"/>
         <source>&amp;Analyze results...</source>
         <translation>&amp;Analysoi tulokset...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="242"/>
         <source>Show a graphical analysis of the search result</source>
         <translation>Näytä hakutuloksista graafinen analyysi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="248"/>
         <source>&amp;Close</source>
         <translation>&amp;Sulje</translation>
     </message>
@@ -5177,31 +5009,19 @@ Tämä voi viedä pitkän ajan. Haluatko indeksoida?</translation>
         <translation>Tulosta...</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Tulosta hakutulos...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="164"/>
         <source>Printing search result</source>
         <translation>Tulostetaan hakutulosta</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Tallenna hakutulos...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="192"/>
         <source>Saving search result</source>
         <translation>Tallennetaan hakutulosta</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Kopioi hakutulos...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="210"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="228"/>
         <source>Copying search result</source>
         <translation>Kopioidaan hakutulosta</translation>
     </message>
@@ -5214,91 +5034,6 @@ Tämä voi viedä pitkän ajan. Haluatko indeksoida?</translation>
 <context>
     <name>StandardWorksTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>Raamattu:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>Oletusraamattua käytetään kun hyperlinkki Raamattuun valitaan</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>Kommentaari:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>Oletuskommentaaria käytetään kun hyperlinkki kommentaariin valitaan</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation>Sanakirja:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>Oletussanakirjaa käytetään kun hyperlinkki sanakirjaan valitaan</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>Päivittäinen hartaus:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>Oletushartauskirjasta näytetään päivittäinen Raamatun jae käynnistettäessä</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>Hepreankielinen Strongin sanasto:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>Standardia hepreankielistä sanastoa käyteään kun hyperlinkki hepreankieliseen sanastoon valitaan</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>Kreikankielinen Strongin sanasto:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>Standardia kreikankielistä sanastoa käytetään kun hyperlinkki kreikankielen sanastoon valitaan</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>Heprealainen morfologinen sanasto:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>Standardia hepreankielen morfologista sanastoa käytetään kun morfologinen linkki valitaan heprealaisissa teksteissä</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation>Kreikkalainen morfologinen sanasto:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>Standardia kreikankielen morfologista sanastoa käytetään kun morfologinen linkki valitaan kreikkalaisissa teksteissä</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="53"/>
         <source></source>
         <translation></translation>
@@ -5307,112 +5042,97 @@ Tämä voi viedä pitkän ajan. Haluatko indeksoida?</translation>
 <context>
     <name>TextFiltersTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation type="unfinished">Lisää rivinvaihto jokaisen jakeen perään</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">Näytä jaenumerot</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation type="unfinished">Näytä kappaleiden otsikot</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">Näytä kirjoitusten ristiviitteet</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">Näytä kreikan korkomerkit</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Näytä heprean vokaalipisteet</translation>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="262"/>
+        <source></source>
+        <translation></translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallProgress</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Näytä heprean kantillaatiomerkit</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="81"/>
+        <source>Failed</source>
+        <translation type="unfinished">Epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">Näytä morfologinen segmentointi</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="84"/>
+        <source>Completed</source>
+        <translation type="unfinished">Valmis</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation type="unfinished">Käytä tekstivariantteja</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="90"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">Keskeytetty</translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallSources</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="unfinished">Näyttösuotimet määrittelevät millä tavoin teksti näytetään. Tässä voit asettaa oletusasetukset kaikille suotimille. Voit kuitenkin ohittaa nämä ja määritellä erikseen jokaiselle ikkunalle omat asetukset.</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installsources.cpp" line="63"/>
+        <source>Failed to refresh source %1</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="262"/>
-        <source></source>
-        <translation></translation>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="59"/>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="62"/>
+        <source>The text you want to search for</source>
+        <translation type="unfinished">Haluamasi hakuteksti</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation>Etsi tekstiä</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="135"/>
+        <source>New Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation>Haluamasi hakuteksti</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="136"/>
+        <source>View Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation>Huomioi merkkikoko</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="137"/>
+        <source>Text Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation>Huomioi &amp;merkkiko</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="138"/>
+        <source>User Interface Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation>Etsi edellinen paikka</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="141"/>
+        <source>Bookshelf Manager</source>
+        <translation type="unfinished">Kirjahyllyn hallinta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation>&amp;Edellinen</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="187"/>
+        <source>Single</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation>Etsi seuraava paikka</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="188"/>
+        <source>Tabbed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation>&amp;Seuraava</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="189"/>
+        <source>Auto-tile</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation>Sulje ikkuna</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="190"/>
+        <source>Auto-tile horizontally</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Sulje</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="191"/>
+        <source>Auto-tile vertically</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/messages/bibletime_ui_fr.ts b/i18n/messages/bibletime_ui_fr.ts
deleted file mode 100644
index 44bfb83..0000000
--- a/i18n/messages/bibletime_ui_fr.ts
+++ /dev/null
@@ -1,5409 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
-<context>
-    <name></name>
-    <message>
-        <source></source>
-        <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
-This file is distributed under the same license as the Bibetime package.</translatorcomment>
-        <translation>Interface utilisateur BibleTime
-Copyright (C) 2012 L&apos;équipe de BibleTime, http://www.bibletime.info
-Ce fichier est distribué sous la même licence que le paquet BibleTime.</translation>
-    </message>
-</context>
-<context>
-    <name>BTAboutModuleDialog</name>
-    <message>
-        <location filename="../../src/frontend/btaboutmoduledialog.cpp" line="45"/>
-        <source>Information About %1</source>
-        <translation>Informations sur %1</translation>
-    </message>
-</context>
-<context>
-    <name>BibleTime</name>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
-        <source>&amp;File</source>
-        <translation>&amp;Fichier</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
-        <source>&amp;View</source>
-        <translation>&amp;Vue</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
-        <source>&amp;Search</source>
-        <translation>&amp;Rechercher</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
-        <source>&amp;Window</source>
-        <translation>Fe&amp;nêtre</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
-        <source>Se&amp;ttings</source>
-        <translation>Configura&amp;tion</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
-        <source>&amp;Help</source>
-        <translation>&amp;Aide</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
-        <source>&amp;Show toolbar</source>
-        <translation>&amp;Afficher la barre d&apos;outil</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
-        <source>&amp;Fullscreen mode</source>
-        <translation>Mode &amp;plein écran</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Quitter</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
-        <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
-        <translation>Ouvrir le guide l&apos;étude biblique contenu dans BibleTime.&lt;br/&gt;Ce guide est une introduction sur comment étudier la Bible de manière efficace.</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
-        <source>Information about the BibleTime program</source>
-        <translation>Informations sur le programme BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation type="unfinished">&amp;Sauvegarder profil</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>Ouvrir profi&amp;l</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
-        <source>&amp;Delete session</source>
-        <translation>&amp;Effacer le profil</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
-        <source>&amp;Arrangement mode</source>
-        <translation>Mode d&apos;&amp;arrangement</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
-        <source>&amp;Manual mode</source>
-        <translation>&amp;Mode manuel</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
-        <source>Auto-tile &amp;vertically</source>
-        <translation>Mosaïque &amp;verticale</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
-        <source>Auto-tile &amp;horizontally</source>
-        <translation>Mosaïque &amp;horizontale</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
-        <source>Auto-&amp;cascade</source>
-        <translation>Auto &amp;cascade</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
-        <source>&amp;Cascade</source>
-        <translation>&amp;Cascade</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
-        <source>Tile &amp;vertically</source>
-        <translation>Mosaïque &amp;verticale</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
-        <source>Tile &amp;horizontally</source>
-        <translation>Mosaïque &amp;horizontale</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
-        <source>Cl&amp;ose all windows</source>
-        <translation>Fermer toutes les fenêtres</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
-        <source>Close all open windows inside BibleTime</source>
-        <translation>Fermer toutes les fenêtres ouvertes dans BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
-        <source>&amp;Handbook</source>
-        <translation>&amp;Manuel</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
-        <source>&amp;Bible Study Howto</source>
-        <translation>Tutoriel d&apos;étude &amp;Biblique</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
-        <source>Please enter a name for the new session.</source>
-        <translation>Entrer un nom pour la nouvelle session.</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
-        <source>Quit BibleTime</source>
-        <translation>Quitter BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
-        <source>Toggle fullscreen mode of the main window</source>
-        <translation>Activer/désactiver le plein écran de la fenêtre principale</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
-        <source>Search in &amp;open works...</source>
-        <translation>Rechercher dans le(s) module(s) &amp;ouvert(s)...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
-        <source>Search in standard &amp;Bible...</source>
-        <translation>Rechercher dans la &amp;Bible par défaut...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
-        <source>Save as &amp;new session...</source>
-        <translation>Sauver comme &amp;nouveau profil...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
-        <source>Create and save a new session</source>
-        <translation>Créer et sauvegarder un nouveau profil</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
-        <source>Manually arrange the open windows</source>
-        <translation>Arranger manuellement les fenêtres ouvertes</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
-        <source>Automatically tile the open windows vertically (arrange side by side)</source>
-        <translation>Fenêtres disposées en mosaïque verticale automatiquement (côte à côte)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
-        <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
-        <translation>Fenêtres disposées en mosaïque horizontale automatiquement (les unes sur les autres)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
-        <source>Auto-&amp;tile</source>
-        <translation type="unfinished">Arrangement automatique</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
-        <source>Automatically tile the open windows</source>
-        <translation type="unfinished">Arrangement automatique des fenêtres ouvertes</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
-        <source>Ta&amp;bbed</source>
-        <translation type="unfinished">Onglets</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
-        <source>Automatically tab the open windows</source>
-        <translation type="unfinished">Changer les fenêtres ouvertes en onglets</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
-        <source>Automatically cascade the open windows</source>
-        <translation>Fenêtres disposées en cascade automatiquement</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
-        <source>Cascade the open windows</source>
-        <translation>Mise en cascade des fenêtres d&apos;affichage ouvertes</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
-        <source>&amp;Tile</source>
-        <translation type="unfinished">Arranger</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
-        <source>Tile the open windows</source>
-        <translation type="unfinished">Arranger les fenêtres ouvertes</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
-        <source>Vertically tile (arrange side by side) the open windows</source>
-        <translation>Fenêtres ouvertes disposées en mosaïque verticale automatiquement (côte à côte)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
-        <source>Horizontally tile (arrange on top of each other) the open windows</source>
-        <translation>Fenêtres ouvertes disposées en mosaïque horizontale automatiquement (les unes sur les autres)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
-        <source>Close &amp;window</source>
-        <translation>Fermer &amp;Fenêtre</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
-        <source>Close the current open window</source>
-        <translation>Fermer la fenêtre actuelle</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
-        <source>&amp;Configure BibleTime...</source>
-        <translation>&amp;Configurer BibleTime...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
-        <source>Set BibleTime&apos;s preferences</source>
-        <translation>Définir les préférences de BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
-        <source>Bookshelf &amp;Manager...</source>
-        <translation>Gestionnaire de &amp;Bibliothèque...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
-        <source>Configure your bookshelf and install/update/remove/index works</source>
-        <translation>Configurer votre bibliothèque et la mettre à jour</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
-        <source>Open BibleTime&apos;s handbook</source>
-        <translation>Ouvrir le manuel de BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
-        <source>&amp;Tip of the day...</source>
-        <translation type="unfinished">&amp;Astuce du jour...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
-        <source>Show tips about BibleTime</source>
-        <translation type="unfinished">Afficher des astuces à propos de BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
-        <source>Toggle visibility of the bookshelf window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
-        <source>Toggle visibility of the bookmarks window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
-        <source>Toggle visibility of the mag window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
-        <source>Main toolbar</source>
-        <translation type="unfinished">Barre d&apos;outils principale</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
-        <source>Navigation toolbar</source>
-        <translation type="unfinished">Barre d&apos;outils navigation</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
-        <source>Works toolbar</source>
-        <translation type="unfinished">Barre d&apos;outils modules</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
-        <source>Tools toolbar</source>
-        <translation type="unfinished">Barre d&apos;outils outils</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
-        <source>Format toolbar</source>
-        <translation type="unfinished">Barre d&apos;outils format</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
-        <source>Show main toolbar</source>
-        <translation type="unfinished">Afficher la barre d&apos;outils principale</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
-        <source>Show navigation bar</source>
-        <translation type="unfinished">Afficher la barre d&apos;outils navigation</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
-        <source>Show works toolbar</source>
-        <translation type="unfinished">Afficher la barre d&apos;outils modules</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
-        <source>Show tools toolbar</source>
-        <translation type="unfinished">Afficher la barre d&apos;outils outils</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
-        <source>Show formatting toolbar</source>
-        <translation type="unfinished">Afficher la barre d&apos;outils format</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
-        <source>Show bookshelf</source>
-        <translation type="unfinished">Afficher la bibliothèque</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
-        <source>Show bookmarks</source>
-        <translation type="unfinished">Afficher les signets</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
-        <source>Show mag</source>
-        <translation type="unfinished">Afficher le zoom</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
-        <source>Toolbars</source>
-        <translation type="unfinished">Barres d&apos;outils</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
-        <source>Show toolbars in text windows</source>
-        <translation type="unfinished">Afficher les barres d&apos;outils dans les fenêtres de texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
-        <source>Show parallel text headers</source>
-        <translation type="unfinished">Afficher les en-têtes textuels parallèlement</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
-        <source>O&amp;pen windows</source>
-        <translation type="unfinished">Fenêtres ouvertes</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
-        <source>Show &quot;Whats this widget&quot; dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
-        <source>Whats this widget?</source>
-        <translation type="unfinished">Qu&apos;est-ce que ce gadget?</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
-        <source>Search in all works that are currently open</source>
-        <translation>Recherche dans tous les modules actuellement ouverts</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
-        <source>Search in the standard Bible</source>
-        <translation>Rechercher dans la Bible par défaut</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
-        <source>New Session</source>
-        <translation>Nouveau profil</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
-        <source>Initializing the SWORD engine...</source>
-        <translation>L&apos;initialisation du moteur SWORD...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
-        <source>Creating BibleTime&apos;s user interface...</source>
-        <translation>Création d&apos;interface utilisateur BibleTime...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
-        <source>Initializing menu- and toolbars...</source>
-        <translation>Initialisation des menus et barres d&apos;outils...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
-        <source>Unlock Work</source>
-        <translation>Déverrouiller le module</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
-        <source>Enter the unlock key for %1.</source>
-        <translation type="unfinished">Entrer la clef de déverrouillage pour %1.</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
-        <source>Warning: Invalid unlock key!</source>
-        <translation type="unfinished">Attention: clef de déverrouillage invalide!</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
-        <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
-        <translation type="unfinished">La clef de déverrouillage fournie ne débloque pas correctement ce module. Veuillez Essayer de nouveau.</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
-        <source>&amp;About BibleTime</source>
-        <translation>&amp;A propos de BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
-        <source>Bookmarks</source>
-        <translation>Signets</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
-        <source>Mag</source>
-        <translation>Zoom</translation>
-    </message>
-</context>
-<context>
-    <name>BibleTimeApp</name>
-    <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
-        <source>Fatal error!</source>
-        <translation type="unfinished">Erreur fatale!</translation>
-    </message>
-</context>
-<context>
-    <name>BtAboutDialog</name>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
-        <source>BibleTime is an easy to use but powerful Bible study tool.</source>
-        <translation>BibleTime est un outil facile à utiliser mais puissant outil d&apos;étude biblique.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="271"/>
-        <source>BibleTime is released under the GPL license. You can download and use the program for personal, private, public or commercial purposes without restrictions, but can give away or distribute the program only if you also distribute the corresponding source code.</source>
-        <translation type="unfinished">BibleTime est sous licence GPL. Vous pouvez télécharger et utiliser le programme pour un usage personne, privé ou public ou même commercial sans restriction mais vous devez donner ou distribuer le programme seulement avec son code source.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="277"/>
-        <source>The complete legally binding license is below.</source>
-        <translation>La licence complète juridiquement valable est ci-dessous.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
-        <source>About BibleTime</source>
-        <translation>À propos de BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
-        <source>&amp;BibleTime</source>
-        <translation type="unfinished">&amp;BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
-        <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
-        <translation type="unfinished">Nous recherchons des développeurs et des traducteurs. Si vous souhaitez rejoindre l&apos;équipe, envoyez un e-mail à %1.</translation>
-    </message>
-    <message>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation type="obsolete">(c)1999-2013, L&apos;équipe de BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
-        <source>&amp;Contributors</source>
-        <translation type="unfinished">Contributeurs</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
-        <source>The following people contributed to BibleTime:</source>
-        <translation>Les personnes suivantes ont contribué à BibleTime:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
-        <source>documentation and translation manager</source>
-        <translation>documentation et gestionnaire de traduction</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
-        <source>project manager</source>
-        <translation type="unfinished">gestionnaire du projet</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
-        <source>tester</source>
-        <translation type="unfinished">testeur</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
-        <source>usability expert</source>
-        <translation type="unfinished">ergonome</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="220"/>
-        <source>Some names may be missing, please email %1 if you notice errors or omissions.</source>
-        <translation type="unfinished">Des noms peuvent manquer, veuillez envoyer un e-mail à %1 si vous remarquez des erreurs ou des oublis.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="237"/>
-        <source>BibleTime makes use of the SWORD Project. The SWORD Project is the CrossWire Bible Society&apos;s free Bible software project. Its purpose is to create cross-platform open-source tools &amp;mdash; covered by the GNU General Public License &amp;mdash; that allow programmers and Bible societies to write new Bible software more quickly and easily.</source>
-        <translation type="unfinished">BibleTime utilise le projet SWORD. Le projet SWORD est le projet de logiciel libre biblique de CrossWire Bible Society. Son but est de créer un outil libre multi-plateformes &amp;mdash;sous licence GNU General Public Licence&amp;mdash; qui permet au développeurs et aux sociétés bibliques d&apos;écrire de nouveaux logiciels bibliques rapidement et facilement.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="243"/>
-        <source>The SWORD Project: </source>
-        <translation type="unfinished">Le projet SWORD: </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="251"/>
-        <source>&amp;Qt</source>
-        <translation type="unfinished">&amp;Qt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="254"/>
-        <source>Qt toolkit version %1</source>
-        <translation type="unfinished">Boîte à outils Qt version %1</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="260"/>
-        <source>More info...</source>
-        <translation type="unfinished">Plus d&apos;informations...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="265"/>
-        <source>&amp;License</source>
-        <translation type="unfinished">&amp;Licence</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
-        <source>designer</source>
-        <translation>concepteur</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation type="unfinished">(c)1999-2013, L&apos;équipe de BibleTime {1999-2013,?}</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
-        <source>developer</source>
-        <translation>développeur</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
-        <source>project founder</source>
-        <translation type="unfinished">fondateur du projet</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
-        <source>packager</source>
-        <translation>maintaineur</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
-        <source>creator of The Sword Project</source>
-        <translation>créateur du projet Sword</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
-        <source>domain sponsor</source>
-        <translation>Commanditaire de domaine</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
-        <source>howto</source>
-        <translation>guide</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
-        <source>artist</source>
-        <translation type="unfinished">artiste</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
-        <source>documentation</source>
-        <translation>documentation</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
-        <source>The following people translated BibleTime into their language:</source>
-        <translation>Les personnes suivantes ont traduit BibleTime dans leur langue:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="231"/>
-        <source>&amp;SWORD</source>
-        <translation type="unfinished">&amp;SWORD</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="235"/>
-        <source>SWORD library version %1</source>
-        <translation>Version de la bibliothèque SWORD %1</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="256"/>
-        <source>This program uses Qt version %1.</source>
-        <translation>Ce programme utilise la version %1 de Qt.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="258"/>
-        <source>Qt is a cross-platform application and UI framework, created with C++ language. It has been released under the LGPL license.</source>
-        <translation>Qt est une application multi-plateforme avec Interface-Graphique, développée enlangage C++. Elle est disponible sous la licence LGPL.</translation>
-    </message>
-</context>
-<context>
-    <name>BtBibleKeyWidget</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="unfinished">Défiler dans les entrées de la liste. Appuyer sur ce bouton et déplacer la souris pour avancer/reculer parmi les éléments.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
-        <source>Next book</source>
-        <translation type="unfinished">Livre suivant</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
-        <source>Previous book</source>
-        <translation type="unfinished">Livre précédent</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
-        <source>Next chapter</source>
-        <translation type="unfinished">Chapitre suivant</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
-        <source>Previous chapter</source>
-        <translation type="unfinished">Chapitre précédent</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
-        <source>Next verse</source>
-        <translation type="unfinished">Verset suivant</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
-        <source>Previous verse</source>
-        <translation type="unfinished">Verset précédent</translation>
-    </message>
-</context>
-<context>
-    <name>BtBookDropdownChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="64"/>
-        <source>Select book</source>
-        <translation>Sélectionner livre</translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfDockWidget</name>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="150"/>
-        <source>Bookshelf</source>
-        <translation>Bibliothèque</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="152"/>
-        <source>&amp;Open</source>
-        <translation>&amp;Ouvrir</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="153"/>
-        <source>&amp;Edit</source>
-        <translation>Modifi&amp;er</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="154"/>
-        <source>&amp;Plain text</source>
-        <translation>&amp;Texte brut</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="155"/>
-        <source>&amp;HTML</source>
-        <translation>&amp;HTML</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="156"/>
-        <source>&amp;Unlock...</source>
-        <translation>Déverro&amp;uiller...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="157"/>
-        <source>&amp;About...</source>
-        <translation>&amp;A propos...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="159"/>
-        <source>There are currently no works installed. Please click the button below to install new works.</source>
-        <translation type="unfinished">Il n&apos;y a actuellement aucun module d&apos;installé. Cliquez sur le bouton ci-dessous pour en installer de nouveaux.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="161"/>
-        <source>&amp;Install works...</source>
-        <translation type="unfinished">&amp;Installer des modules...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="173"/>
-        <source>Warning: Module locked!</source>
-        <translation type="unfinished">Attention: Module verrouillé!</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="174"/>
-        <source>You are trying to access an encrypted module. Please provide an unlock key in the following dialog to open the module.</source>
-        <translation type="unfinished">Vous essayez d&apos;accéder à un module crypté. Veuillez fournir une clé de déblocage dans la boîte de dialogue suivante pour débloquer le module.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="223"/>
-        <source>&amp;Search in %1...</source>
-        <translation>Recherche en cour&amp;s dans%1...</translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfGroupingMenu</name>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
-        <source>Category/Language</source>
-        <translation type="unfinished">Catégorie/Langue</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
-        <source>Category</source>
-        <translation type="unfinished">Catégorie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
-        <source>Language/Category</source>
-        <translation type="unfinished">Catégorie/Langue</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
-        <source>Language</source>
-        <translation type="unfinished">Langue</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
-        <source>No grouping</source>
-        <translation type="unfinished">Pas de groupement</translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfModel</name>
-    <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
-        <source>Module</source>
-        <translation>Module</translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfWidget</name>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
-        <source>Fi&amp;lter:</source>
-        <translation type="unfinished">Fi&amp;ltrer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
-        <source>Grouping</source>
-        <translation type="unfinished">Grouper</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
-        <source>Change the grouping of items in the bookshelf.</source>
-        <translation type="unfinished">Changer le groupement d&apos;éléments dans la bibliothèque.</translation>
-    </message>
-    <message>
-        <source>Category/Language</source>
-        <translation type="obsolete">Catégorie/Langue</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Catégorie</translation>
-    </message>
-    <message>
-        <source>Language/Category</source>
-        <translation type="obsolete">Catégorie/Langue</translation>
-    </message>
-    <message>
-        <source>Language</source>
-        <translation type="obsolete">Langue</translation>
-    </message>
-    <message>
-        <source>No grouping</source>
-        <translation type="obsolete">Pas de groupement</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
-        <source>Show/hide works</source>
-        <translation type="unfinished">Afficher/Masquer les Å“uvres</translation>
-    </message>
-</context>
-<context>
-    <name>BtChapterDropdownChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
-        <source>Select chapter</source>
-        <translation>Choisir le chapitre</translation>
-    </message>
-</context>
-<context>
-    <name>BtDisplaySettingsButton</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
-        <source>Use linebreaks after each verse</source>
-        <translation type="unfinished">Revenir à la ligne après chaque verset</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">Afficher les numéros de verset</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
-        <source>Show headings</source>
-        <translation type="unfinished">Afficher les en-têtes</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
-        <source>Highlight words of Jesus</source>
-        <translation type="unfinished">Paroles de Jésus</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Afficher les voyelles hébraïques</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Afficher la cantillation hébraïque</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">Afficher les accents grecs</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
-        <source>Use alternative textual variant</source>
-        <translation type="unfinished">Utiliser les variantes textuelles</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">Afficher les références croisées</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
-        <source>Show footnotes</source>
-        <translation type="unfinished">Afficher les notes de bas de page</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">Afficher la segmentation morphologique</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
-        <source>Display settings</source>
-        <translation type="unfinished">Afficher la configuration</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
-        <source>Display settings: No options available</source>
-        <translation type="unfinished">Options d&apos;affichage : Pas d&apos;option disponible</translation>
-    </message>
-</context>
-<context>
-    <name>BtEditBookmarkDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
-        <source>Edit Bookmark</source>
-        <translation type="unfinished">Editer le signet</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
-        <source>Location:</source>
-        <translation type="unfinished">Emplacement:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
-        <source>Title:</source>
-        <translation type="unfinished">Titre:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
-        <source>Description:</source>
-        <translation type="unfinished">Description:</translation>
-    </message>
-</context>
-<context>
-    <name>BtFontChooserWidget</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
-        <source>Font name:</source>
-        <translation type="unfinished">Nom police:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="98"/>
-        <source>Font style:</source>
-        <translation type="unfinished">Style de police:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="99"/>
-        <source>Size:</source>
-        <translation type="unfinished">Dimension:</translation>
-    </message>
-</context>
-<context>
-    <name>BtFontSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
-        <source>&amp;Language:</source>
-        <translation type="unfinished">&amp;Langue:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
-        <source>The font selection below will apply to all texts in this language</source>
-        <translation type="unfinished">Le choix de la police ci-dessous s&apos;appliquera à tous les textes écrits dans cette langue</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
-        <source>Use custom font</source>
-        <translation type="unfinished">Utiliser une police personnalisée</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
-        <source>Optionally specify a custom font for each language:</source>
-        <translation type="unfinished">Spécifier optionnellement une police pour chaque langue:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
-        <source>Fonts</source>
-        <translation type="unfinished">Polices</translation>
-    </message>
-</context>
-<context>
-    <name>BtIndexPage</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
-        <source>%1 KiB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
-        <source>0 KiB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
-        <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
-        <translation>Si sélectionné, ces indexes qui n&apos;ont pas de modules associés seront supprimés quand BibleTime démarre</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
-        <source>Automatically delete orphaned indexes when BibleTime starts</source>
-        <translation>Supprimer automatiquement les indexes orphelins quand BibleTime démarre</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
-        <source>Delete the selected indexes</source>
-        <translation>Supprimer les indexes sélectionnés</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
-        <source>Delete</source>
-        <translation>Supprimer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
-        <source>Create new indexes for the selected works</source>
-        <translation>Créer de nouveaux indexes pour les modules sélectionnés</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
-        <source>Work</source>
-        <translation>Module</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
-        <source>Index size</source>
-        <translation>Taille de l&apos;index</translation>
-    </message>
-    <message>
-        <source>Create new search indexes and delete created indexes for the installed works.</source>
-        <translation type="obsolete">Créer de nouveaux indexes de recherche et supprimer les indexes crées pour les modules installés.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
-        <source>Search Indexes</source>
-        <translation>Indexes de recherche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
-        <source>Indexed Works</source>
-        <translation>Répertorié œuvres</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
-        <source>Unindexed Works</source>
-        <translation>Œuvres non indexées</translation>
-    </message>
-    <message>
-        <source>KiB</source>
-        <translation type="obsolete">Ko</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
-        <source>Create...</source>
-        <translation>Créer...</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallModuleChooserDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="64"/>
-        <source>Install/Update works?</source>
-        <translation type="unfinished">Installation/MàJ de modules?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="67"/>
-        <source>Do you really want to install these works?</source>
-        <translation type="unfinished">Voulez-vous vraiment installer ces modules ?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="68"/>
-        <source>Only one version of a work can be installed at the same time. Select only one if there are items marked with red.</source>
-        <translation type="unfinished">Seulement une version d&apos;un module peut-être installée à la fois. Ne sélectionner qu&apos;un seul des éléments marqués en rouge.</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallModuleChooserDialogModel</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
-        <source>Work</source>
-        <translation type="unfinished">Module</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
-        <source>Installation source</source>
-        <translation type="unfinished">Source d&apos;installation</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
-        <source>Version</source>
-        <translation type="unfinished">Version</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPage</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="263"/>
-        <source>Install/Update</source>
-        <translation>Installer/Mettre à jour</translation>
-    </message>
-    <message>
-        <source>Install and update works. Add remote or local sources, refresh them, select the works to be installed/updated and click Install.&lt;br/&gt;&lt;b&gt;WARNING:&lt;/b&gt; If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="obsolete">Installer et mettre à jour les modules. Ajoutez des sources locales ou distantes, actualisez-les, choisissez les modules à installer/mettre à jour et cliquez sur Installer.&lt;br/&gt;&lt;b&gt;ATTENTION:&lt;/b&gt; Si vous habitez dans un pays persecutté et ne voulez pas prendre le risque d&apos;être détectés, n&apos;utilisez pas les sources distantes.</translation>
-    </message>
-    <message>
-        <source>Install folder:</source>
-        <translation type="obsolete">Dossier d&apos;installation:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="265"/>
-        <source>WARNING!!!</source>
-        <translation type="unfinished">ATTENTION!!!</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="266"/>
-        <source>If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="unfinished">Si vous vivez dans un pays persécuté et que vous ne voulez pas prendre le risque de vous faire détecter, n&apos;utilisez pas de sources distantes.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="269"/>
-        <source>Select installation &amp;source:</source>
-        <translation type="unfinished">Sélectionner une &amp;source d&apos;installation:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="270"/>
-        <source>&amp;Add...</source>
-        <translation type="unfinished">Ajouter...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="271"/>
-        <source>Add new source</source>
-        <translation type="unfinished">Ajouter une nouvelle source</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="272"/>
-        <source>&amp;Delete...</source>
-        <translation type="unfinished">Supprimer...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="273"/>
-        <source>Delete this source</source>
-        <translation type="unfinished">Supprimer cette source</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="275"/>
-        <source>Select &amp;works to install:</source>
-        <translation type="unfinished">Sélectionner les &amp;modules à installer:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="277"/>
-        <source>Install &amp;folder:</source>
-        <translation type="unfinished">Dossier d&apos;&amp;installation:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="278"/>
-        <source>The folder where the new works will be installed</source>
-        <translation>Dossier où les nouveaux modules seront installés</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="279"/>
-        <source>Configure folders where works are installed and found</source>
-        <translation>Selectionnez le dossier où les modules sont installés</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="280"/>
-        <source>&amp;Install...</source>
-        <translation type="unfinished">&amp;Installer...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="254"/>
-        <source>Start installation of %1 works from %2 sources:</source>
-        <translation type="unfinished">Démarrer l&apos;installation de %1 modules de %2 sources:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="258"/>
-        <source>Start installation:</source>
-        <translation type="unfinished">Démarrer l&apos;installation:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="313"/>
-        <source>Warning</source>
-        <translation type="unfinished">Mise en garde</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="313"/>
-        <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="unfinished">Le dossier de destination n&apos;est pas accessible en écriture ou n&apos;existe pas. L&apos;installation va échouer à moins que cela ne soit fixé.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
-        <source>Delete Source?</source>
-        <translation type="unfinished">Supprimer la source ?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
-        <source>Do you really want to delete this source?</source>
-        <translation type="unfinished">Voulez-vous vraiment supprimer cette source?</translation>
-    </message>
-    <message>
-        <source>Install...</source>
-        <translation type="obsolete">Installer...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="281"/>
-        <source>Install or update selected works</source>
-        <translation>Installer ou mettre à jour les modules sélectionnés</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPageModel</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
-        <source>Work</source>
-        <translation type="unfinished">Module</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
-        <source>Version</source>
-        <translation type="unfinished">Version</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
-        <source>Description</source>
-        <translation type="unfinished">Description</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPageWorksWidget</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp" line="68"/>
-        <source>Refresh the list of works from this source</source>
-        <translation type="unfinished">Rafraîchir la liste de modules à partir de cette source</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPathDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
-        <source>Bookshelf Folders</source>
-        <translation>Dossier de la Bibliothèque</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
-        <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
-        <translation>Les modules peuvent être installés dans un ou plusieurs dossiers. Aprèrs création des dossiers, ici vous pouvez en choisir un sur la page d&apos;installation.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
-        <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
-        <translation>BibleTime et la bibliothèque de SWORD retrouvent les modules contenus dans tous ces dossiers là. Si un dossier venait à être supprimé,il système toujours garder une copie ici avec tous les modules intacts.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
-        <source>Configure bookshelf folders</source>
-        <translation>Configurer les dossiers bilbliothèques</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
-        <source>Configuration file for the folders is: </source>
-        <translation>Le fichier de configuration pour ce dossier est:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
-        <source>Folders where new works can be installed</source>
-        <translation>Dossiers où les nouveaux modules peuvent être installés</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
-        <source>Read-only folders</source>
-        <translation>Dossiers en lecture-seule</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
-        <source>Nonexistent folders</source>
-        <translation>Dossiers inexistants</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
-        <source>&amp;Add...</source>
-        <translation>&amp;Ajouter...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
-        <source>Add new folder</source>
-        <translation>Créer un nouveau dossier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
-        <source>&amp;Edit...</source>
-        <translation>&amp;Modifier...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
-        <source>Edit the selected folder</source>
-        <translation>Modifier le dossier sélectionné</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
-        <source>&amp;Remove</source>
-        <translation>&amp;Supprimer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
-        <source>Remove the selected folder</source>
-        <translation>Supprimer le dossier sélectionné</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
-        <source>This default folder in your home directory can&apos;t be removed</source>
-        <translation>Ce dossier par défaut ne pas peut être supprimé du dossier principal</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
-        <source>Choose Folder</source>
-        <translation>Choisir le dossier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
-        <source>Use Folder?</source>
-        <translation>Utiliser le dossier ?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
-        <translation>Ce dossier ne peut pas être modifier, par conséquent les modules ne peuvent pas y être installés en utilisant BibleTime. Voulez-vous utiliser ce dossier au lieu du précédent ?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
-        <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
-        <translation>Ce dossier ne peut pas être modifié, par conséquent les modules ne peuvent pas y être installés en utilisant BibleTime. Voulez-vous l&apos;ajouter aux dossiers de bibliothèques ?</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallProgressDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
-        <source>Work</source>
-        <translation>Module</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
-        <source>Progress</source>
-        <translation>Avancement</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>Arrêter</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
-        <source>Stop All</source>
-        <translation>Arrêter tout</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
-        <source>Completed</source>
-        <translation>Terminé</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>Annulé</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
-        <source>Waiting for turn...</source>
-        <translation>Attendre son tour...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
-        <source>Preparing install...</source>
-        <translation>Préparation à l&apos;installation...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
-        <source>Install Progress</source>
-        <translation>Avancement de l&apos;installation</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
-        <source>Failed</source>
-        <translation>Échec</translation>
-    </message>
-</context>
-<context>
-    <name>BtLanguageSettingsPage</name>
-    <message>
-        <source>Select the language in which the Biblical book names are displayed.</source>
-        <translation type="obsolete">Sélectionner la langue d&apos;affichage des livres bibliques</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
-        <source>Language for names of Bible books:</source>
-        <translation type="unfinished">Langue pour les noms des livres bibliques:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation type="unfinished">Les languages pouvant être utilisés pour les noms des livres bibliques</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
-        <source>Languages</source>
-        <translation type="unfinished">Langues</translation>
-    </message>
-</context>
-<context>
-    <name>BtModuleChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="76"/>
-        <source>Select a work [%1]</source>
-        <translation type="unfinished">Sélectionner un module [%1]</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="79"/>
-        <source>Select an additional work</source>
-        <translation type="unfinished">Sélectionner un module additionnel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="102"/>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="130"/>
-        <source>NONE</source>
-        <translation type="unfinished">RIEN</translation>
-    </message>
-</context>
-<context>
-    <name>BtModuleIndexDialog</name>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="33"/>
-        <source>Preparing to index modules...</source>
-        <translation type="unfinished">Préparation de l&apos;indexation des modules...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="33"/>
-        <source>Cancel</source>
-        <translation type="unfinished">Annuler</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="37"/>
-        <source>Creating indices</source>
-        <translation type="unfinished">Création des indices</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="67"/>
-        <source>Creating index for work: %1</source>
-        <translation type="unfinished">Création d&apos;index pour module:%1</translation>
-    </message>
-</context>
-<context>
-    <name>BtModuleManagerDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
-        <source>Bookshelf Manager</source>
-        <translation>Gestionnaire de bibliothèque</translation>
-    </message>
-</context>
-<context>
-    <name>BtOpenWorkAction</name>
-    <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
-        <source>&amp;Open work</source>
-        <translation type="unfinished">&amp;Ouvrir un projet</translation>
-    </message>
-</context>
-<context>
-    <name>BtOpenWorkActionMenu</name>
-    <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
-        <source>&amp;Grouping order</source>
-        <translation type="unfinished">Ordre de &amp;groupement</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
-        <source>Sets the grouping order for the items in this menu.</source>
-        <translation type="unfinished">Définir l&apos;ordre de groupement pour les élements de ce menu.</translation>
-    </message>
-</context>
-<context>
-    <name>BtRefreshProgressDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="15"/>
-        <source>Refreshing source %1</source>
-        <translation type="unfinished">Rafraîchir la source %1</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="16"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Annuler</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="17"/>
-        <source>Connecting...</source>
-        <translation type="unfinished">Connexion...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="47"/>
-        <source>Warning</source>
-        <translation type="unfinished">Attention</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="48"/>
-        <source>Failed to refresh source %1</source>
-        <translation type="unfinished">Impossible de rafraîchir la source %1</translation>
-    </message>
-</context>
-<context>
-    <name>BtRemovePage</name>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">Supprimer</translation>
-    </message>
-    <message>
-        <source>Remove installed works. Select the works and click Remove button.</source>
-        <translation type="obsolete">Supprimer les modules installés. Sélectionnez les modules et cliquez sur le bouton Supprimer.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
-        <source>Select &amp;works to uninstall:</source>
-        <translation type="unfinished">Sélectionner des modules à &amp;désinstaller</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
-        <source>&amp;Remove...</source>
-        <translation type="unfinished">&amp;Supprimer...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
-        <source>Remove</source>
-        <translation type="unfinished">Supprimer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
-        <source>Start removal of %1 works:</source>
-        <translation type="unfinished">Démarrer la suppression de %1 modules:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
-        <source>Start removal:</source>
-        <translation type="unfinished">Démarrer la supression:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
-        <source>You selected the following work(s): </source>
-        <translation>Vous avez choisis le(s) modules(s) suivant(s): </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
-        <source>Do you really want to remove them from your system?</source>
-        <translation>Voulez-vous vraiment les supprimer de votre système?</translation>
-    </message>
-    <message>
-        <source>Remove...</source>
-        <translation type="obsolete">Supprimer...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
-        <source>Remove the selected works</source>
-        <translation>Supprimer les modules sélectionnés</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
-        <source>Remove Works?</source>
-        <translation>Supprimer les modules?</translation>
-    </message>
-</context>
-<context>
-    <name>BtRemovePageTreeModel</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp" line="52"/>
-        <source>Work</source>
-        <translation type="unfinished">Module</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp" line="55"/>
-        <source>Install path</source>
-        <translation type="unfinished">Chemin d&apos;installation</translation>
-    </message>
-</context>
-<context>
-    <name>BtSearchModuleChooserDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
-        <source>Works to Search in</source>
-        <translation type="unfinished">Modules dans lesquels effectuer la recherche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
-        <source>Select the works which should be searched.</source>
-        <translation type="unfinished">Sélectionnez les modules qui doivent être recherchés.</translation>
-    </message>
-</context>
-<context>
-    <name>BtShortcutsDialog</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="26"/>
-        <source>Configure shortcuts</source>
-        <translation>Configurer les raccourcis clavier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="35"/>
-        <source>Select first or second shortcut and type the shortcut with keyboard</source>
-        <translation>Sélectionnez le premier où second raccourci et saisissez le au clavier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="37"/>
-        <source>First shortcut</source>
-        <translation>Premier raccourci</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="42"/>
-        <source>Second shortcut</source>
-        <translation>Deuxième raccourci</translation>
-    </message>
-</context>
-<context>
-    <name>BtShortcutsEditor</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="180"/>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="187"/>
-        <source>Select to change key</source>
-        <translation>Sélectionnez de changer de clé</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
-        <source>Action
-name</source>
-        <translation>Action
-nom</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
-        <source>First
-shortcut</source>
-        <translation>Premier
-raccourci</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
-        <source>Second
-shortcut</source>
-        <translation>Deuxième
-raccourci</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="253"/>
-        <source>Shortcut for selected action name</source>
-        <translation>Raccourci pour nom de l&apos;action sélectionnée</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="259"/>
-        <source>None</source>
-        <translation>Rien</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="264"/>
-        <source>Default</source>
-        <translation>Défaut</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="269"/>
-        <source>Custom</source>
-        <translation>Personnalisé</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="284"/>
-        <source>Default key:</source>
-        <translation>Touche par défaut:</translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceArea</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">Module</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="obsolete">Description</translation>
-    </message>
-    <message>
-        <source>&amp;Add...</source>
-        <translation type="obsolete">Ajouter...</translation>
-    </message>
-    <message>
-        <source>Refresh...</source>
-        <translation type="obsolete">Rafraîchir...</translation>
-    </message>
-    <message>
-        <source>Refresh the list of works from this source</source>
-        <translation type="obsolete">Rafraîchir la liste de modules à partir de cette source</translation>
-    </message>
-    <message>
-        <source>&amp;Delete...</source>
-        <translation type="obsolete">Supprimer...</translation>
-    </message>
-    <message>
-        <source>Delete this source</source>
-        <translation type="obsolete">Supprimer cette source</translation>
-    </message>
-    <message>
-        <source>Add new source</source>
-        <translation type="obsolete">Ajouter une nouvelle source</translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceAreaModel</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">Module</translation>
-    </message>
-    <message>
-        <source>Version</source>
-        <translation type="obsolete">Version</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="obsolete">Description</translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceWidget</name>
-    <message>
-        <source>Delete Source?</source>
-        <translation type="obsolete">Supprimer la source ?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete this source?</source>
-        <translation type="obsolete">Voulez-vous vraiment supprimer cette source?</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Annuler</translation>
-    </message>
-    <message>
-        <source>Refreshing source</source>
-        <translation type="obsolete">Rafraîchir la source</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Connexion...</translation>
-    </message>
-    <message>
-        <source>Refreshing...</source>
-        <translation type="obsolete">Rafraîchissement...</translation>
-    </message>
-    <message>
-        <source>No sources were found in the SWORD configuration and BibleTime couldn&apos;t create a default source. Check your SWORD configuration and that the configuration path is writable. Then restart the Bookshelf Manager.</source>
-        <translation type="obsolete">Aucune source ont été trouvés dans la configuration de SWORD et bibletime n&apos;a pas pu créer une source par défaut. Vérifiez la configuration de votre épée et que le chemin de configuration est accessible en écriture. Puis redémarrez le Gestionnaire de Bookshelf.</translation>
-    </message>
-    <message>
-        <source>Remote:</source>
-        <translation type="obsolete">Distant:</translation>
-    </message>
-    <message>
-        <source>Local:</source>
-        <translation type="obsolete">Local:</translation>
-    </message>
-    <message>
-        <source>Not a directory!</source>
-        <translation type="obsolete">Pas un dossier!</translation>
-    </message>
-    <message>
-        <source>Not readable!</source>
-        <translation type="obsolete">Pas lisible!</translation>
-    </message>
-    <message>
-        <source>Warning</source>
-        <translation type="obsolete">Mise en garde</translation>
-    </message>
-    <message>
-        <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="obsolete">Le dossier de destination n&apos;est pas accessible en écriture ou n&apos;existe pas. L&apos;installation va échouer à moins que cela ne soit fixé.</translation>
-    </message>
-</context>
-<context>
-    <name>BtTextFiltersTab</name>
-    <message>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="obsolete">Les filtres contrôlent l&apos;apparence du texte. Ici vous pouvez choisir la configuration par défaut pour tous les filtres. Vous pouvez modifier cette configuration dans chaque fenêtre d&apos;affichage.</translation>
-    </message>
-    <message>
-        <source>Insert line break after each verse</source>
-        <translation type="obsolete">Revenir à la ligne après chaque verset</translation>
-    </message>
-    <message>
-        <source>Show verse numbers</source>
-        <translation type="obsolete">Afficher les numéros de verset</translation>
-    </message>
-    <message>
-        <source>Show section headings</source>
-        <translation type="obsolete">Afficher les en-têtes</translation>
-    </message>
-    <message>
-        <source>Show scripture cross-references</source>
-        <translation type="obsolete">Afficher les références croisées</translation>
-    </message>
-    <message>
-        <source>Show Greek accents</source>
-        <translation type="obsolete">Afficher les accents grecs</translation>
-    </message>
-    <message>
-        <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">Afficher les voyelles hébraïques</translation>
-    </message>
-    <message>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">Afficher la cantillation hébraïque</translation>
-    </message>
-    <message>
-        <source>Show morph segmentation</source>
-        <translation type="obsolete">Afficher la segmentation morphologique</translation>
-    </message>
-    <message>
-        <source>Use textual variants</source>
-        <translation type="obsolete">Utiliser les variantes textuelles</translation>
-    </message>
-</context>
-<context>
-    <name>BtTextWindowHeaderWidget</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
-        <source>Add/remove/replace</source>
-        <translation type="unfinished">Ajouter/supprimer/remplacer</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">Supprimer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
-        <source>Remove</source>
-        <translation type="unfinished">Supprimer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
-        <source>Replace</source>
-        <translation type="unfinished">Remplacer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
-        <source>Add</source>
-        <translation type="unfinished">Ajouter</translation>
-    </message>
-</context>
-<context>
-    <name>BtTipDialog</name>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
-        <source>Tip Of The Day</source>
-        <translation type="unfinished">Astuce du jour</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
-        <source>Show tips at startup</source>
-        <translation type="unfinished">Afficher les astuces au démarrage</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
-        <source>Next Tip</source>
-        <translation type="unfinished">Astuce suivante</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
-        <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
-        <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
-        <source>To learn more about the BibleTime project please go to our web site.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
-        <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
-        <source>Select the icon again to stop the synchronization.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
-        <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
-        <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
-        <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
-        <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
-        <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
-        <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
-        <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
-        <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
-        <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtVerseDropdownChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="106"/>
-        <source>Select verse</source>
-        <translation>Sélectionnez le verset</translation>
-    </message>
-</context>
-<context>
-    <name>CAcceleratorSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
-        <source>Choose action group:</source>
-        <translation>Choisir un groupe d&apos;action:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
-        <source>Main Window</source>
-        <translation>Fenêtre Principale</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
-        <source>All text windows</source>
-        <translation>Toutes les fenêtres de texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
-        <source>Bible windows</source>
-        <translation>Fenêtres de la Bible</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
-        <source>Commentary windows</source>
-        <translation>Les fenêtres de commentaire</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
-        <source>Lexicon windows</source>
-        <translation>Fenêtre du lexique</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
-        <source>Book windows</source>
-        <translation>Fenêtres du livre</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
-        <source>
-   &quot;%1&quot; in the &quot;%2&quot; group</source>
-        <translation>   &quot;%1&quot; dans le groupe &quot;%2&quot;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
-        <source>Shortcuts</source>
-        <translation>Raccourcis</translation>
-    </message>
-</context>
-<context>
-    <name>CBibleReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
-        <source>Next book</source>
-        <translation>Livre suivant</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
-        <source>Previous book</source>
-        <translation>Livre précédent</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
-        <source>Next chapter</source>
-        <translation>Chapitre suivant</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
-        <source>Previous chapter</source>
-        <translation>Chapitre précédent</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
-        <source>Next verse</source>
-        <translation>Verset suivant</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
-        <source>Previous verse</source>
-        <translation>Verset précédent</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
-        <source>Copy chapter</source>
-        <translation>Copier le chapitre</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
-        <source>Save chapter as plain text</source>
-        <translation>Sauvegarder le chapitre en texte seul</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
-        <source>Save chapter as HTML</source>
-        <translation>Sauvegarder le chapitre en HTML</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
-        <source>Print chapter</source>
-        <translation>Imprimer le chapitre</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
-        <source>Text of reference</source>
-        <translation>Texte de la référence</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
-        <source>Reference with text</source>
-        <translation>Références avec le texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
-        <source>Bible window</source>
-        <translation>Fenêtre de Bible</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
-        <source>Copy...</source>
-        <translation>Copier...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
-        <source>Save...</source>
-        <translation>Sauvegarder...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
-        <source>Print...</source>
-        <translation>Imprimer...</translation>
-    </message>
-    <message>
-        <source>Copy chapter to clipboard ...</source>
-        <translation type="obsolete">Copier le chapitre dans le presse papier ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
-        <source>Copying</source>
-        <translation>Copie</translation>
-    </message>
-    <message>
-        <source>Saving chapter ...</source>
-        <translation type="obsolete">Enregistrement du chapitre ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
-        <source>Saving</source>
-        <translation>Enregistrement</translation>
-    </message>
-</context>
-<context>
-    <name>CBookReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
-        <source>Toggle tree view</source>
-        <translation>Activer/désactiver arborescence...</translation>
-    </message>
-</context>
-<context>
-    <name>CBookmarkIndex</name>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
-        <source>Bookmarks</source>
-        <translation>Signets</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
-        <source>New folder</source>
-        <translation>Nouveau dossier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
-        <source>Rename folder</source>
-        <translation>Renommer le dossier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
-        <source>Delete Items</source>
-        <translation>Effacer les éléments</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
-        <source>Do you really want to delete the selected items and child-items?</source>
-        <translation>Voulez-vous réellement effacer les éléments sélectionnes ainsi que leurs sous-éléments ?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
-        <source>The work to which the bookmark points to is not installed.</source>
-        <translation>Le module vers lequel le signet pointe n&apos;est pas installé.</translation>
-    </message>
-    <message>
-        <source>Change bookmark description...</source>
-        <translation type="obsolete">Changer la déscription du signet...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
-        <source>Print bookmarks...</source>
-        <translation>Imprimer les signets...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
-        <source>Remove selected items...</source>
-        <translation>Supprimer les éléments sélectionnés...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
-        <source>Import to folder...</source>
-        <translation>Importer dans le dossier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
-        <source>Edit bookmark...</source>
-        <translation type="unfinished">Editer le signet...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
-        <source>Sort folder bookmarks...</source>
-        <translation type="unfinished">Trier le dossier des signets...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
-        <source>Sort all bookmarks...</source>
-        <translation type="unfinished">Trier tous les signets...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
-        <source>Export from folder...</source>
-        <translation>Exporter du dossier...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
-        <source>Can drop only bookmarks or one folder</source>
-        <translation>Peut déposer seulement les signes ou un dossier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
-        <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
-        <translation>Ne peut déposer le dossier vers lui-même ou un de ses sous-dossier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
-        <source>Copy</source>
-        <translation>Copier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
-        <source>Move</source>
-        <translation>Déplacer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
-        <source>Drag references from text views to this view</source>
-        <translation>Glisser les références des vues textes vers cette vue</translation>
-    </message>
-</context>
-<context>
-    <name>CCommentaryReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
-        <source>Next book</source>
-        <translation>Livre suivant</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
-        <source>Previous book</source>
-        <translation>Livre précédent</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
-        <source>Next chapter</source>
-        <translation>Chapitre suivant</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
-        <source>Previous chapter</source>
-        <translation>Chapitre précédent</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
-        <source>Next verse</source>
-        <translation>Verset suivant</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
-        <source>Previous verse</source>
-        <translation>Verset précédent</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
-        <source>Synchronize</source>
-        <translation>Synchroniser</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
-        <source>Synchronize the displayed entry of this work with the active Bible window</source>
-        <translation>Synchronise le verset affiché par ce module avec la fenêtre de Bible active</translation>
-    </message>
-</context>
-<context>
-    <name>CConfigurationDialog</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
-        <source>Configure BibleTime</source>
-        <translation>Configurer BibleTime</translation>
-    </message>
-</context>
-<context>
-    <name>CDisplaySettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
-        <source>Display templates</source>
-        <translation>Options d&apos;affichage</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
-        <source>Available display styles:</source>
-        <translation>Modes d&apos;affichage disponibles :</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
-        <source>Style preview</source>
-        <translation>Prévisualisation</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
-        <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
-        <translation>Car Dieu a tant aimé le monde qu&apos;il a donné son Fils unique, afin que quiconque croit en lui ne périsse point, mais qu&apos;il ait la vie éternelle.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
-        <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
-        <translation>Dieu, en effet, n&apos;a pas envoyé son Fils dans le monde pour qu&apos;il juge le monde, mais pour que le monde soit sauvé par lui.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
-        <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
-        <translation>Celui qui croit en lui n&apos;est point jugé; mais celui qui ne croit pas est déjà jugé, parce qu&apos;il n&apos;a pas cru au nom du Fils unique de Dieu.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
-        <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
-        <translation>Car quiconque fait le mal hait la lumière, et ne vient point à la lumière, de peur que ses oeuvres ne soient dévoilées.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
-        <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
-        <translation>Mais celui qui agit selon la vérité vient à la lumière, afin que ses oeuvres soient manifestées, parce qu&apos;elles sont faites en Dieu.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
-        <source>Display templates define how text is displayed.</source>
-        <translation>Les options d&apos;affichage permettent de définir la disposition du texte des modules. </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
-        <source>Show the BibleTime logo on startup</source>
-        <translation>Afficher le logo BibleTime au démarrage</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
-        <source>Show startup logo</source>
-        <translation>Afficher les logos de démarrage</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
-        <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
-        <source>Display</source>
-        <translation>Options d&apos;affichage</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="193"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>CDisplayWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
-        <source>Back in history</source>
-        <translation>Aller en arrière</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
-        <source>Forward in history</source>
-        <translation>Avancer</translation>
-    </message>
-    <message>
-        <source>Zoom in</source>
-        <translation type="obsolete">Zoomer avant</translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation type="obsolete">Zoom arrière</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
-        <source>Select all</source>
-        <translation>Sélectionner tout</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
-        <source>Copy</source>
-        <translation>Copier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
-        <source>Find...</source>
-        <translation>Rechercher...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
-        <source>Change location</source>
-        <translation>Changer d&apos;emplacement</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
-        <source>Search with works of this window</source>
-        <translation>Rechercher dans les modules de cette fenêtre</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
-        <source>Work chooser buttons</source>
-        <translation type="unfinished">Boutons de sélection de module</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
-        <source>Text area header</source>
-        <translation type="unfinished">En-tête de la boîte de texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
-        <source>Navigation</source>
-        <translation type="unfinished">Navigation</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
-        <source>Tool</source>
-        <translation type="unfinished">Outil</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
-        <source>Format</source>
-        <translation type="unfinished">Format</translation>
-    </message>
-</context>
-<context>
-    <name>CFontChooser</name>
-    <message>
-        <source>Size:</source>
-        <translation type="obsolete">Dimension:</translation>
-    </message>
-    <message>
-        <source>Font name:</source>
-        <translation type="obsolete">Nom police:</translation>
-    </message>
-    <message>
-        <source>Font style:</source>
-        <translation type="obsolete">Style de police:</translation>
-    </message>
-</context>
-<context>
-    <name>CHTMLWriteDisplay</name>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
-        <source>Bold</source>
-        <translation>Gras</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
-        <source>Italic</source>
-        <translation>Italique</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
-        <source>Underline</source>
-        <translation>Souligné</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
-        <source>Left</source>
-        <translation>Gauche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
-        <source>Center</source>
-        <translation>Centré</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
-        <source>Right</source>
-        <translation>Droite</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
-        <source>Font</source>
-        <translation>Police</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
-        <source>Font size</source>
-        <translation>Taille de la police</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
-        <source>Font color</source>
-        <translation>Couleur de la police</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
-        <source>Align left</source>
-        <translation>Aligner à gauche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
-        <source>Align right</source>
-        <translation>Aligner à droite</translation>
-    </message>
-</context>
-<context>
-    <name>CHTMLWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
-        <source>Module not writable</source>
-        <translation>Le module n&apos;est pas accessible en écriture</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
-        <source>Module is not writable.</source>
-        <translation>Le module n&apos;est pas accessible en écriture.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
-        <source>Either the module may not be edited, or you do not have write permission.</source>
-        <translation>Soit le module ne peut pas être édité, soit vous n&apos;avez pas la permission.            </translation>
-    </message>
-</context>
-<context>
-    <name>CKeyReferenceWidget</name>
-    <message>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="obsolete">Défiler dans les entrées de la liste. Appuyez sur ce bouton et déplacer la souris pour avancer/reculer parmis les éléments.</translation>
-    </message>
-    <message>
-        <source>Next book</source>
-        <translation type="obsolete">Livre suivant</translation>
-    </message>
-    <message>
-        <source>Previous book</source>
-        <translation type="obsolete">Livre précédent</translation>
-    </message>
-    <message>
-        <source>Next chapter</source>
-        <translation type="obsolete">Chapitre suivant</translation>
-    </message>
-    <message>
-        <source>Previous chapter</source>
-        <translation type="obsolete">Chapitre précédent</translation>
-    </message>
-    <message>
-        <source>Next verse</source>
-        <translation type="obsolete">Verset suivant</translation>
-    </message>
-    <message>
-        <source>Previous verse</source>
-        <translation type="obsolete">Verset précédent</translation>
-    </message>
-</context>
-<context>
-    <name>CLanguageSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/clanguagesettings.cpp" line="297"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>CLexiconKeyChooser</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation>Défiler dans les entrées de la liste. Appuyez sur ce bouton et déplacer la souris pour avancer/reculer parmis les éléments.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
-        <source>Entries of the current work</source>
-        <translation>Entrées du module courrant</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
-        <source>Next entry</source>
-        <translation>Entrée suivante</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
-        <source>Previous entry</source>
-        <translation>Entrée précédente</translation>
-    </message>
-</context>
-<context>
-    <name>CLexiconReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
-        <source>Next entry</source>
-        <translation>Entrée suivante</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
-        <source>Previous entry</source>
-        <translation>Entrée précédente</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
-        <source>Copy reference only</source>
-        <translation>Copier la référence seulement</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
-        <source>Save entry as HTML</source>
-        <translation>Sauvegarder l&apos;entrée en HTML</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
-        <source>Print reference only</source>
-        <translation>Imprimer la référence seulement</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
-        <source>Strong&apos;s Search</source>
-        <translation>Numéros Strong</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
-        <source>Entry with text</source>
-        <translation>Entrée avec du texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
-        <source>Entry as plain text</source>
-        <translation>Entrée en tant que texte seul</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
-        <source>Lexicon window</source>
-        <translation>Fenêtre du lexique</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
-        <source>Copy...</source>
-        <translation>Copier...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
-        <source>Save...</source>
-        <translation>Sauvegarder...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
-        <source>Print...</source>
-        <translation>Imprimer...</translation>
-    </message>
-    <message>
-        <source>Saving entry ...</source>
-        <translation type="obsolete">Enregistrement du chapitre ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
-        <source>Saving</source>
-        <translation>Enregistrement</translation>
-    </message>
-</context>
-<context>
-    <name>CModuleIndexDialog</name>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Annuler</translation>
-    </message>
-    <message>
-        <source>Creating indices</source>
-        <translation type="obsolete">Création des indices</translation>
-    </message>
-    <message>
-        <source>Creating index for work: %1</source>
-        <translation type="obsolete">Création d&apos;index pour module:%1</translation>
-    </message>
-    <message>
-        <source>Indexing Is Cancelled</source>
-        <translation type="obsolete">L&apos;indexation est annulée</translation>
-    </message>
-    <message>
-        <source>Indexing is cancelled because modules are removed.</source>
-        <translation type="obsolete">L&apos;indexation est annulée car les modules sont supprimés.</translation>
-    </message>
-</context>
-<context>
-    <name>CPlainWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
-        <source>Sync with active Bible</source>
-        <translation>Synchroniser avec la Bible active</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
-        <source>Save text</source>
-        <translation>Enregistrer le texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
-        <source>Delete current entry</source>
-        <translation>Supprime l&apos;entrée actuelle</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
-        <source>Restore original text</source>
-        <translation>Rétablir le texte original</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
-        <source>Module not writable</source>
-        <translation>Le module n&apos;est pas accessible en écriture</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
-        <source>Module is not writable.</source>
-        <translation>Le module n&apos;est pas accessible en écriture.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
-        <source>Either the module may not be edited, or you do not have write permission.</source>
-        <translation>Soit le module ne peut pas être édité, soit vous n&apos;avez pas la permission.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
-        <source>Synchronize (show the same verse) with the active Bible window</source>
-        <translation>Synchroniser (afficher le même verset) avec la fenêtre de Bible active</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
-        <source>Delete current entry (no undo)</source>
-        <translation>Supprime l&apos;entrée actuelle (pas d&apos;annulation)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
-        <source>Restore original text, new text will be lost</source>
-        <translation>Restaurer le texte original, le nouveau texte sera perdu</translation>
-    </message>
-</context>
-<context>
-    <name>CSearchAnalysisScene</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>Save Search Analysis</source>
-        <translation type="unfinished">Sauvegarder l&apos;analyse de la recherche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation type="unfinished">Fichiers HTML (*.html;*.HTML;*.HTM;*.htm)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
-        <source>BibleTime Search Analysis</source>
-        <translation type="unfinished">Analyse de recherche BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation type="unfinished">Recherche de texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
-        <source>Book</source>
-        <translation type="unfinished">Livre</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
-        <source>Total hits</source>
-        <translation type="unfinished">Nombre de resultats</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
-        <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
-        <translation type="unfinished">Créé par &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>CSwordModuleInfo</name>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
-        <source>Version</source>
-        <translation>Version</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
-        <source>unknown</source>
-        <translation>inconnu</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
-        <source>Markup</source>
-        <translation>Abréviation</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
-        <source>Location</source>
-        <translation>Emplacement</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
-        <source>Language</source>
-        <translation>Langue</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
-        <source>Category</source>
-        <translation>Catégorie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
-        <source>LCSH</source>
-        <translation>LCSH</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
-        <source>Writable</source>
-        <translation>Modifiable</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
-        <source>yes</source>
-        <translation>oui</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
-        <source>no</source>
-        <translation>non</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
-        <source>Unlock key</source>
-        <translation>Clef de déverrouillage</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
-        <source>Features</source>
-        <translation>Caractéristiques</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
-        <source>Take care, this work contains cult / questionable material!</source>
-        <translation>Attention, ce module contient des éléments polémiques!</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
-        <source>About</source>
-        <translation>A propos</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
-        <source>Distribution license</source>
-        <translation>Licence de la distribution</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
-        <source>Distribution source</source>
-        <translation>Source de la distribution</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
-        <source>Distribution notes</source>
-        <translation>Notes de la distribution</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
-        <source>Text source</source>
-        <translation>Source de texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
-        <source>Copyright notes</source>
-        <translation>Notes de copyright</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
-        <source>Copyright holder</source>
-        <translation>Détenteur du copyright</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
-        <source>Copyright date</source>
-        <translation>Date du copyright</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
-        <source>Copyright contact name</source>
-        <translation>Contact copyright</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
-        <source>Copyright contact address</source>
-        <translation>Adresse du contact du copyright</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
-        <source>Copyright contact email</source>
-        <translation>Courriel du contact du copyright</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
-        <source>Bibles</source>
-        <translation type="unfinished">Bibles</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
-        <source>Commentaries</source>
-        <translation type="unfinished">Commentaires</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
-        <source>Books</source>
-        <translation type="unfinished">Livres</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
-        <source>Cults/Unorthodox</source>
-        <translation type="unfinished">Sectes/Non-orthodoxes</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
-        <source>Maps and Images</source>
-        <translation type="unfinished">Cartes et images</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
-        <source>Daily Devotionals</source>
-        <translation type="unfinished">Lectures quotidiennes</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
-        <source>Lexicons and Dictionaries</source>
-        <translation type="unfinished">Lexiques et dictionnaires</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
-        <source>Glossaries</source>
-        <translation type="unfinished">Glossaires</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
-        <source>Unknown</source>
-        <translation type="unfinished">Inconnu</translation>
-    </message>
-</context>
-<context>
-    <name>CSwordSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
-        <source>Standard works</source>
-        <translation>Modules par défaut</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
-        <source>Text filters</source>
-        <translation>Filtres de texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
-        <source>Desk</source>
-        <translation>Bureau</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="359"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>CSwordSetupInstallSourcesDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
-        <source>Caption</source>
-        <translation>Nom</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
-        <source>Server</source>
-        <translation>Serveur</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
-        <source>Path</source>
-        <translation>Chemin</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
-        <source>Get list...</source>
-        <translation>Récupérer la liste...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
-        <source>A source with this caption already exists. Please provide a different caption.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
-        <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
-
-Do you want to continue?</source>
-        <translation>La liste des sources va être téléchargée depuis un serveur distant. Les sources vont être ajoutées à votre liste actuelle. Les nouvelles sources vont remplacer les anciennes si elles portent le même nom. Plus tard vous pourrez retirer les sources que vous ne voulez plus.
-
-Voulez vous continuer ?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
-        <source>Get source list from remote server?</source>
-        <translation>Récupérer la liste des sources depuis le serveur distant?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
-        <source>Downloading List</source>
-        <translation>Téléchargement de la liste</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
-        <source>Connecting...</source>
-        <translation>Connexion...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
-        <source>Refreshing...</source>
-        <translation>Rafraîchissement...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
-        <source>Error</source>
-        <translation>Erreur</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
-        <source>Download a list of sources from CrossWire server and add sources</source>
-        <translation>Télécharger une liste de sources depuis le serveur CrossWire et ajouter les sources</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <source>Please provide a caption.</source>
-        <translation>Merci d&apos;inscrire un nom.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <source>Please provide a server name.</source>
-        <translation>Veuillez choisir un nom de serveur.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <source>Please provide a valid, readable path.</source>
-        <translation>Veuillez indiquer un chemin valide et accessible en lecture.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
-        <source>Please provide a path.</source>
-        <translation>Veuillez indiquer un chemin d&apos;accès.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
-        <source>New  Installation Source</source>
-        <translation>Nouvelle source d&apos;installation</translation>
-    </message>
-</context>
-<context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>Sauvegarder le texte avant de fermer?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>Sauvegarder le texte modifié?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>Enregistrer le texte?</translation>
-    </message>
-</context>
-<context>
-    <name>InfoDisplay::CInfoDisplay</name>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
-        <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
-        <source>Abbreviation</source>
-        <translation>Abréviation</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
-        <source>Cross references</source>
-        <translation>Références croisées</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
-        <source>Footnote</source>
-        <translation>Notes de bas de page</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
-        <source>Strongs</source>
-        <translation>Numéros Strong</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
-        <source>Morphology</source>
-        <translation>Marques morphologiques</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
-        <source>Word lookup</source>
-        <translation>Rechercher un mot</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
-        <source>Copy</source>
-        <translation>Copier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
-        <source>Select all</source>
-        <translation type="unfinished">Sélectionner tout</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
-        <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
-        <translation>&lt;small&gt;Ici c&apos;est la zone d&apos;affichage Mag. Faites survoler la souris sur les liens et autres éléments qui contiennent des données et les contenus apparaissent dans le Mage au bout d&apos;un bref délai.&lt;/small&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>QCoreApplication</name>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
-        <source>Indexing aborted</source>
-        <translation>Indexation abandonée</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <source>An internal error occurred while building the index: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
-        <source>An internal error occurred while building the index.</source>
-        <translation>Une erreur interne s&apos;est produite pendant la construction de l&apos;index.</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
-        <source>Search aborted</source>
-        <translation>Recherche abandonnée</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
-        <source>An internal error occurred while executing your search.</source>
-        <translation>Une erreur interne est survenue lors de la recherche.</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="126"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="240"/>
-        <source>Commentaries</source>
-        <translation>Commentaires</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="127"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="246"/>
-        <source>Cults/Unorthodox</source>
-        <translation>Sectes/Non-orthodoxes</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="128"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="245"/>
-        <source>Maps and Images</source>
-        <translation>Cartes et images</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="129"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="244"/>
-        <source>Daily Devotionals</source>
-        <translation>Lectures quotidiennes</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="130"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="242"/>
-        <source>Lexicons and Dictionaries</source>
-        <translation>Lexiques et dictionnaires</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
-        <source>Bibles</source>
-        <translation>Bibles</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="132"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="243"/>
-        <source>Glossaries</source>
-        <translation>Glossaires</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="133"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="241"/>
-        <source>Books</source>
-        <translation>Livres</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
-        <source>Added text</source>
-        <translation>Texte ajouté</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
-        <source>Names of languages</source>
-        <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
-        <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
-        <source>Afrikaans</source>
-        <extracomment>Language name af</extracomment>
-        <translation>Afrikaans</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
-        <source>Amuzgo, Guerrero</source>
-        <extracomment>Language name amu</extracomment>
-        <translation>Amuzgo, Guerrero</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
-        <source>English, Old (ca.450-1100)</source>
-        <extracomment>Language name ang</extracomment>
-        <translation>Anglais, ancien (450-1100)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
-        <source>Arabic</source>
-        <extracomment>Language name ar</extracomment>
-        <translation>Arabe</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
-        <source>Azerbaijani</source>
-        <extracomment>Language name az</extracomment>
-        <translation>Azerbaijani</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
-        <source>Azerbaijani, South</source>
-        <extracomment>Language name azb</extracomment>
-        <translation>Azerbaijani, Sud</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
-        <source>Belarusian</source>
-        <extracomment>Language name be</extracomment>
-        <translation>Biélorusse</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
-        <source>Bulgarian</source>
-        <extracomment>Language name bg</extracomment>
-        <translation>Bulgare</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
-        <source>Breton</source>
-        <extracomment>Language name br</extracomment>
-        <translation>Breton</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
-        <source>Bosnian</source>
-        <extracomment>Language name bs</extracomment>
-        <translation>Bosniaque</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
-        <source>Catalan</source>
-        <extracomment>Language name ca</extracomment>
-        <translation>Catalan</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
-        <source>Chinantec, Comaltepec</source>
-        <extracomment>Language name cco</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
-        <source>Cebuano</source>
-        <extracomment>Language name ceb</extracomment>
-        <translation>Cebuano</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
-        <source>Chamorro</source>
-        <extracomment>Language name ch</extracomment>
-        <translation>Chamorro</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
-        <source>Chontal, Highland Oaxaca</source>
-        <extracomment>Language name chd</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
-        <source>Chinantec, Quiotepec</source>
-        <extracomment>Language name chq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
-        <source>Chinantec, Ozumacu00edn</source>
-        <extracomment>Language name chz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
-        <source>Cakchiquel, Western</source>
-        <extracomment>Language name ckw</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
-        <source>Chinantec, Lalana</source>
-        <extracomment>Language name cnl</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
-        <source>Chinantec, Tepetotutla</source>
-        <extracomment>Language name cnt</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
-        <source>Coptic</source>
-        <extracomment>Language name cop</extracomment>
-        <translation>Copte</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
-        <source>Czech</source>
-        <extracomment>Language name cs</extracomment>
-        <translation>Tchèque</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
-        <source>Chinantec, Sochiapan</source>
-        <extracomment>Language name cso</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
-        <source>Chol, Tila</source>
-        <extracomment>Language name cti</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
-        <source>Chatino, Western Highland</source>
-        <extracomment>Language name ctp</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
-        <source>Church Slavic</source>
-        <extracomment>Language name cu</extracomment>
-        <translation>Slavon</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
-        <source>Welsh</source>
-        <extracomment>Language name cy</extracomment>
-        <translation>Gallois</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
-        <source>Danish</source>
-        <extracomment>Language name da</extracomment>
-        <translation>Danois</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
-        <source>German</source>
-        <extracomment>Language name de</extracomment>
-        <translation>Allemand</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
-        <source>Duruma</source>
-        <extracomment>Language name dug</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
-        <source>Greek, Modern (1453-)</source>
-        <extracomment>Language name el</extracomment>
-        <translation>Grec, moderne (1453-)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
-        <source>English</source>
-        <extracomment>Language name en</extracomment>
-        <translation>Anglais</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
-        <source>American English</source>
-        <extracomment>Language name en_US</extracomment>
-        <translation>Anglais américain</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
-        <source>English, Middle (1100-1500)</source>
-        <extracomment>Language name enm</extracomment>
-        <translation>Anglais, moyen (1100-1500)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
-        <source>Esperanto</source>
-        <extracomment>Language name eo</extracomment>
-        <translation>Espéranto</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
-        <source>Spanish</source>
-        <extracomment>Language name es</extracomment>
-        <translation>Espagnol</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
-        <source>Estonian</source>
-        <extracomment>Language name et</extracomment>
-        <translation>Estonien</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
-        <source>Basque</source>
-        <extracomment>Language name eu</extracomment>
-        <translation>Basque</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
-        <source>Persian</source>
-        <extracomment>Language name fa</extracomment>
-        <translation>Perse</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
-        <source>Finnish</source>
-        <extracomment>Language name fi</extracomment>
-        <translation>Finlandais</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
-        <source>French</source>
-        <extracomment>Language name fr</extracomment>
-        <translation>Français</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
-        <source>Frisian</source>
-        <extracomment>Language name fy</extracomment>
-        <translation>Frisian</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
-        <source>Irish</source>
-        <extracomment>Language name ga</extracomment>
-        <translation>Irlandais</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
-        <source>Gaelic (Scots)</source>
-        <extracomment>Language name gd</extracomment>
-        <translation>Gaélique (écossais)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
-        <source>Geez</source>
-        <extracomment>Language name gez</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
-        <source>Gothic</source>
-        <extracomment>Language name got</extracomment>
-        <translation>Gothique</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
-        <source>Manx</source>
-        <extracomment>Language name gv</extracomment>
-        <translation>Manx</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
-        <source>Greek, Ancient (to 1453)</source>
-        <extracomment>Language name grc</extracomment>
-        <translation>Grec, ancien (jusqu&apos;à 1453)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
-        <source>Hebrew</source>
-        <extracomment>Language name he</extracomment>
-        <translation>Hébreux</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
-        <source>Hausa</source>
-        <extracomment>Language name hau</extracomment>
-        <translation>Hausa</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
-        <source>Hawaiian</source>
-        <extracomment>Language name haw</extracomment>
-        <translation>Hawaiien</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
-        <source>Hindi</source>
-        <extracomment>Language name hi</extracomment>
-        <translation>Hindi</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
-        <source>Croatian</source>
-        <extracomment>Language name hr</extracomment>
-        <translation>Croate</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
-        <source>Hungarian</source>
-        <extracomment>Language name hu</extracomment>
-        <translation>Hongrois</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
-        <source>Huave, San Mateo Del Mar</source>
-        <extracomment>Language name huv</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
-        <source>Armenian</source>
-        <extracomment>Language name hy</extracomment>
-        <translation>Arménien</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
-        <source>Indonesian</source>
-        <extracomment>Language name id</extracomment>
-        <translation>Indonésien</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
-        <source>Icelandic</source>
-        <extracomment>Language name is</extracomment>
-        <translation>Islandais</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
-        <source>Italian</source>
-        <extracomment>Language name it</extracomment>
-        <translation>Italien</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
-        <source>Itzu00e1</source>
-        <extracomment>Language name itz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
-        <source>Ixil, San Juan Cotzal</source>
-        <extracomment>Language name ixl</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
-        <source>Japanese</source>
-        <extracomment>Language name ja</extracomment>
-        <translation>Japonais</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
-        <source>Jacalteco, Eastern</source>
-        <extracomment>Language name jac</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
-        <source>Javanese, Caribbean</source>
-        <extracomment>Language name jvn</extracomment>
-        <translation>Javanais, Caraibes</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
-        <source>Georgian</source>
-        <extracomment>Language name ka</extracomment>
-        <translation>Géorgien</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
-        <source>Korean</source>
-        <extracomment>Language name ko</extracomment>
-        <translation>Coréen</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
-        <source>Kurdish</source>
-        <extracomment>Language name ku</extracomment>
-        <translation>Kurde</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
-        <source>Kirghiz</source>
-        <extracomment>Language name ky</extracomment>
-        <translation>Kirghiz</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
-        <source>Latin</source>
-        <extracomment>Language name la</extracomment>
-        <translation>Latin</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
-        <source>Lacandon</source>
-        <extracomment>Language name lac</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
-        <source>Lithuanian</source>
-        <extracomment>Language name lt</extracomment>
-        <translation>Lituanien</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
-        <source>Latvian</source>
-        <extracomment>Language name lv</extracomment>
-        <translation>Letton</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
-        <source>Malagasy</source>
-        <extracomment>Language name mg</extracomment>
-        <translation type="unfinished">Malgache</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
-        <source>Maori</source>
-        <extracomment>Language name mi</extracomment>
-        <translation>Maori</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
-        <source>Mixe, Isthmus</source>
-        <extracomment>Language name mir</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
-        <source>Mixtec, Coatzospan</source>
-        <extracomment>Language name miz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
-        <source>Macedonian</source>
-        <extracomment>Language name mk</extracomment>
-        <translation>Macédonien</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
-        <source>Mixtec, Silacayoapan</source>
-        <extracomment>Language name mks</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
-        <source>More</source>
-        <extracomment>Language name mos</extracomment>
-        <translation>More</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
-        <source>Malay</source>
-        <extracomment>Language name ms</extracomment>
-        <translation>Malais</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
-        <source>Maltese</source>
-        <extracomment>Language name mt</extracomment>
-        <translation>Maltais</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
-        <source>Low German; Low Saxon</source>
-        <extracomment>Language name nds</extracomment>
-        <translation>Bas allemand, bas saxon</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
-        <source>Nepali</source>
-        <extracomment>Language name ne</extracomment>
-        <translation>Népalais</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
-        <source>Nahuatl, Guerrero</source>
-        <extracomment>Language name ngu</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
-        <source>Nahuatl, Northern Oaxaca</source>
-        <extracomment>Language name nhy</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
-        <source>Dutch</source>
-        <extracomment>Language name nl</extracomment>
-        <translation>Néerlandais</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
-        <source>Norwegian Nynorsk</source>
-        <extracomment>Language name nn</extracomment>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
-        <source>Norwegian</source>
-        <extracomment>Language name no</extracomment>
-        <translation>Norvégien</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
-        <source>Otomi, Queru00e9taro</source>
-        <extracomment>Language name otq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
-        <source>Papiamento</source>
-        <extracomment>Language name pap</extracomment>
-        <translation>Papiamento</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
-        <source>Polish</source>
-        <extracomment>Language name pl</extracomment>
-        <translation>Polonais</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
-        <source>Persian (Dari)</source>
-        <extracomment>Language name prs</extracomment>
-        <translation>Perse (Dari)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
-        <source>Portuguese</source>
-        <extracomment>Language name pt</extracomment>
-        <translation>Portugais</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
-        <source>Brasilian Portuguese</source>
-        <extracomment>Language name pt_BR</extracomment>
-        <translation>Portugais Brésilien</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
-        <source>Quichu00e9, West Central</source>
-        <extracomment>Language name qut</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
-        <source>Romanian</source>
-        <extracomment>Language name ro</extracomment>
-        <translation>Roumain</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
-        <source>Russian</source>
-        <extracomment>Language name ru</extracomment>
-        <translation>Russe</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
-        <source>Scots</source>
-        <extracomment>Language name sco</extracomment>
-        <translation>Écossais</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
-        <source>Slovak</source>
-        <extracomment>Language name sk</extracomment>
-        <translation>Slovaque</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
-        <source>Slovenian</source>
-        <extracomment>Language name sl</extracomment>
-        <translation>Slovène</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
-        <source>Somali</source>
-        <extracomment>Language name so</extracomment>
-        <translation>Somali</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
-        <source>Albanian</source>
-        <extracomment>Language name sq</extracomment>
-        <translation>Albanais</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
-        <source>Swedish</source>
-        <extracomment>Language name sv</extracomment>
-        <translation>Suédois</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
-        <source>Swahili</source>
-        <extracomment>Language name sw</extracomment>
-        <translation>Swahili</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
-        <source>Syriac</source>
-        <extracomment>Language name syr</extracomment>
-        <translation>Syriaque</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
-        <source>Tamil</source>
-        <extracomment>Language name ta</extracomment>
-        <translation>Tamil</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
-        <source>Thai</source>
-        <extracomment>Language name th</extracomment>
-        <translation>Thaï</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
-        <source>Tagalog</source>
-        <extracomment>Language name tl</extracomment>
-        <translation>Tagalog</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
-        <source>Tswana</source>
-        <extracomment>Language name tn</extracomment>
-        <translation>Tswana</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
-        <source>Turkish</source>
-        <extracomment>Language name tr</extracomment>
-        <translation>Turque</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
-        <source>Tektiteko</source>
-        <extracomment>Language name ttc</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
-        <source>Tahitian</source>
-        <extracomment>Language name ty</extracomment>
-        <translation>Tahitien</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
-        <source>Tzotzil, Zinacantu00e1n</source>
-        <extracomment>Language name tzz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
-        <source>Ukrainian</source>
-        <extracomment>Language name uk</extracomment>
-        <translation>Ukrainien</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
-        <source>Orya</source>
-        <extracomment>Language name ury</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
-        <source>Uspanteco</source>
-        <extracomment>Language name usp</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
-        <source>Vietnamese</source>
-        <extracomment>Language name vi</extracomment>
-        <translation>Vietnamien</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
-        <source>Xhosa</source>
-        <extracomment>Language name xh</extracomment>
-        <translation>Xhosa</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
-        <source>Bavarian</source>
-        <extracomment>Language name bar</extracomment>
-        <translation>Bavarois</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
-        <source>Lombard</source>
-        <extracomment>Language name lmo</extracomment>
-        <translation>Lombard</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
-        <source>Uma</source>
-        <extracomment>Language name ppk
-----------
-Language name ppk</extracomment>
-        <translation>Sulawesi</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
-        <source>Sranan</source>
-        <extracomment>Language name srn</extracomment>
-        <translation>Sranan</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
-        <source>Yiddish</source>
-        <extracomment>Language name yi</extracomment>
-        <translation>Yiddish</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
-        <source>Zapotec, San Juan Guelavu00eda</source>
-        <extracomment>Language name zab</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
-        <source>Zapotec, Mitla</source>
-        <extracomment>Language name zaw</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
-        <source>Chinese</source>
-        <extracomment>Language name zh</extracomment>
-        <translation>Chinois</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
-        <source>Zapotec, Amatlu00e1n</source>
-        <extracomment>Language name zpo</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
-        <source>Zapotec, Zoogocho</source>
-        <extracomment>Language name zpq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
-        <source>Zapotec, Yalu00e1lag</source>
-        <extracomment>Language name zpu</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
-        <source>Zapotec, Chichicapan</source>
-        <extracomment>Language name zpv</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
-        <source>Zapotec, Southern Rincon</source>
-        <extracomment>Language name zsr</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
-        <source>Zapotec, Quioquitani-Quieru00ed</source>
-        <extracomment>Language name ztq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
-        <source>Zapotec, Yatee</source>
-        <extracomment>Language name zty</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
-        <source>Zulu</source>
-        <extracomment>Language name zu</extracomment>
-        <translation>Zoulou</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
-        <source>Footnotes</source>
-        <translation>Notes de pied de page</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
-        <source>Strong&apos;s numbers</source>
-        <translation>Numéros Strong</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
-        <source>Headings</source>
-        <translation>En-têtes</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
-        <source>Morphological tags</source>
-        <translation>Marques morphologiques</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
-        <source>Lemmas</source>
-        <translation>Vocables</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
-        <source>Hebrew vowel points</source>
-        <translation>Voyelles hébraïques</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
-        <source>Hebrew cantillation marks</source>
-        <translation>Afficher la cantillation hébraïque</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
-        <source>Greek accents</source>
-        <translation>Accents grecs</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
-        <source>Red letter words</source>
-        <translation>Mots surlignés</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
-        <source>Textual variants</source>
-        <translation>Variantes textuelles</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
-        <source>Scripture cross-references</source>
-        <translation>Références croisées</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
-        <source>Morph segmentation</source>
-        <translation>Segmentation morphologique</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation>Exporter</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
-        <source>Local</source>
-        <translation>Local</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>Distant</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Ancien Testament</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Moïse/Pentateuque/Torah</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>Livres historiques</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Prophètes</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>Nouveau Testament</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Évangiles</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>Lettres/Épîtres</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Épîtres de Paul</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <source>HTML files</source>
-        <translation>Fichiers HTML</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
-        <source>All files</source>
-        <translation>Tous les fichiers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
-        <source>Text files</source>
-        <translation>Fichiers texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
-        <source>Save file</source>
-        <translation>Enregistrer le fichier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
-        <source>Save document ...</source>
-        <translation>Sauvegarde le document...</translation>
-    </message>
-    <message>
-        <source>Print keys</source>
-        <translation type="obsolete">Imprimer les clefs</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <source>BibleTime bookmark files</source>
-        <translation>Signets BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
-        <source>unknown</source>
-        <translation>inconnu</translation>
-    </message>
-    <message>
-        <source>Change description ...</source>
-        <translation type="obsolete">Modifier la description ...</translation>
-    </message>
-    <message>
-        <source>Enter a new description for the chosen bookmark.</source>
-        <translation type="obsolete">Saisir la nouvelle description pour le signet sélectionné.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
-        <source>New folder</source>
-        <translation>Nouveau dossier</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
-        <source>The file already exists.</source>
-        <translation>Le fichier existe déjà.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
-        <source>Do you want to overwrite it?</source>
-        <translation>Voulez-vous l&apos;écraser ?</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
-        <source>Error</source>
-        <translation>Erreur</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>Désolé ! Le fichier n&apos;a pu être enregistré.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
-        <source>Please check permissions etc.</source>
-        <translation>Vérifiez les permissions, etc.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
-        <source>Take care, this work contains cult / questionable material!</source>
-        <translation>Attention, ce module contient des éléments polémiques !</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
-        <source>Version</source>
-        <translation>Version</translation>
-    </message>
-    <message>
-        <source>Settings Migration</source>
-        <translation type="obsolete">Options de migration</translation>
-    </message>
-    <message>
-        <source>It appears you have a BibleTime configuration from KDE 3 stored in %1, and you have not migrated it to this version.  Would you like to import it?</source>
-        <translation type="obsolete">Il semble que vous avez une configuration BibleTime de KDE 3 stocké ici : %1, et que vous ne l&apos;ayez pas migré vers cette version. Voulez-vous l&apos;importer ?</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
-        <source>Encrypted - needs unlock key</source>
-        <translation>Crypté - nécessite une clé de déverrouillage</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
-        <source>Double click for more information</source>
-        <translation>Double cliquez pour plus d&apos;informations</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
-        <source>Updated version available!</source>
-        <translation>Version mise-à-jour disponible!</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
-        <source>Installed version</source>
-        <translation>Version installée</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
-        <source>Haitian Creole</source>
-        <extracomment>Language name ht</extracomment>
-        <translation>Créole haïtien</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
-        <source>Kekchu00ed</source>
-        <comment>kek</comment>
-        <extracomment>Language name kek</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
-        <source>(Multiple languages)</source>
-        <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
-        <translation type="unfinished">(Langages multiples)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
-        <source>Mam, Central</source>
-        <extracomment>Language name mvc</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
-        <source>Mam, Todos Santos Cuchumatu00e1n</source>
-        <extracomment>Language name mvj</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
-        <source>Mixe, Juquila</source>
-        <extracomment>Language name mxq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
-        <source>Mixtec, Jamiltepec</source>
-        <extracomment>Language name mxt</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
-        <source>Burmese</source>
-        <extracomment>Language name my</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
-        <source>Norwegian Bokmu00e5l</source>
-        <extracomment>Language name nb</extracomment>
-        <translation>Norvégien</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
-        <source>Nahuatl, Michoacu00e1n</source>
-        <extracomment>Language name ncl</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
-        <source>Potawatomi</source>
-        <extracomment>Language name pot</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
-        <source>Klingon</source>
-        <extracomment>Language name tlh</extracomment>
-        <translation>Klingon</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
-        <source>Mixtec, Diuxi-Tilantongo</source>
-        <extracomment>Language name xtd</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
-        <source>Yoryba</source>
-        <extracomment>Language name yo</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
-        <source>Verb tense changed</source>
-        <translation>Le temps du verbe a changé</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
-        <source>Can&apos;t write file</source>
-        <translation>Impossible d&apos;écrire le fichier</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
-        <source>The Sword config file can&apos;t be written!</source>
-        <translation>Le fichier de configuration Sword ne peut pas être écrit!</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
-        <source>Export Bookmarks</source>
-        <translation>Exporter les signets</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
-        <source>Import bookmarks</source>
-        <translation>Importer des signets</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
-        <source>Overwrite File?</source>
-        <translation>Écraser le fichier ?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
-        <source>Parsing Strong&apos;s Numbers</source>
-        <translation>Analyse du nombre de Strong</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
-        <source>This shortcut conflicts with the shortcut for the following actions:</source>
-        <translation>Ce raccourci clavier est en conflit avec celui de l&apos;action suivante :</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
-        <source>Do you want to clear the conflicting shortcuts and continue?</source>
-        <translation>Voulez vous effacer les raccourcis en conflit et continuer ?</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
-        <source>Indexed works</source>
-        <translation type="unfinished">Modules indexés</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
-        <source>Unindexed works</source>
-        <translation type="unfinished">Modules non indexés</translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="44"/>
-        <source>Show this help message and exit</source>
-        <translation type="unfinished">Afficher ce message et quitter</translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="47"/>
-        <source>Output BibleTime version and exit</source>
-        <translation type="unfinished">Afficher la version de BibleTime et quitter</translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="50"/>
-        <source>Open a clean session</source>
-        <translation type="unfinished">Ouvrir une session propre</translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="53"/>
-        <source>Open the default Bible with the reference &lt;ref&gt;</source>
-        <translation type="unfinished">Ouvrir la Bible par défaut avec la référence &lt;ref&gt;</translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="56"/>
-        <source>For command-line arguments parsed by the Qt toolkit, see %1.</source>
-        <translation type="unfinished">Pour les arguments en ligne de commande parsés par Qt toolkit, voir %1.</translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="103"/>
-        <source>Error: %1 expects an argument.</source>
-        <translation type="unfinished">Erreur: %1 attend un argument.</translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="106"/>
-        <source>See --help for details.</source>
-        <translation type="unfinished">Voir --help pour les détails</translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="111"/>
-        <source>Error: Invalid command-line argument: %1</source>
-        <translation type="unfinished">Erreur: argument de la ligne de commande invalide: %1</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
-        <source>CSS base template not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
-        <source>Default template &quot;%1&quot; not found!</source>
-        <translation type="unfinished">Modèle par défaut &quot;%1&quot; non trouvé!</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
-        <source>Replace</source>
-        <translation type="unfinished">Remplacer</translation>
-    </message>
-</context>
-<context>
-    <name>QPushButton</name>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
-        <source>OK</source>
-        <comment>Dialog Button</comment>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
-        <source>Open</source>
-        <comment>Dialog Button</comment>
-        <translation>Ouvrir</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
-        <source>Save</source>
-        <comment>Dialog Button</comment>
-        <translation>Enregistrer</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
-        <source>Cancel</source>
-        <comment>Dialog Button</comment>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
-        <source>Close</source>
-        <comment>Dialog Button</comment>
-        <translation>Fermer</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
-        <source>Discard</source>
-        <comment>Dialog Button</comment>
-        <translation>Abandonner</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
-        <source>Apply</source>
-        <comment>Dialog Button</comment>
-        <translation>Appliquer</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
-        <source>Reset</source>
-        <comment>Dialog Button</comment>
-        <translation>Réinitialiser</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
-        <source>Restore defaults</source>
-        <comment>Dialog Button</comment>
-        <translation>Restaurer les valeurs par défaut</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
-        <source>Help</source>
-        <comment>Dialog Button</comment>
-        <translation>Aide</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
-        <source>Save All</source>
-        <comment>Dialog Button</comment>
-        <translation>Enregistrer tout</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
-        <source>Yes</source>
-        <comment>Dialog Button</comment>
-        <translation>Oui</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
-        <source>Yes to all</source>
-        <comment>Dialog Button</comment>
-        <translation>Oui à tout</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
-        <source>No</source>
-        <comment>Dialog Button</comment>
-        <translation>Non</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
-        <source>No to all</source>
-        <comment>Dialog Button</comment>
-        <translation>Réfuser tout</translation>
-    </message>
-</context>
-<context>
-    <name>Search::BtSearchOptionsArea</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
-        <source>Search for:</source>
-        <translation>Rechercher:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
-        <source>&amp;Search</source>
-        <translation>&amp;Rechercher</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
-        <source>Start to search the text in the chosen works</source>
-        <translation>Commencer à rechercher le texte dans les modules sélectionnés</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
-        <source>Ch&amp;oose...</source>
-        <translation>Ch&amp;oisir...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
-        <source>Choose works for the search</source>
-        <translation>Choisir des modules pour la recherche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
-        <source>S&amp;etup...</source>
-        <translation>&amp;Configuration...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
-        <source>All of the words (AND is added between the words)</source>
-        <translation>Tous les mots y compris (AND est ajouté entre les mots)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
-        <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
-        <translation> (&lt;a href=&apos;syntax_help&apos;&gt;syntaxe complète&lt;/a&gt;)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
-        <source>Scope:</source>
-        <translation>Plage de recherche:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
-        <source>The text you want to search for</source>
-        <translation>Le texte à rechercher</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
-        <source>Works:</source>
-        <translation>Modules:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
-        <source>No search scope</source>
-        <translation>Pas de plage de recherche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
-        <source>All words</source>
-        <translation>Tous les mots</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
-        <source>Configure predefined scopes for search</source>
-        <translation>Etablir un domaine prédéfini pour la recherche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
-        <source>Some words</source>
-        <translation>Quelques mots</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
-        <source>Free</source>
-        <translation>Libérer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
-        <source>Some of the words (OR is added between the words)</source>
-        <translation>Certains des mots (OU est ajouté entre les mots)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
-        <source>Full lucene syntax</source>
-        <translation>Syntaxe lucene complète</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
-        <source>Click the link to get help for search syntax</source>
-        <translation>Cliquer sur le lien pour avoir l&apos;aide sur la syntaxe de recherche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
-        <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
-        <translation>Choisir le domaine (livres/chapitres/verstes dans lequelles éffectuer la recherche).&lt;br /&gt; Applicable pour les Bibles et Commentaires.</translation>
-    </message>
-</context>
-<context>
-    <name>Search::BtSearchResultArea</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
-        <source>Text of the selected search result item</source>
-        <translation>Texte de l&apos;élément sélectionné parmis les résultats de recherche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
-        <source>Select all</source>
-        <translation type="unfinished">Sélectionner tout</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
-        <source>Copy</source>
-        <translation type="unfinished">Copier</translation>
-    </message>
-</context>
-<context>
-    <name>Search::BtSearchSyntaxHelpDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
-        <source>Search Syntax Help</source>
-        <translation type="unfinished">Aide sur la syntaxe de recherche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
-        <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
-        <source>Which words to find</source>
-        <translation type="unfinished">Quels mots à trouver</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
-        <source>Grouping and order</source>
-        <translation type="unfinished">Grouper et ordonner</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
-        <source>Wildcards (partial words)</source>
-        <translation type="unfinished">Jokers (mots partiels)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
-        <source>Text fields (different parts of text)</source>
-        <translation type="unfinished">Champs texte (différentes parties du texte)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
-        <source>Other syntax features</source>
-        <translation type="unfinished">Autres fonctionalités syntaxiques</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
-        <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
-        <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
-        <translation type="unfinished">Rechercher des termes séparés par des espaces. &lt;strong&gt;AND&lt;/strong&gt; (tous les mots), &lt;strong&gt;OR&lt;/strong&gt; (quelques mots) et &lt;strong&gt;NOT&lt;/strong&gt; (sauf les mots suivants) peuvent être ajoutés entre les mots. Si aucun n&apos;est ajouté explicitement, OR est automatiquement utilisé. &apos;&lt;strong&gt;+&lt;/strong&gt;mot&apos; signifie que le mot doit être dans les résultats, &apos;&lt;strong&gt;-&lt;/strong&gt;mot&apos; signifie qu&apos;il ne doit pas être dans les résultats.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
-        <source>jesus AND god</source>
-        <comment>Do not translate &quot;AND&quot;.</comment>
-        <translation type="unfinished">jésus AND dieu</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
-        <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
-        <translation type="unfinished">Trouver les verset contenant &apos;Jésus&apos; et &apos;Dieu&apos;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
-        <source>jesus OR god</source>
-        <comment>Do not translate &quot;OR&quot;.</comment>
-        <translation type="unfinished">jésus OR dieu</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
-        <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
-        <translation type="unfinished">Trouver les versets contenant &apos;Jésus&apos; ou &apos;Dieu&apos; ou les deux</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
-        <source>jesus NOT god</source>
-        <comment>Do not translate &quot;NOT&quot;.</comment>
-        <translation type="unfinished">jésus NOT dieu</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
-        <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
-        <translation type="unfinished">Trouver les versets contenant &apos;Jésus&apos; mais pas &apos;Dieu&apos;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
-        <source>+jesus -god</source>
-        <translation type="unfinished">+jésus -dieu</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
-        <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
-        <translation type="unfinished">Les mots peuvent être groupés avec des &lt;strong&gt;parenthèses&lt;/strong&gt;. L&apos;ordre strict peut être défini par des &lt;strong&gt;guillemets&lt;/strong&gt;.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
-        <source>(a AND b) OR c</source>
-        <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
-        <translation type="unfinished">(a AND b) OR c</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
-        <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
-        <translation type="unfinished">Trouver les versets contenant &apos;a&apos; AND &apos;b&apos;, et les versets contenant &apos;c&apos;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
-        <source>&quot;says lord&quot;</source>
-        <translation type="unfinished">&quot;le seigneur dit&quot;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
-        <source>&quot;says the lord&quot;</source>
-        <translation type="unfinished">&quot;dit le seigneur&quot;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
-        <source>Finds all verses with &apos;says the LORD&apos;</source>
-        <translation type="unfinished">Trouver tous les versets contenant &apos;dit le Signeur&apos;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
-        <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
-        <translation type="unfinished">&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; détecte une séquence quelconque de 0 ou plus caractères, alors que &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; détecte un seul caractère. Un joker ne peut pas être utilisé au début d&apos;un mot.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
-        <source>a*</source>
-        <translation type="unfinished">a*</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
-        <source>All words beginning with &apos;a&apos;</source>
-        <translation type="unfinished">Tous les mots commençant par &apos;a&apos;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
-        <source>a*a</source>
-        <translation type="unfinished">a*e</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
-        <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
-        <translation type="unfinished">&apos;Assyrie&apos;, &apos;arôme&apos;, etc.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
-        <source>a?</source>
-        <translation type="unfinished">e?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
-        <source>&apos;at&apos; and &apos;an&apos;</source>
-        <translation type="unfinished">&apos;en&apos; et &apos;et&apos;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
-        <source>a??a</source>
-        <translation type="unfinished">a??e</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
-        <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
-        <translation type="unfinished">&apos;aire&apos;, &apos;Asie&apos; etc.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
-        <source>Available text fields:</source>
-        <translation type="unfinished">Champs texte disponibles:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
-        <source>Searches headings</source>
-        <translation type="unfinished">Recherche d&apos;en-tête</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
-        <source>Searches footnotes</source>
-        <translation type="unfinished">Recherche de notes de bas de pages</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
-        <source>Searches Strong&apos;s numbers</source>
-        <translation type="unfinished">Recherche de numéros Strong</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
-        <source>Searches morphology codes</source>
-        <translation type="unfinished">Recherche de codes morphologiques</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
-        <source>Examples:</source>
-        <translation type="unfinished">Exemples:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
-        <source>heading:Jesus</source>
-        <comment>Do not translate &quot;heading:&quot;.</comment>
-        <translation type="unfinished">heading:Jésus</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
-        <source>Finds headings with &apos;Jesus&apos;</source>
-        <translation type="unfinished">Recherche les en-tête contenant &apos;Jésus&apos;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
-        <source>footnote:Jesus AND footnote:said</source>
-        <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
-        <translation type="unfinished">footnote:Jésus AND footnote:dit</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
-        <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
-        <translation type="unfinished">Recherche les pieds de page contenant &apos;Jésus&apos; et &apos;dit&apos;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
-        <source>strong:G846</source>
-        <comment>Do not translate &quot;strong:&quot;.</comment>
-        <translation type="unfinished">strong:G846</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
-        <source>Finds verses with Strong&apos;s Greek number 846</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
-        <source>morph:&quot;N-NSF&quot;</source>
-        <comment>Do not translate &quot;morph:&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
-        <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
-        <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
-        <translation type="unfinished">BibleTime utilise le moteur de recherche CLucene. Vous pouvez en savoir plus sur &lt;a href=&apos;%1&apos;&gt;la page de la syntaxe de Lucene&lt;/a&gt; (dans un navigateur externe).</translation>
-    </message>
-</context>
-<context>
-    <name>Search::CModuleResultView</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="50"/>
-        <source>Work</source>
-        <translation>Module</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="50"/>
-        <source>Hits</source>
-        <translation>Résultats
-            </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="64"/>
-        <source>Copy...</source>
-        <translation>Copier...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="66"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="76"/>
-        <source>Reference only</source>
-        <translation>Références seulement</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="69"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="79"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="86"/>
-        <source>Reference with text</source>
-        <translation>Références avec le texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="74"/>
-        <source>Save...</source>
-        <translation>Enregistrer...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="84"/>
-        <source>Print...</source>
-        <translation>Imprimer...</translation>
-    </message>
-    <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Copier le résultat de la recherche ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
-        <source>Copying search result</source>
-        <translation>Copie du résultat de la recherche</translation>
-    </message>
-    <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Enregistre le résultat de la recherche ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
-        <source>Saving search result</source>
-        <translation>Enregistrement du résultat de la recherche</translation>
-    </message>
-    <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Imprimer les résultats de recherche ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
-        <source>Printing search result</source>
-        <translation>Impression des résultats de la recherche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="49"/>
-        <source>Works chosen for the search and the number of the hits in each work</source>
-        <translation>Modules choisis pour la recherche et le nombre de résultats dans chaque module</translation>
-    </message>
-</context>
-<context>
-    <name>Search::CRangeChooserDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="136"/>
-        <source>S&amp;earch range:</source>
-        <translation>Plage de r&amp;echerche:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="137"/>
-        <source>Select a scope from the list to edit the searchranges</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="148"/>
-        <source>&amp;Name:</source>
-        <translation>&amp;Nom:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="151"/>
-        <source>Edi&amp;t current range:</source>
-        <translation>Edi&amp;ter la palge de recherche courrante:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="152"/>
-        <source>Change the search ranges of the selected searchscope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="157"/>
-        <source>Parsed search range:</source>
-        <translation>Plages de recherche analysées:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="171"/>
-        <source>New range</source>
-        <translation>Nouvelle plage de recherche</translation>
-    </message>
-    <message>
-        <source>&lt;invalid name of search range&gt;</source>
-        <translation type="obsolete">&lt;nom de plage de recherche invalide&gt;</translation>
-    </message>
-    <message>
-        <source>Select a scope from the list to edit the search ranges</source>
-        <translation type="obsolete">Choisir une plage de recherche de la liste pour modifier les portées de recherche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="140"/>
-        <source>&amp;Add new scope</source>
-        <translation>&amp;Ajouter une nouvelle plage de recherche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="141"/>
-        <source>Add a new search scope. First enter an appropriate name, then edit the search ranges.</source>
-        <translation>Ajoute une nouvelle plage de recherche. Entrer un nom approprié puis éditer la plage de recherche.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="145"/>
-        <source>Delete current &amp;scope</source>
-        <translation>Supprimer la &amp;plage de recherche actuelle</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="146"/>
-        <source>Delete the selected search scope</source>
-        <translation>Supprimer la plage de recherche sélectionnée</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="149"/>
-        <source>Change the name of the selected search scope</source>
-        <translation>Modifier le nom de la plage de recherche sélectionnée</translation>
-    </message>
-    <message>
-        <source>Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="obsolete">Modifie l&apos;étendue de la plage de recherche sélectionnée. Examinez les plages prédéfinies afin de voir comment les étendues de recherche sont construites.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="158"/>
-        <source>The search ranges which will be used for the search, parsed to the canonical form</source>
-        <translation>Les plages de recherche seront utilisées pour la recherche, analysées sous la forme canonique</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="134"/>
-        <source>Setup Search Scopes</source>
-        <translation>Modifier les plages de recherches</translation>
-    </message>
-</context>
-<context>
-    <name>Search::CSearchDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
-        <source>Missing indices</source>
-        <translation>Indices manquants</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
-        <source>Search</source>
-        <translation>Rechercher</translation>
-    </message>
-    <message>
-        <source>One or more works need indexing before they can be searched.
-This could take a long time. Proceed with indexing?</source>
-        <translation type="obsolete">Un ou plusieurs modules ont besoin d&apos;être indexés avec d&apos;effectuer une recherche.
-Cette opération peut prendre du temps. Procéder à l&apos;indexation ?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
-        <source>The following modules need to be indexed before they can be searched in:</source>
-        <translation type="unfinished">Les modules suivants nécessitent d&apos;être indexés avant de pouvoir faire des recherches dedans:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
-        <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
-        <translation type="unfinished">L&apos;indexation peut prendre du temps. Cliquer &quot;Oui&quot; pour indexer les modules et démarrer la recherche ou &quot;Non&quot; pour annuler la recherche.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
-        <source>Drag any verse reference onto an open Bible window</source>
-        <translation type="unfinished">Glisser une référence de verset sur la fenêtre de Bible ouverte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
-        <source>&amp;Analyze results...</source>
-        <translation>&amp;Analyser les résultats...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
-        <source>Show a graphical analysis of the search result</source>
-        <translation type="unfinished">Afficher une analyse graphique du résultat de la recherche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Fermer</translation>
-    </message>
-</context>
-<context>
-    <name>Search::CSearchResultView</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="39"/>
-        <source>Results</source>
-        <translation>Résultats</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="47"/>
-        <source>Copy...</source>
-        <translation>Copier...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="50"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="64"/>
-        <source>Reference only</source>
-        <translation>Référence seulement</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="54"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="68"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="76"/>
-        <source>Reference with text</source>
-        <translation>Référence avec le texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="61"/>
-        <source>Save...</source>
-        <translation>Sauvegarde...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="73"/>
-        <source>Print...</source>
-        <translation>Imprimer...</translation>
-    </message>
-    <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Imprimer le résultat de la recherche ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
-        <source>Printing search result</source>
-        <translation>Impression du résultat de la recherche</translation>
-    </message>
-    <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Enregistre le résultat de la recherche ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
-        <source>Saving search result</source>
-        <translation>Enregistrement du résultat de la recherche</translation>
-    </message>
-    <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Copier le résultat de la recherche ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
-        <source>Copying search result</source>
-        <translation>Copie du résultat de la recherche</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="38"/>
-        <source>Search result of the selected work</source>
-        <translation>Résultat de la recherche pour le module sélectionné</translation>
-    </message>
-</context>
-<context>
-    <name>StandardWorksTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation type="unfinished">Les modules standards sont utilisés lorsqu&apos;aucun module n&apos;est spécifié en particulier, par exemple lorsque l&apos;on clique sur un lien dans une Bible ou un lexique</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>Bible:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>La Bible par défaut est utilisée lors d&apos;un clic sur un lien hypertexte vers une Bible</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>Commentaire:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>Le commentaire par défaut est utilisé quand un lien sur un commentaire est cliqué</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation>Lexique:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>Le lexique par défaut est utilisé quand un lien hypertexte sur un lexique est cliqué</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>Lectures quotidiennes:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>La lecture quotidienne par défaut sera utilisée pour afficher une courte lecture au démarrage</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>Lexique des numéros Strong Hébreux:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>Le lexique Hébreu par défaut est utilisé quand un lien hypertexte sur un lexique Hébreu est cliqué</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>Lexique des numéros Strong grecs:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>Le lexique grec par défaut est utilisé quand un lien hypertexte sur un lexique grec est cliqué</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>Lexique morphologique Hébreu:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>Le lexique morphologique standard pour l&apos;Hébreu est utilisé quand un lien sur une marque morphologique dans un texte Hébreu est suivit</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation>Lexique morphologique grec:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>Le lexique morphologique standard pour le grec est utilisé quand un lien sur une marque morphologique dans un texte grec est suivit</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="62"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>TextFiltersTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation type="unfinished">Revenir à la ligne après chaque verset</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">Afficher les numéros de verset</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation type="unfinished">Afficher les en-têtes</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">Afficher les références croisées</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">Afficher les accents grecs</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Afficher les voyelles hébraïques</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Afficher la cantillation hébraïque</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">Afficher la segmentation morphologique</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation type="unfinished">Utiliser les variantes textuelles</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="unfinished">Les filtres contrôlent l&apos;apparence du texte. Ici vous pouvez choisir la configuration par défaut pour tous les filtres. Vous pouvez modifier cette configuration dans chaque fenêtre d&apos;affichage.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>findTextDialog</name>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation>Rechercher du texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation>Le texte à rechercher</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation>&amp;Sensible à la casse</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation>Trouver le dernier emplacement du texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation>&amp;Précédent</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation>Trouver le prochain emplacement du texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation>Suiva&amp;nt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation>Fermer la boite de dialogue</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Fermer</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/messages/bibletime_ui_hu.ts b/i18n/messages/bibletime_ui_hu.ts
index afac5a6..6603e95 100644
--- a/i18n/messages/bibletime_ui_hu.ts
+++ b/i18n/messages/bibletime_ui_hu.ts
@@ -5,9 +5,9 @@
     <name></name>
     <message>
         <source></source>
-        <translatorcomment>Bibletime felhasználói felület fordítás
-Copyright (C) 2011 The Bibletime Team, http://www.bibletime.info
-Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</translatorcomment>
+        <translatorcomment>Bibletime User Interface translation
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
+This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
 </context>
@@ -22,452 +22,457 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BibleTime</name>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
+        <location filename="../../src/bibletime_init.cpp" line="741"/>
         <source>&amp;File</source>
         <translation>&amp;Fájl</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&amp;View</source>
         <translation>&amp;Nézet</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&amp;Search</source>
         <translation>&amp;Keresés</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&amp;Window</source>
         <translation>&amp;Ablak</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <source>Sw&amp;itch session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&amp;ttings</source>
         <translation>Beállí&amp;tások</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&amp;Help</source>
         <translation>&amp;Segítség</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&amp;Show toolbar</source>
         <translation>E&amp;szköztár mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&amp;Fullscreen mode</source>
         <translation>&amp;Teljes képernyő</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&amp;Quit</source>
         <translation>&amp;Kilépés</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
+        <location filename="../../src/bibletime_init.cpp" line="251"/>
         <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
         <translation>Nyissa meg a BibleTime Bibliatanulmányozó segédletét. &lt;br/&gt; Ez a segédlet bevezeti a Biblia tanulmánsozásának alapelveibe.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
+        <location filename="../../src/bibletime_init.cpp" line="256"/>
         <source>Information about the BibleTime program</source>
         <translation>A BibleTime program</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>Munkafolyamat betö&amp;ltése</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&amp;Delete session</source>
         <translation>&amp;Munkafolyamat törlése</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&amp;Arrangement mode</source>
         <translation>&amp;Ablakok automatikus igazítása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&amp;Manual mode</source>
         <translation>&amp;Kézi elrendezés</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &amp;vertically</source>
         <translation>&amp;Függőleges mozaik elrendezés</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &amp;horizontally</source>
         <translation>&amp;Vízszintes mozaik elrendezés</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&amp;cascade</source>
         <translation>�tla&amp;poló elrendezés</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&amp;Cascade</source>
         <translation>�tla&amp;polás</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &amp;vertically</source>
         <translation>&amp;Függőleges mozaik</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &amp;horizontally</source>
         <translation>&amp;Vízszintes mozaik</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&amp;ose all windows</source>
         <translation>Öss&amp;zes ablak bezárása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
+        <location filename="../../src/bibletime_init.cpp" line="224"/>
         <source>Close all open windows inside BibleTime</source>
         <translation>Az összes BibleTime ablak bezárása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
+        <location filename="../../src/bibletime_init.cpp" line="241"/>
         <source>&amp;Handbook</source>
         <translation>&amp;Kézikönyv</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&amp;Bible Study Howto</source>
         <translation>Hogyan tanulmányozza a &amp;Bibliát</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
+        <location filename="../../src/bibletime_slots.cpp" line="533"/>
         <source>Please enter a name for the new session.</source>
         <translation>Adjon nevet az új folyamatnak.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
+        <location filename="../../src/bibletime_slots.cpp" line="541"/>
+        <source>Session already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_slots.cpp" line="542"/>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="107"/>
         <source>Quit BibleTime</source>
         <translation>BibleTime bezárása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
+        <location filename="../../src/bibletime_init.cpp" line="114"/>
         <source>Toggle fullscreen mode of the main window</source>
         <translation>A fő ablak teljes képernyősre váltása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
+        <location filename="../../src/bibletime_init.cpp" line="123"/>
         <source>Search in &amp;open works...</source>
         <translation>Keresés a megnyit&amp;ott munkákban...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &amp;Bible...</source>
         <translation>Keresés az alapértelmezett &amp;Bibliában...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &amp;new session...</source>
         <translation>Me&amp;ntés új folyamatként...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
+        <location filename="../../src/bibletime_init.cpp" line="140"/>
         <source>Create and save a new session</source>
         <translation>Új folyamat létrehozása és mentése</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
+        <location filename="../../src/bibletime_init.cpp" line="147"/>
         <source>Manually arrange the open windows</source>
         <translation>Megnyitott ablakok kézi igazítása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
+        <location filename="../../src/bibletime_init.cpp" line="154"/>
         <source>Automatically tile the open windows vertically (arrange side by side)</source>
         <translation>A megnyitott ablakok automatikus függőleges elrendezése (egymás alá rendezése)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
+        <location filename="../../src/bibletime_init.cpp" line="161"/>
         <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
         <translation>A megnyitott ablakok automatikus vízszintes elrendezése (egymás mellé rendezése)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
+        <location filename="../../src/bibletime_init.cpp" line="165"/>
         <source>Auto-&amp;tile</source>
         <translation>Automatikus &amp;mozaik elrendezés</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
+        <location filename="../../src/bibletime_init.cpp" line="168"/>
         <source>Automatically tile the open windows</source>
         <translation>Automatikusan mozaik elrendezésre váltja a megnyitott ablakokat</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
+        <location filename="../../src/bibletime_init.cpp" line="172"/>
         <source>Ta&amp;bbed</source>
         <translation>La&amp;ponként</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
+        <location filename="../../src/bibletime_init.cpp" line="175"/>
         <source>Automatically tab the open windows</source>
         <translation>Automatikusan laponkénti nézetbe helyezi a megnyitott ablakokat</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
+        <location filename="../../src/bibletime_init.cpp" line="182"/>
         <source>Automatically cascade the open windows</source>
         <translation>A megnyitott ablakok automatikus átfedő elrendezése (egymásra lapolva)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
+        <location filename="../../src/bibletime_init.cpp" line="189"/>
         <source>Cascade the open windows</source>
         <translation>Megnyitott ablakok egymásra lapolása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
+        <location filename="../../src/bibletime_init.cpp" line="193"/>
         <source>&amp;Tile</source>
         <translation>&amp;Mozaik</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
+        <location filename="../../src/bibletime_init.cpp" line="196"/>
         <source>Tile the open windows</source>
         <translation>Mozaik elrendezésre váltja a megnyitott ablakokat</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
+        <location filename="../../src/bibletime_init.cpp" line="203"/>
         <source>Vertically tile (arrange side by side) the open windows</source>
         <translation>A megnyitott ablakok automatikus (egymás alá rendezése) függőleges elrendezése </translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
+        <location filename="../../src/bibletime_init.cpp" line="210"/>
         <source>Horizontally tile (arrange on top of each other) the open windows</source>
         <translation>A megnyitott ablakok automatikus (egymás mellé rendezése) vízszintes elrendezése </translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
+        <location filename="../../src/bibletime_init.cpp" line="214"/>
         <source>Close &amp;window</source>
         <translation>Ablakok be&amp;zárása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
+        <location filename="../../src/bibletime_init.cpp" line="217"/>
         <source>Close the current open window</source>
         <translation>Jelenlegi nyitott ablak bezárása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
+        <location filename="../../src/bibletime_init.cpp" line="228"/>
         <source>&amp;Configure BibleTime...</source>
         <translation>Bibletime beá&amp;llítása...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime&apos;s preferences</source>
         <translation>BibleTime alapértelmezéseinek beállítása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
+        <location filename="../../src/bibletime_init.cpp" line="234"/>
         <source>Bookshelf &amp;Manager...</source>
         <translation>Könyvespolc &amp;menedzser...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
+        <location filename="../../src/bibletime_init.cpp" line="237"/>
         <source>Configure your bookshelf and install/update/remove/index works</source>
         <translation>A &quot;könyvespolc&quot; beállítása, dokumentumok telepítése/frissítése/törlése/indexelése</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
+        <location filename="../../src/bibletime_init.cpp" line="244"/>
         <source>Open BibleTime&apos;s handbook</source>
         <translation>BibleTime kézikönyv megnyitása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&amp;Tip of the day...</source>
         <translation>A nap &amp;tippje...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
+        <location filename="../../src/bibletime_init.cpp" line="263"/>
         <source>Show tips about BibleTime</source>
         <translation>Ötletek mutatása a Bibletime használatához</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
+        <location filename="../../src/bibletime_init.cpp" line="402"/>
         <source>Toggle visibility of the bookshelf window</source>
         <translation>A könyvespolc ablak láthatóságának kapcsolója</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
+        <location filename="../../src/bibletime_init.cpp" line="406"/>
         <source>Toggle visibility of the bookmarks window</source>
         <translation>A könyvjelző ablak láthatóságának kapcsolója</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
+        <location filename="../../src/bibletime_init.cpp" line="410"/>
         <source>Toggle visibility of the mag window</source>
         <translation>A nagyító ablak láthatóságának kapcsolója</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
+        <location filename="../../src/bibletime_init.cpp" line="735"/>
         <source>Main toolbar</source>
         <translation>Fő eszköztár</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
+        <location filename="../../src/bibletime_init.cpp" line="736"/>
         <source>Navigation toolbar</source>
         <translation>Navigációs eszköztár</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
+        <location filename="../../src/bibletime_init.cpp" line="737"/>
         <source>Works toolbar</source>
         <translation>Munkák eszköztár</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
+        <location filename="../../src/bibletime_init.cpp" line="738"/>
         <source>Tools toolbar</source>
         <translation>Eszközök eszköztár</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
+        <location filename="../../src/bibletime_init.cpp" line="739"/>
         <source>Format toolbar</source>
         <translation>Formátum eszköztár</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
+        <location filename="../../src/bibletime_init.cpp" line="777"/>
         <source>Show main toolbar</source>
         <translation>Fő eszköztár mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
+        <location filename="../../src/bibletime_init.cpp" line="780"/>
         <source>Show navigation bar</source>
         <translation>Navigációs sáv mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
+        <location filename="../../src/bibletime_init.cpp" line="783"/>
         <source>Show works toolbar</source>
         <translation>Munkák eszköztár mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
+        <location filename="../../src/bibletime_init.cpp" line="786"/>
         <source>Show tools toolbar</source>
         <translation>Eszközök eszköztár mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
+        <location filename="../../src/bibletime_init.cpp" line="789"/>
         <source>Show formatting toolbar</source>
         <translation>Formázás eszköztár mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
+        <location filename="../../src/bibletime_init.cpp" line="792"/>
         <source>Show bookshelf</source>
         <translation>Könyvespolc megjelenítése</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
+        <location filename="../../src/bibletime_init.cpp" line="795"/>
         <source>Show bookmarks</source>
         <translation>Könyvjelzők megjelenítése</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
+        <location filename="../../src/bibletime_init.cpp" line="798"/>
         <source>Show mag</source>
         <translation>Nagyító ablak megjelenítése</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
+        <location filename="../../src/bibletime_init.cpp" line="743"/>
         <source>Toolbars</source>
         <translation>Eszköztárak</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <location filename="../../src/bibletime_init.cpp" line="774"/>
         <source>Show toolbars in text windows</source>
         <translation>Eszköztárak megjelenítése a szöveg ablakban</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
+        <location filename="../../src/bibletime_init.cpp" line="801"/>
         <source>Show parallel text headers</source>
         <translation>Párhuzamos szöveg fejlécek megjelenítése</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
+        <location filename="../../src/bibletime_init.cpp" line="747"/>
         <source>O&amp;pen windows</source>
         <translation>A&amp;blak megnyitása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show &quot;Whats this widget&quot; dialog</source>
         <translation>&quot;Mi ez a minialkalmazás?&quot; ablak mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
+        <location filename="../../src/bibletime_init.cpp" line="954"/>
         <source>Whats this widget?</source>
         <translation>Mi ez a minialkalmazás?</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
+        <location filename="../../src/bibletime_init.cpp" line="126"/>
         <source>Search in all works that are currently open</source>
         <translation>Keresés minden megnyitott dokumentumban</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
+        <location filename="../../src/bibletime_init.cpp" line="133"/>
         <source>Search in the standard Bible</source>
         <translation>Keresés az alapértelmezett Bibliában</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
+        <location filename="../../src/bibletime_slots.cpp" line="532"/>
         <source>New Session</source>
         <translation>Új folyamat</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
+        <location filename="../../src/bibletime.cpp" line="77"/>
         <source>Initializing the SWORD engine...</source>
         <translation>A SWORD indítása...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
+        <location filename="../../src/bibletime.cpp" line="85"/>
         <source>Creating BibleTime&apos;s user interface...</source>
         <translation>BibleTime felhasználói felület létrehozása...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
+        <location filename="../../src/bibletime.cpp" line="92"/>
         <source>Initializing menu- and toolbars...</source>
         <translation>Menük és eszköztárak indítása...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Unlock Work</source>
         <translation>Dokumentum feloldása</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Enter the unlock key for %1.</source>
         <translation>Gépelje be a(z) %1 feloldó kódját.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
+        <location filename="../../src/bibletime.cpp" line="214"/>
         <source>Warning: Invalid unlock key!</source>
         <translation>Hiba: Hibás feloldó kód!</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
+        <location filename="../../src/bibletime.cpp" line="215"/>
         <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
         <translation>A feloldókulcs amit használt nem oldotta fel ezt a modult. Kérjük próbálja újra.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
+        <location filename="../../src/bibletime_init.cpp" line="255"/>
         <source>&amp;About BibleTime</source>
         <translation>&amp;Névjegy</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
+        <location filename="../../src/bibletime_init.cpp" line="733"/>
         <source>Bookmarks</source>
         <translation>Könyvjelzők</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
+        <location filename="../../src/bibletime_init.cpp" line="734"/>
         <source>Mag</source>
         <translation>Nagyító</translation>
     </message>
@@ -475,7 +480,8 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BibleTimeApp</name>
     <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
+        <location filename="../../src/bibletimeapp.cpp" line="59"/>
+        <location filename="../../src/mobile/bibletimeapp.cpp" line="63"/>
         <source>Fatal error!</source>
         <translation>Végzetes hiba!</translation>
     </message>
@@ -483,7 +489,7 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtAboutDialog</name>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
         <source>BibleTime is an easy to use but powerful Bible study tool.</source>
         <translation>BibleTime egy könnyen használható Bibliatanulmányozó eszköz.</translation>
     </message>
@@ -498,47 +504,47 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
         <translation>A teljes jogilag érvényes licensz lentebb található. </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="109"/>
         <source>About BibleTime</source>
         <translation>Információk a BibleTimeról</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="121"/>
         <source>&amp;BibleTime</source>
         <translation>&amp;BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="126"/>
         <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
         <translation>Fejlesztőket és fordítókat keresünk. Amennyiben csatlakozna hozzzánk, küldjön egy emailt ide: %1.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="137"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Közreműködők</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="148"/>
         <source>The following people contributed to BibleTime:</source>
         <translation>A következő emberek működtek közre a BibleTime létrehozásában:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="150"/>
         <source>documentation and translation manager</source>
         <translation>dokumentációs és fordítási menedzser</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="172"/>
         <source>project manager</source>
         <translation>projekt menedzser</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>tester</source>
         <translation>tesztelő</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>usability expert</source>
         <translation>hasznáhatósági szakértő</translation>
     </message>
@@ -558,57 +564,57 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
         <translation>&amp;Licensz</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
         <source>designer</source>
         <translation>tervező</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation>(c)1999-2013, The BibleTime Team </translation>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="130"/>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished">(c)1999-2014, The BibleTime Team </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="139"/>
         <source>developer</source>
         <translation>fejlesztő</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
         <source>project founder</source>
         <translation>projekt alapító</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="157"/>
         <source>packager</source>
         <translation>csomagkészítő</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="158"/>
         <source>creator of The Sword Project</source>
         <translation>a Sword Projekt alapítója</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
         <source>domain sponsor</source>
         <translation>domain szponzor</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
         <source>howto</source>
         <translation>hogyan</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="141"/>
         <source>artist</source>
         <translation>művész</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="173"/>
         <source>documentation</source>
         <translation>dokumentáció</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="188"/>
         <source>The following people translated BibleTime into their language:</source>
         <translation>A következő emberek vettek részt a BibleTime fordításában:</translation>
     </message>
@@ -656,37 +662,37 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtBibleKeyWidget</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="110"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Keresztülgörgetés a lista elemein. Nyomja le a gombot, és mozgassa az egeret a tétel növeléséhez vagy csökkentéséhez.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
         <source>Next book</source>
         <translation>Következő könyv</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
         <source>Previous book</source>
         <translation>Előző könyv</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="117"/>
         <source>Next chapter</source>
         <translation>Következő fejezet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
         <source>Previous chapter</source>
         <translation>Előző fejezet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="122"/>
         <source>Next verse</source>
         <translation>Következő vers</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
         <source>Previous verse</source>
         <translation>Előző vers</translation>
     </message>
@@ -765,27 +771,27 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtBookshelfGroupingMenu</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
         <source>Category/Language</source>
         <translation>Kategória/Nyelv</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
         <source>Category</source>
         <translation>Kategória</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
         <source>Language/Category</source>
         <translation>Nyelv/Kategória</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="105"/>
         <source>Language</source>
         <translation>Nyelv</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="108"/>
         <source>No grouping</source>
         <translation>Nincs csoportosítás</translation>
     </message>
@@ -793,7 +799,7 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtBookshelfModel</name>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
+        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="78"/>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
@@ -801,23 +807,23 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtBookshelfWidget</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="157"/>
         <source>Fi&amp;lter:</source>
         <translation>Szű&amp;rő:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="158"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
         <source>Grouping</source>
         <translation>Csoportosítás</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="159"/>
         <source>Change the grouping of items in the bookshelf.</source>
         <translation>A könyvespolc eleminek újracsoportosítása.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
         <source>Show/hide works</source>
         <translation>Munkák megjelenítése/elrejtése</translation>
     </message>
@@ -831,69 +837,130 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
     </message>
 </context>
 <context>
+    <name>BtConfig</name>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="46"/>
+        <source>Old testament</source>
+        <translation type="unfinished">Ószövetség</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="47"/>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation type="unfinished">Mózes/Tóra</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="48"/>
+        <source>History</source>
+        <translation type="unfinished">Előzmény</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="49"/>
+        <source>Prophets</source>
+        <translation type="unfinished">Próféták</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="50"/>
+        <source>New testament</source>
+        <translation type="unfinished">Újszövetség</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="51"/>
+        <source>Gospels</source>
+        <translation type="unfinished">Evangéliumok</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="52"/>
+        <source>Letters/Epistles</source>
+        <translation type="unfinished">Levelek</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="53"/>
+        <source>Paul&apos;s Epistles</source>
+        <translation type="unfinished">Pál levelei</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="89"/>
+        <source>Error loading configuration!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="90"/>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BtConfigCore</name>
+    <message>
+        <location filename="../../src/backend/config/btconfigcore.cpp" line="62"/>
+        <source>Default Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtDisplaySettingsButton</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="103"/>
         <source>Use linebreaks after each verse</source>
         <translation>Sotrörés minden vers után</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
         <source>Show verse numbers</source>
         <translation>Vers számok mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
         <source>Show headings</source>
         <translation>Fejléc mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
         <source>Highlight words of Jesus</source>
         <translation>Jézus szavainak kiemelése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
         <source>Show Hebrew vowel points</source>
         <translation>Héber magánhangzó pontok mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
         <source>Show Hebrew cantillation marks</source>
         <translation>Héber hangsúlyozás jelzése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
         <source>Show Greek accents</source>
         <translation>Görög kiejtés mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
         <source>Use alternative textual variant</source>
         <translation>Alternatív szöveges változat használata</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
         <source>Show scripture cross-references</source>
         <translation>Kereszthivatkozások mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
         <source>Show footnotes</source>
         <translation>Lábjegyzetek mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
         <source>Show morph segmentation</source>
         <translation>Szótő elválasztás mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="120"/>
         <source>Display settings</source>
         <translation>Megjelenítés beállítása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="123"/>
         <source>Display settings: No options available</source>
         <translation>Megjelenítés beállításai: Nincs elérhető opció</translation>
     </message>
@@ -901,27 +968,45 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtEditBookmarkDialog</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="71"/>
         <source>Edit Bookmark</source>
         <translation>Könyvjelző szerkesztése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
         <source>Location:</source>
         <translation>Hely:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
         <source>Title:</source>
         <translation>Cím:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
         <source>Description:</source>
         <translation>Leírás:</translation>
     </message>
 </context>
 <context>
+    <name>BtFindWidget</name>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="28"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="29"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="74"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtFontChooserWidget</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
@@ -942,27 +1027,27 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="151"/>
         <source>&amp;Language:</source>
         <translation>&amp;Nyelv:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
         <source>The font selection below will apply to all texts in this language</source>
         <translation>Az alábbi betűkiválasztás az adott nyelv összes szövegére érvényes lesz</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
         <source>Use custom font</source>
         <translation>Egyedi betűkészlet használata</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
         <source>Optionally specify a custom font for each language:</source>
         <translation>Tetszés szerint telepíthet betűtípusokat minden egyes nyelvhez:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="150"/>
         <source>Fonts</source>
         <translation>Betűkészletek</translation>
     </message>
@@ -970,67 +1055,67 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtIndexPage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="124"/>
         <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
         <translation>Ha kiválasztja, azok az indexek, melyekhez nincs egyező dokumentum, törlésre kerülnek a BibleTime indításakor</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
         <source>Automatically delete orphaned indexes when BibleTime starts</source>
         <translation>Elárvult indexek automatikus törlése a BibleTime indulásakor</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="127"/>
         <source>Delete the selected indexes</source>
         <translation>A kiválasztott indexek törlése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
         <source>Delete</source>
         <translation>Törlés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="130"/>
         <source>Create new indexes for the selected works</source>
         <translation>A választott dokumentumok indexelése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Work</source>
         <translation>Dokumentum</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Index size</source>
         <translation>Index méret</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="107"/>
         <source>%1 KiB</source>
         <translation>%1 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="114"/>
         <source>0 KiB</source>
         <translation>0 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="122"/>
         <source>Search Indexes</source>
         <translation>Keresési indexek</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="91"/>
         <source>Indexed Works</source>
         <translation>Indexelt munkák</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="96"/>
         <source>Unindexed Works</source>
         <translation>Nem indexelt munkák</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
         <source>Create...</source>
         <translation>Készítés...</translation>
     </message>
@@ -1056,17 +1141,17 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtInstallModuleChooserDialogModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="88"/>
         <source>Work</source>
         <translation>Dokumentum</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="89"/>
         <source>Installation source</source>
         <translation>Telepítési forrás</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="90"/>
         <source>Version</source>
         <translation>Verzió</translation>
     </message>
@@ -1159,12 +1244,12 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
         <translation>A célkonyvtár nem írható, vagy nem létezik. A telepítés nem lehetséges, míg ki nem javítja a hibát.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="388"/>
         <source>Delete Source?</source>
         <translation>Forrás törlése?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="389"/>
         <source>Do you really want to delete this source?</source>
         <translation>Tényleg törli a forrást?</translation>
     </message>
@@ -1177,17 +1262,17 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtInstallPageModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="75"/>
         <source>Work</source>
         <translation>Dokumentum</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="76"/>
         <source>Version</source>
         <translation>Verzió</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="77"/>
         <source>Description</source>
         <translation>Leírás</translation>
     </message>
@@ -1203,99 +1288,99 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtInstallPathDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="35"/>
         <source>Bookshelf Folders</source>
         <translation>Könyvespolc mappái</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
         <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
         <translation>Több mappába is telepíthet munkákat. Beállítás után kiválaszthatja az aktuálisat a telepítési lapon.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="45"/>
         <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
         <translation>A BibleTime és a SWORD rendszer megtalálja a telepített munkákat a megadott mappákban. Amennyiben töröl innen egy mappát, a mappa a továbbiakban is megtalálható marad teljes tartalmával a rendszerén.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="48"/>
         <source>Configure bookshelf folders</source>
         <translation>Könyvespolc mappáinak beállítása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="53"/>
         <source>Configuration file for the folders is: </source>
         <translation>A mappák konfigurációs állomanya a következő:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="61"/>
         <source>Folders where new works can be installed</source>
         <translation>Ide telepíthetők az új munkák</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
         <source>Read-only folders</source>
         <translation>Csak olvasható mappák</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="66"/>
         <source>Nonexistent folders</source>
         <translation>Nem létező mappák</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="80"/>
         <source>&amp;Add...</source>
         <translation>Hozzá&amp;adás...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="86"/>
         <source>&amp;Edit...</source>
         <translation>Sz&amp;erkesztés...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="92"/>
         <source>&amp;Remove</source>
         <translation>&amp;Törlés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="81"/>
         <source>Add new folder</source>
         <translation>Új mappa megadása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="87"/>
         <source>Edit the selected folder</source>
         <translation>Kiválasztott mappa megadása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="93"/>
         <source>Remove the selected folder</source>
         <translation>Kiválasztott mappa törlése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="167"/>
         <source>This default folder in your home directory can&apos;t be removed</source>
         <translation>Ez az alapértelmezett mappa a saját könyvtárában, nem törölhető</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="194"/>
         <source>Choose Folder</source>
         <translation>Mappa kiválasztása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>Use Folder?</source>
         <translation>Használjuk a mappát?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
         <translation>Ez a mappa nem írható, így a BibleTime nem tud ide telepíteni. Akarja mégis ezt a mappát használni az előző helyett?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
         <translation>Ez a mappa nem írható, így a BibleTime nem tud ide telepíteni. Hozzá akarja adni ezt a mappát a könyvespolc mappáihoz?</translation>
     </message>
@@ -1303,52 +1388,42 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtInstallProgressDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Work</source>
         <translation>Dokumentum</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Progress</source>
         <translation>Folyamat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>Megállítás</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="60"/>
         <source>Stop All</source>
         <translation>Minden folyamat leállítása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Completed</source>
         <translation>Kész</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>Törölve</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="55"/>
         <source>Waiting for turn...</source>
         <translation>Válaszra vár...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="113"/>
         <source>Preparing install...</source>
         <translation>Telepítés előkészítése...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="37"/>
         <source>Install Progress</source>
         <translation>Telepítési folyamat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Failed</source>
         <translation>Sikertelen</translation>
     </message>
@@ -1356,17 +1431,17 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
         <source>Language for names of Bible books:</source>
         <translation>A Biblia könyvcímeinek nyelve:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation>A nyelvek, amelyeket választhatja a Biblia könyvcímeihez</translation>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="136"/>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="133"/>
         <source>Languages</source>
         <translation>Nyelvek</translation>
     </message>
@@ -1416,7 +1491,7 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtModuleManagerDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="57"/>
         <source>Bookshelf Manager</source>
         <translation>Könyvespolc menedzser</translation>
     </message>
@@ -1424,7 +1499,7 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtOpenWorkAction</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="103"/>
         <source>&amp;Open work</source>
         <translation>&amp;Munka megnyitása</translation>
     </message>
@@ -1432,12 +1507,12 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtOpenWorkActionMenu</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="42"/>
         <source>&amp;Grouping order</source>
         <translation>&amp;Csoportok rendezése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="43"/>
         <source>Sets the grouping order for the items in this menu.</source>
         <translation>A menü csoportosításának beállítása.</translation>
     </message>
@@ -1473,47 +1548,47 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtRemovePage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="98"/>
         <source>Remove</source>
         <translation>Törlés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="100"/>
         <source>Select &amp;works to uninstall:</source>
         <translation>Válassza ki a törlendő &amp;dokumentumokat:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&amp;Remove...</source>
         <translation>&amp;Törlés...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="111"/>
         <source>Start removal of %1 works:</source>
         <translation>%1 dokumentum törlése:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="114"/>
         <source>Start removal:</source>
         <translation>Törlés indítása:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="145"/>
         <source>You selected the following work(s): </source>
         <translation>A következő dokumentumo(ka)t választotta ki:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="149"/>
         <source>Do you really want to remove them from your system?</source>
         <translation>Tényleg törölni szeretné a rendszeréből?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
         <source>Remove the selected works</source>
         <translation>Kiválasztott elemek törlése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="151"/>
         <source>Remove Works?</source>
         <translation>Töröljük?</translation>
     </message>
@@ -1534,12 +1609,12 @@ Ez a  fájl a BibleTime licenszelésével megegyező licensszel terjeszthető.</
 <context>
     <name>BtSearchModuleChooserDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="47"/>
         <source>Works to Search in</source>
         <translation>Ezekben a dokumentumokban keressen</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="49"/>
         <source>Select the works which should be searched.</source>
         <translation>Válassza ki a dokumentumokat, amelyekben keresni akar.</translation>
     </message>
@@ -1620,67 +1695,165 @@ shortcut</source>
     </message>
 </context>
 <context>
+    <name>BtStandardWorksTab</name>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="169"/>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation type="unfinished">Az alapértelmezett munkákat akkor használjuk, amikor nincs egyéb munka megnyitva, például amikor egy hivatkozásra kattint egy Biblában vagy lexikonban.</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
+        <translation type="unfinished">Biblia:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="174"/>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation type="unfinished">Az alapértelmezett Bibliát használjuk, ha egy kereszthivatkozásra kattintunk a Bibliában</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</source>
+        <translation type="unfinished">Kommentár:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="178"/>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation type="unfinished">Az alapértelmezett kommentárt használjuk, ha egy kereszthivatkozásra kattintunk egy kommentárban</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
+        <translation type="unfinished">Lexikon:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="182"/>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation type="unfinished">Az alapértelmezett lexikont használjuk, ha egy kereszthivatkozásra kattintunk egy lexikonban</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</source>
+        <translation type="unfinished">Napi áhitat:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="186"/>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation type="unfinished">Az alapértelmezett áhitat lesz használva, egy gyors áhitat mutatásához</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation type="unfinished">Héber Strong&apos;s lexikon:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="190"/>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation type="unfinished">Az alapértelmezett Héber lexikont használjuk, ha egy kereszthivatkozásra kattintunk egy Héber lexikonban</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation type="unfinished">Görög Strong&apos;s lexikon:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="194"/>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation type="unfinished">Az alapértelmezett Görög lexikont használjuk, ha egy kereszthivatkozásra kattintunk egy Görög lexikonban</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</source>
+        <translation type="unfinished">Héber morfológiai lexikon:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="198"/>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation type="unfinished">Az alap héber morfológiai lexikont használjuk, ha nincs egyéb kiválasztva, például, ha  egy morfológiai hivatkozásra kattintunk egy héber szövegben</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</source>
+        <translation type="unfinished">Görög morfológiai lexikon:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="202"/>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation type="unfinished">Az alap görög morfológiai lexikont használjuk, ha nincs egyéb kiválasztva, például, ha  egy morfológiai hivatkozásra kattintunk egy görög szövegben</translation>
+    </message>
+</context>
+<context>
     <name>BtTextFiltersTab</name>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="74"/>
         <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="obsolete">A szűrők szabályozzák a szövegek megjelenését. Itt adhatja meg az alapértelmezett beállításokat. Ablakonként felülírhatja ezeket a beállításokat.</translation>
+        <translation type="unfinished">A szűrők szabályozzák a szövegek megjelenését. Itt adhatja meg az alapértelmezett beállításokat. Ablakonként felülírhatja ezeket a beállításokat.</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="78"/>
         <source>Insert line break after each verse</source>
-        <translation type="obsolete">Sortörés alkalmazása minden vers után</translation>
+        <translation type="unfinished">Sortörés alkalmazása minden vers után</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
         <source>Show verse numbers</source>
-        <translation type="obsolete">Vers számok mutatása</translation>
+        <translation type="unfinished">Vers számok mutatása</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
         <source>Show section headings</source>
-        <translation type="obsolete">Fejléc mutatása</translation>
+        <translation type="unfinished">Fejléc mutatása</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
         <source>Show scripture cross-references</source>
-        <translation type="obsolete">Kereszthivatkozások mutatása</translation>
+        <translation type="unfinished">Kereszthivatkozások mutatása</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="82"/>
         <source>Show Greek accents</source>
-        <translation type="obsolete">Görög kiejtés mutatása</translation>
+        <translation type="unfinished">Görög kiejtés mutatása</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="83"/>
         <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">Héber magánhangzó pontok mutatása</translation>
+        <translation type="unfinished">Héber magánhangzó pontok mutatása</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="84"/>
         <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">Héber hangsúlyozás jelzése</translation>
+        <translation type="unfinished">Héber hangsúlyozás jelzése</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="85"/>
         <source>Show morph segmentation</source>
-        <translation type="obsolete">Szótő elválasztás mutatása</translation>
+        <translation type="unfinished">Szótő elválasztás mutatása</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="86"/>
         <source>Use textual variants</source>
-        <translation type="obsolete">Szöveges változatok használata</translation>
+        <translation type="unfinished">Szöveges változatok használata</translation>
     </message>
 </context>
 <context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
         <source>Add/remove/replace</source>
         <translation>Hozzáadás/eltávolítás/áthelyezés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
         <source>Remove</source>
         <translation>Eltávolítás</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
         <source>Replace</source>
         <translation>�thelyezés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
         <source>Add</source>
         <translation>Hozzáadás</translation>
     </message>
@@ -1688,87 +1861,87 @@ shortcut</source>
 <context>
     <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="69"/>
         <source>Tip Of The Day</source>
         <translation>A nap tippje</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="83"/>
         <source>Show tips at startup</source>
         <translation>Tippek mutatása indításkor</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="94"/>
         <source>Next Tip</source>
         <translation>Következő</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
         <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
         <translation>További Bibliák hozzáadásához párhuzamosan az aktív ablakban válassza ki ezt az ikont, és jelöljön ki egy másik Bibliát.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
         <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
         <translation>További kommentárok hozzáadásához párhuzamosan az aktív ablakban válassza ki ezt az ikont, és jelöljön ki egy másik kommentárt.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="134"/>
         <source>To learn more about the BibleTime project please go to our web site.</source>
         <translation>Hogy többet megtudjon a BibleTime projektről, kérem látogassa meg a weboldalunkat.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="137"/>
         <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
         <translation>A kommentár bibliával szinkronizálásához aktiválja a kommentár ablakot, majd válassza ki ezt az ikont.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
         <source>Select the icon again to stop the synchronization.</source>
         <translation>Kattintson ismét erre az ikonra a szinkron üzemmód kikapcsolásához.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="142"/>
         <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
         <translation>Könyvjelző készítéséhez húzza a vers hivatkozását a Bibliából, vagy a kommentárból a könyvjelző ablakba. Nyíl fogja jelölni azt a pozíciót, ahova a könyvjelző kerül. Egyéb dokumentumtípus bal felső sarkában található a könyvjelzőzhető hivatkozás.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="147"/>
         <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
         <translation>Könyvjelző címének vagy leírásának megváltoztatásához jobb egérgombbal kattintson a könyvjelzőre, válassza ki a könyvjelző szerkesztése menüpontot. A szerkesztés befejezése után láthatóvá válik a megjegyzés az egérmutató könyvjelző fölé vitelével.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="151"/>
         <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
         <translation>Ha több telepítési forrást szeretne használni, használja a Könyvespolc menedzser Hozzáadás gombját, majd a lista lekérése gombot.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="154"/>
         <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
         <translation>Ha több információt szeretne megtudni egy dokumentumról, használja a Könyvespolc ablakot, jobb egérgombbal kattintson a dokumentumra, majd válassza a névjegy menüt.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="157"/>
         <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
         <translation>A Könyvespolc, Könyvjelző és Nagyító ablakok áthelyezhetők az ablakok címsorának elhúzásával. Az új helyeik lehetnek balra, jobbra felette vagy alatta a munkaablaknak. Lehet egyszerre mind felül vagy alul, ekkor fülekkel lehet választani az éppen használandót. Az ablakok átméretezése a keretük mozgatásával lehetséges.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="163"/>
         <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
         <translation>Lehetséges Strong számokra is keresni. Válasszon egy olyan dokumentumot, ami rendelkezik Strong számokkal, vigye az egérmutatót a kívánt szó fölé, majd jobb egérgombbal kattintva válassza a Strong keresés menüt. A párbeszédablak ekkor előhozza az azonos Strong számokkal jelzett előfordulásokat a dokumentumból.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="168"/>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
         <translation>Személyes megjegyzéseket készíthet kívánt vers hivatkozásokhoz. A lehetőség használatához először telepíteni kell a Személyes kommentár dokumentumot. Ez a könyvespolc menedzser Crosswire forrásából, az Angol nyelvű dokumentumok közül a Personal Commentary. Használja az Egyszerű szöveg szerkesztése, vagy a HTML szerkesztése menüt hogy a kommentárt szerkeszthető módban nyissa meg.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
         <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
         <translation>Megtekintheti A Strong szótári információját egy szónak a Nagyító ablakban az egérmutató szó fölé vitelével egy Strong&apos;s képes dokumentumban. A funkcióhoz telepíteni kell a Strong&apos;s héber és görög szótárat a Crosswire forrásból.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="178"/>
         <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
         <translation>Elmentheti a megnyitott ablakai állapotás munkafolyamatként is. Az állapot így később bármikor helyreállítható. Annyi folyamatot menthet így el, amennyit kíván. Ez a lehetőség az Ablak menüből érhető el.</translation>
     </message>
@@ -1784,48 +1957,48 @@ shortcut</source>
 <context>
     <name>CAcceleratorSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="128"/>
         <source>Choose action group:</source>
         <translation>Válassza ki a hatóterületet:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="130"/>
         <source>Main Window</source>
         <translation>FÅ‘ ablak</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
         <source>All text windows</source>
         <translation>Összes szövegablak</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="132"/>
         <source>Bible windows</source>
         <translation>Biblia ablakok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
         <source>Commentary windows</source>
         <translation>Kommentár ablakok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="134"/>
         <source>Lexicon windows</source>
         <translation>Lexikon ablakok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
         <source>Book windows</source>
         <translation>Könyv ablakok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
         <source>
    &quot;%1&quot; in the &quot;%2&quot; group</source>
         <translation>   &quot;%1&quot; a &quot;%2&quot; csoportban</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
         <source>Shortcuts</source>
         <translation>Billentyűkombinációk</translation>
     </message>
@@ -1833,95 +2006,95 @@ shortcut</source>
 <context>
     <name>CBibleReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="64"/>
         <source>Next book</source>
         <translation>Következő könyv</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="68"/>
         <source>Previous book</source>
         <translation>Előző könyv</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="72"/>
         <source>Next chapter</source>
         <translation>Következő fejezet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="76"/>
         <source>Previous chapter</source>
         <translation>Előző fejezet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="80"/>
         <source>Next verse</source>
         <translation>Következő vers</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="84"/>
         <source>Previous verse</source>
         <translation>Előző vers</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="89"/>
         <source>Copy chapter</source>
         <translation>Fejezet másolása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="92"/>
         <source>Save chapter as plain text</source>
         <translation>Fejezet mentése egyszerű szövegként</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="95"/>
         <source>Save chapter as HTML</source>
         <translation>Fejezet mentése HTML formátumban</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="98"/>
         <source>Print chapter</source>
         <translation>Fejezet nyomtatása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="110"/>
         <source>Text of reference</source>
         <translation>A hivatkozás szövege</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
         <source>Reference with text</source>
         <translation>Hivatkozást szöveggel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="253"/>
         <source>Bible window</source>
         <translation>Biblia ablak</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="263"/>
         <source>Copy...</source>
         <translation>Másolás...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="274"/>
         <source>Save...</source>
         <translation>Mentés...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="287"/>
         <source>Print...</source>
         <translation>Nyomtatás...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="371"/>
         <source>Copying</source>
         <translation>Másolás</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="390"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="408"/>
         <source>Saving</source>
         <translation>Mentés</translation>
     </message>
@@ -1929,7 +2102,7 @@ shortcut</source>
 <context>
     <name>CBookReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
+        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="70"/>
         <source>Toggle tree view</source>
         <translation>�tváltás fa-nézetbe</translation>
     </message>
@@ -1937,93 +2110,93 @@ shortcut</source>
 <context>
     <name>CBookmarkIndex</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
         <source>Bookmarks</source>
         <translation>Könyvjelzők</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="92"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="583"/>
         <source>New folder</source>
         <translation>Új mappa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
         <source>Rename folder</source>
         <translation>Mappa átnevezése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
         <source>Delete Items</source>
         <translation>Cikkek törlése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="704"/>
         <source>Do you really want to delete the selected items and child-items?</source>
         <translation>Tényleg törli a kiválasztott cikket az abból származókkal együtt?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="814"/>
         <source>The work to which the bookmark points to is not installed.</source>
         <translation>A dokumentum, amire a könyvjelző mutat, nem lett telepítve.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
         <source>Print bookmarks...</source>
         <translation>Könyvjelzők nyomtatása...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="103"/>
         <source>Remove selected items...</source>
         <translation>Kiválasztott cikkek törlése...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
         <source>Import to folder...</source>
         <translation>Mappába importálás...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
         <source>Edit bookmark...</source>
         <translation>Könyvjelző szerkesztése...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
         <source>Sort folder bookmarks...</source>
         <translation>Könyjelző mappa rendezése...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
         <source>Sort all bookmarks...</source>
         <translation>Összes könyvjelző rendezése...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="100"/>
         <source>Export from folder...</source>
         <translation>Mappából exportálás...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="393"/>
         <source>Can drop only bookmarks or one folder</source>
         <translation>Csak a könyvjelzők, vagy egy könyvtár mozgatása lehetséges</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="398"/>
         <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
         <translation>A mappa önmagába, vagy almappájába mozgatása nem lehetséges</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
         <source>Copy</source>
         <translation>Másolás</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="406"/>
         <source>Move</source>
         <translation>Mozgatás</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="467"/>
         <source>Drag references from text views to this view</source>
         <translation>Hivatkozások mozgatása a szöveges nézetből ebbe a nézetbe</translation>
     </message>
@@ -2031,42 +2204,42 @@ shortcut</source>
 <context>
     <name>CCommentaryReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="31"/>
         <source>Next book</source>
         <translation>Következő könyv</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="35"/>
         <source>Previous book</source>
         <translation>Előző könyv</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="39"/>
         <source>Next chapter</source>
         <translation>Következő fejezet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="43"/>
         <source>Previous chapter</source>
         <translation>Előző fejezet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="47"/>
         <source>Next verse</source>
         <translation>Következő vers</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="51"/>
         <source>Previous verse</source>
         <translation>Előző vers</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="56"/>
         <source>Synchronize</source>
         <translation>Szinkronizálás</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="59"/>
         <source>Synchronize the displayed entry of this work with the active Bible window</source>
         <translation>A kijelzett bejegyzés szinkronizálása az aktív Biblia ablakkal</translation>
     </message>
@@ -2074,7 +2247,7 @@ shortcut</source>
 <context>
     <name>CConfigurationDialog</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="41"/>
         <source>Configure BibleTime</source>
         <translation>Bibletime beállítása</translation>
     </message>
@@ -2082,67 +2255,67 @@ shortcut</source>
 <context>
     <name>CDisplaySettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
         <source>Display templates</source>
         <translation>Megjelenítési sablonok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
         <source>Available display styles:</source>
         <translation>Lehetséges megjelenítési stílusok:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="113"/>
         <source>Style preview</source>
         <translation>Előnézet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="131"/>
         <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
         <translation>Mert úgy szerette Isten e világot, hogy az ő egyszülött Fiát adta, hogy valaki hiszen ő benne, el ne vesszen, hanem örök élete legyen.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="138"/>
         <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
         <translation>Mert nem azért küldte az Isten az ő Fiát a világra, hogy kárhoztassa a világot, hanem hogy megtartassék a világ általa.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="145"/>
         <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
         <translation>A ki hiszen ő benne, el nem kárhozik; a ki pedig nem hisz, immár elkárhozott, mivelhogy nem hitt az Isten egyszülött Fiának nevében.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="155"/>
         <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
         <translation>Mert minden, a ki hamisan cselekszik, gyűlöli a világosságot és nem megy a világosságra, hogy az ő cselekedetei fel ne fedessenek.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="160"/>
         <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
         <translation>A ki pedig az igazságot cselekszi, az a világosságra megy, hogy az ő cselekedetei nyilvánvalókká legyenek, hogy Isten szerint való cselekedetek.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="106"/>
         <source>Display templates define how text is displayed.</source>
         <translation>A megjelenítési sablonok határozzák meg a szöveg megjelenését.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="110"/>
         <source>Show the BibleTime logo on startup</source>
         <translation>BibleTime logo mutatása induláskor</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
         <source>Show startup logo</source>
         <translation>Indítási logo mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="150"/>
         <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
         <translation>Az ítélet pedig az, hogy a világosság eljött a világba, de az emberek jobban szerették a sötétséget, mint a világosságot, mert a cselekedeteik gonoszak.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="101"/>
         <source>Display</source>
         <translation>Megjelenítés</translation>
     </message>
@@ -2150,62 +2323,62 @@ shortcut</source>
 <context>
     <name>CDisplayWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="215"/>
         <source>Back in history</source>
         <translation>Vissza az előzményekben</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="223"/>
         <source>Forward in history</source>
         <translation>előre az előzményekben</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="192"/>
         <source>Select all</source>
         <translation>Összes kijelölése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="196"/>
         <source>Copy</source>
         <translation>Másolás</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="200"/>
         <source>Find...</source>
         <translation>Keresés...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="204"/>
         <source>Change location</source>
         <translation>Hely változtatása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="209"/>
         <source>Search with works of this window</source>
         <translation>Keresés ennek az ablaknak a dokumentumaiban</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="393"/>
         <source>Work chooser buttons</source>
         <translation>Dokumentumválasztó gombok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="403"/>
         <source>Text area header</source>
         <translation>Szövegterület fejrésze</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="453"/>
         <source>Navigation</source>
         <translation>Navigáció</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="459"/>
         <source>Tool</source>
         <translation>Eszköz</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="465"/>
         <source>Format</source>
         <translation>Formátum</translation>
     </message>
@@ -2213,61 +2386,61 @@ shortcut</source>
 <context>
     <name>CHTMLWriteDisplay</name>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
         <source>Bold</source>
         <translation>Félkövér</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="60"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="67"/>
         <source>Italic</source>
         <translation>DÅ‘lt</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="79"/>
         <source>Underline</source>
         <translation>Aláhúzott</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="84"/>
         <source>Left</source>
         <translation>Balra igazított</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="94"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="99"/>
         <source>Center</source>
         <translation>Középre igazított</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="104"/>
         <source>Right</source>
         <translation>Jobbra igazított</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="231"/>
         <source>Font</source>
         <translation>Betűtípus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="243"/>
         <source>Font size</source>
         <translation>Betűméret</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="255"/>
         <source>Font color</source>
         <translation>Betűszín</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="89"/>
         <source>Align left</source>
         <translation>Balra igazított</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="109"/>
         <source>Align right</source>
         <translation>Jobbra igazított</translation>
     </message>
@@ -2275,17 +2448,17 @@ shortcut</source>
 <context>
     <name>CHTMLWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="122"/>
         <source>Module not writable</source>
         <translation>Nem írható modul</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="124"/>
         <source>Module is not writable.</source>
         <translation>A modul nem írható.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="125"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>A modul nem szerkeszthető, vagy nincs írási jogosultsága.</translation>
     </message>
@@ -2293,22 +2466,22 @@ shortcut</source>
 <context>
     <name>CLexiconKeyChooser</name>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Kersesztülgörgetés a lista elemein. Nyomja le a gombot, és mozgassa az egeret a tétel növeléséhez vagy csökkentéséhez.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
         <source>Entries of the current work</source>
         <translation>Az aktuális dokumentum bejegyzései</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Következő bejegyzés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="49"/>
         <source>Previous entry</source>
         <translation>Előző bejegyzés</translation>
     </message>
@@ -2316,70 +2489,70 @@ shortcut</source>
 <context>
     <name>CLexiconReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Következő bejegyzés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="51"/>
         <source>Previous entry</source>
         <translation>Előző bejegyzés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="55"/>
         <source>Copy reference only</source>
         <translation>Csak a hivatkozást másolja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
         <source>Save entry as HTML</source>
         <translation>Bejegyzés mentése HTML formátumban</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
         <source>Print reference only</source>
         <translation>Csak a hivatkozás nyomtatása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
         <source>Strong&apos;s Search</source>
         <translation>Strong&apos;s keresés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
         <source>Entry with text</source>
         <translation>Bejegyzés szöveggel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="134"/>
         <source>Entry as plain text</source>
         <translation>Bejegyzés egyszerű szövegként</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="265"/>
         <source>Lexicon window</source>
         <translation>Lexikon ablak</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="272"/>
         <source>Copy...</source>
         <translation>Másolás...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="281"/>
         <source>Save...</source>
         <translation>Mentés...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="297"/>
         <source>Print...</source>
         <translation>Nyomtatás...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="340"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="364"/>
         <source>Saving</source>
         <translation>Mentés</translation>
     </message>
@@ -2387,91 +2560,112 @@ shortcut</source>
 <context>
     <name>CPlainWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="235"/>
         <source>Sync with active Bible</source>
         <translation>Szinkronizálás az aktív Bibliával</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="245"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="249"/>
         <source>Save text</source>
         <translation>Szöveg mentése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="254"/>
         <source>Delete current entry</source>
         <translation>Aktuális bejegyzés törlése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="263"/>
         <source>Restore original text</source>
         <translation>Eredeti szöveg helyreállítása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="163"/>
         <source>Module not writable</source>
         <translation>Nem írható modul</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="165"/>
         <source>Module is not writable.</source>
         <translation>A modul nem írható.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="166"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>A modul nem szerkeszthető, vagy nincs írási jogosultsága.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="240"/>
         <source>Synchronize (show the same verse) with the active Bible window</source>
         <translation>Szinkronizálás (azonos vers mutatása) az aktív Biblia ablakkal</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="258"/>
         <source>Delete current entry (no undo)</source>
         <translation>Aktuális bejegyzés törlése (visszavonhatatlanul)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="267"/>
         <source>Restore original text, new text will be lost</source>
         <translation>Eredeti szöveg helyreállítása, az új szöveg elveszik</translation>
     </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save Text?</source>
+        <translation type="unfinished">Mentsük a szöveget?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <source>Save text before closing?</source>
+        <translation type="unfinished">Mentsük bezárás előtt?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save changed text?</source>
+        <translation type="unfinished">Mentsük a változtatott szöveget?</translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="232"/>
         <source>Save Search Analysis</source>
         <translation>Keresési analízis mentése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation>HTML fájlok (*.html;*.HTML;*.HTM;*.htm)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="243"/>
         <source>BibleTime Search Analysis</source>
         <translation>Bibletime keresés elemzése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation>Keresett szöveg:</translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="234"/>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="259"/>
+        <source>Search text:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="263"/>
+        <source>Results by work and book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="265"/>
         <source>Book</source>
         <translation>Könyv</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="293"/>
         <source>Total hits</source>
         <translation>Összes találat</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="303"/>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
         <translation>Készült a &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt; segítségével</translation>
     </message>
@@ -2479,168 +2673,168 @@ shortcut</source>
 <context>
     <name>CSwordModuleInfo</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="763"/>
         <source>Version</source>
         <translation>Verzió</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="766"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="774"/>
         <source>unknown</source>
         <translation>ismeretlen</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="771"/>
         <source>Markup</source>
         <translation>Jelzés</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="782"/>
         <source>Language</source>
         <translation>Nyelv</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="787"/>
         <source>Category</source>
         <translation>Kategória</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="792"/>
         <source>LCSH</source>
         <translation>LCSH</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="796"/>
         <source>Writable</source>
         <translation>�rható</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>yes</source>
         <translation>igen</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>no</source>
         <translation>nem</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="801"/>
         <source>Unlock key</source>
         <translation>Feloldó kulcs</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="822"/>
         <source>Features</source>
         <translation>Lehetőségek</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="830"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Legyen óvatos, a dokumentum kultikus / megkérdőjelezhető anyagot tartalmaz!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="834"/>
         <source>About</source>
         <translation>Leírás</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="856"/>
         <source>Distribution license</source>
         <translation>Disztribúciós Licensz</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="857"/>
         <source>Distribution source</source>
         <translation>Disztribúció forrása</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="858"/>
         <source>Distribution notes</source>
         <translation>Disztribúció megjegyzései</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="859"/>
         <source>Text source</source>
         <translation>Szöveg forrás</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="860"/>
         <source>Copyright notes</source>
         <translation>Szerzői jogi megjegyzések</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
         <source>Copyright holder</source>
         <translation>Szerzői jog tulajdonosa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
         <source>Copyright date</source>
         <translation>Szerzői jogvédelem dátuma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
         <source>Copyright contact name</source>
         <translation>Szerzői jogi kapcsolattartó neve</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
         <source>Copyright contact address</source>
         <translation>Szerzői jogi kapcsolattartó címe</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
         <source>Copyright contact email</source>
         <translation>Szerzői jogi kapcsolattartó emailcíme</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="956"/>
         <source>Bibles</source>
         <translation>Bibliák</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="958"/>
         <source>Commentaries</source>
         <translation>Kommentárok</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="960"/>
         <source>Books</source>
         <translation>Könyvek</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="962"/>
         <source>Cults/Unorthodox</source>
         <translation>Kultikus/Unortodox</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="964"/>
         <source>Maps and Images</source>
         <translation>Térképek és képek</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="966"/>
         <source>Daily Devotionals</source>
         <translation>Napi áhitatok</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="968"/>
         <source>Lexicons and Dictionaries</source>
         <translation>Lexikonok és szótárak</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="970"/>
         <source>Glossaries</source>
         <translation>Szójegyzékek</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="972"/>
         <source>Unknown</source>
         <translation>IsmeretlenEgyéb</translation>
     </message>
@@ -2648,17 +2842,17 @@ shortcut</source>
 <context>
     <name>CSwordSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="43"/>
         <source>Standard works</source>
         <translation>Alap dokumentumok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="44"/>
         <source>Text filters</source>
         <translation>Szöveg szűrők</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="41"/>
         <source>Desk</source>
         <translation>Asztal</translation>
     </message>
@@ -2666,37 +2860,37 @@ shortcut</source>
 <context>
     <name>CSwordSetupInstallSourcesDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="47"/>
         <source>Caption</source>
         <translation>Megnevezés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
         <source>Type</source>
         <translation>Típus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
         <source>Server</source>
         <translation>Szerver</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="68"/>
         <source>Path</source>
         <translation>Elérési út</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="91"/>
         <source>Get list...</source>
         <translation>Lista megszerzése...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
         <source>A source with this caption already exists. Please provide a different caption.</source>
         <translation>Egy azonos nevű forrás már létezik. Kérjük adjon egy másik elnevezést.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="160"/>
         <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
 
 Do you want to continue?</source>
@@ -2705,140 +2899,121 @@ Do you want to continue?</source>
 Folytatja?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
         <source>Get source list from remote server?</source>
         <translation>Letöltsük a források listáját?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="167"/>
         <source>Cancel</source>
         <translation>Mégsem</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="168"/>
         <source>Downloading List</source>
         <translation>Lista letöltése folyamatban</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="178"/>
         <source>Connecting...</source>
         <translation>Kapcsolódás...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="197"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="198"/>
         <source>Refreshing...</source>
         <translation>Frissítés...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>Hiba</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="92"/>
         <source>Download a list of sources from CrossWire server and add sources</source>
         <translation>Források listájának letöltése és hozzáadása a Crosswire szerveréről</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
         <source>Please provide a caption.</source>
         <translation>Kérem adjon meg egy megnevezést.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
         <source>Please provide a server name.</source>
         <translation>Kérem adja meg a kiszolgáló nevét.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
         <source>Please provide a valid, readable path.</source>
         <translation>Kérem adjon meg egy valós, olvasható útvonalat.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Please provide a path.</source>
         <translation>Kérem adjon meg egy útvonalat.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="39"/>
         <source>New  Installation Source</source>
         <translation>Új telepítési forrás</translation>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>Mentsük bezárás előtt?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>Mentsük a változtatott szöveget?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>Mentsük a szöveget?</translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="178"/>
         <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
         <translation>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Verzió: %3&lt;/p&gt;&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="194"/>
         <source>Abbreviation</source>
         <translation>Rövidítés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="203"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="290"/>
         <source>Cross references</source>
         <translation>Kereszthivatkozás</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="343"/>
         <source>Footnote</source>
         <translation>Lábjegyzet</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="374"/>
         <source>Strongs</source>
         <translation>Strong számok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="451"/>
         <source>Morphology</source>
         <translation>Morfológia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="472"/>
         <source>Word lookup</source>
         <translation>Szó keresés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="60"/>
         <source>Copy</source>
         <translation>Másolás</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
         <source>Select all</source>
         <translation>Összes kijelölése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="80"/>
         <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
         <translation>&lt;small&gt;Ez a &quot;Nagyító&quot; ablak. Ha az egeret elhúzza hivatkozások, vagy más adatot tartalmazó elemek fölött, azok tartalma kis késleltetéssel megjelenik itt. Mozgassa az egeret ide gyorsan, vagy rögzítse a tartalmát a Shift gomb nyomvatartásával.&lt;/small&gt;</translation>
     </message>
@@ -2846,28 +3021,28 @@ Folytatja?</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="412"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="422"/>
         <source>Indexing aborted</source>
         <translation>Indexelés megszakítva</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="413"/>
         <source>An internal error occurred while building the index: %1</source>
         <translation>Egy belső hiba történt a(z) %1 indexének készítése közben.</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="423"/>
         <source>An internal error occurred while building the index.</source>
         <translation>Belső hiba történt az indexelés közben.</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="522"/>
         <source>Search aborted</source>
         <translation>Keresésé megszakítva</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="523"/>
         <source>An internal error occurred while executing your search.</source>
         <translation>Keresés közben belső hiba történt.</translation>
     </message>
@@ -2908,7 +3083,7 @@ Folytatja?</translation>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="122"/>
         <source>Bibles</source>
         <translation>Bibliák</translation>
     </message>
@@ -2925,740 +3100,740 @@ Folytatja?</translation>
         <translation>Könyvek</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="390"/>
         <source>Added text</source>
         <translation>Hozzáadott szövegek</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="143"/>
         <source>Names of languages</source>
         <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
         <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
         <translation>Nyelvek elnevezései</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="148"/>
         <source>Afrikaans</source>
         <extracomment>Language name af</extracomment>
         <translation>Afrikaans</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="151"/>
         <source>Amuzgo, Guerrero</source>
         <extracomment>Language name amu</extracomment>
         <translation>Amuzgo, Guerrero</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="153"/>
         <source>English, Old (ca.450-1100)</source>
         <extracomment>Language name ang</extracomment>
         <translation>Angol, régi (Kb. 450-1100)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="155"/>
         <source>Arabic</source>
         <extracomment>Language name ar</extracomment>
         <translation>Arab</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="158"/>
         <source>Azerbaijani</source>
         <extracomment>Language name az</extracomment>
         <translation>Azerbajdzsáni</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="160"/>
         <source>Azerbaijani, South</source>
         <extracomment>Language name azb</extracomment>
         <translation>Dél-Azerbajdzsáni</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="165"/>
         <source>Belarusian</source>
         <extracomment>Language name be</extracomment>
         <translation>Belorusz</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="167"/>
         <source>Bulgarian</source>
         <extracomment>Language name bg</extracomment>
         <translation>Bolgár</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="173"/>
         <source>Breton</source>
         <extracomment>Language name br</extracomment>
         <translation>Breton</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="175"/>
         <source>Bosnian</source>
         <extracomment>Language name bs</extracomment>
         <translation>Bosnyák</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="177"/>
         <source>Catalan</source>
         <extracomment>Language name ca</extracomment>
         <translation>Katalán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="180"/>
         <source>Chinantec, Comaltepec</source>
         <extracomment>Language name cco</extracomment>
         <translation>Chinantec, Comaltepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="182"/>
         <source>Cebuano</source>
         <extracomment>Language name ceb</extracomment>
         <translation>Cebuanó (Filippinó)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
         <source>Chamorro</source>
         <extracomment>Language name ch</extracomment>
         <translation>Chamorro (Guam szigeteki)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
         <source>Chontal, Highland Oaxaca</source>
         <extracomment>Language name chd</extracomment>
         <translation>Chontal, Oaxaca felföld</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
         <source>Chinantec, Quiotepec</source>
         <extracomment>Language name chq</extracomment>
         <translation>Chinantec, Quiotepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="190"/>
         <source>Chinantec, Ozumacu00edn</source>
         <extracomment>Language name chz</extracomment>
         <translation>Chinantec, Ozumacín</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="193"/>
         <source>Cakchiquel, Western</source>
         <extracomment>Language name ckw</extracomment>
         <translation>Cakchiquel, nyugati</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="195"/>
         <source>Chinantec, Lalana</source>
         <extracomment>Language name cnl</extracomment>
         <translation>Chinantec, Lalana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="197"/>
         <source>Chinantec, Tepetotutla</source>
         <extracomment>Language name cnt</extracomment>
         <translation>Chinantec, Tepetotutla</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="199"/>
         <source>Coptic</source>
         <extracomment>Language name cop</extracomment>
         <translation>Kopt</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
         <source>Czech</source>
         <extracomment>Language name cs</extracomment>
         <translation>Cseh</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
         <source>Chinantec, Sochiapan</source>
         <extracomment>Language name cso</extracomment>
         <translation>Chinantec, Sochiapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
         <source>Chol, Tila</source>
         <extracomment>Language name cti</extracomment>
         <translation>Chol, Tila</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
         <source>Chatino, Western Highland</source>
         <extracomment>Language name ctp</extracomment>
         <translation>Chatino, Nyugati Felföld</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
         <source>Church Slavic</source>
         <extracomment>Language name cu</extracomment>
         <translation>Templomi szláv</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="212"/>
         <source>Welsh</source>
         <extracomment>Language name cy</extracomment>
         <translation>Welszi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
         <source>Danish</source>
         <extracomment>Language name da</extracomment>
         <translation>Dán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
         <source>German</source>
         <extracomment>Language name de</extracomment>
         <translation>Német</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
         <source>Duruma</source>
         <extracomment>Language name dug</extracomment>
         <translation>Duruma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="221"/>
         <source>Greek, Modern (1453-)</source>
         <extracomment>Language name el</extracomment>
         <translation>Görög, modern (1453-)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
         <source>English</source>
         <extracomment>Language name en</extracomment>
         <translation>Angol</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="225"/>
         <source>American English</source>
         <extracomment>Language name en_US</extracomment>
         <translation>Amerikai angol</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="227"/>
         <source>English, Middle (1100-1500)</source>
         <extracomment>Language name enm</extracomment>
         <translation>Angol, közép (1100-1500)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="229"/>
         <source>Esperanto</source>
         <extracomment>Language name eo</extracomment>
         <translation>Eszperantó</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="231"/>
         <source>Spanish</source>
         <extracomment>Language name es</extracomment>
         <translation>panyol</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
         <source>Estonian</source>
         <extracomment>Language name et</extracomment>
         <translation>Észt</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
         <source>Basque</source>
         <extracomment>Language name eu</extracomment>
         <translation>Baszk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
         <source>Persian</source>
         <extracomment>Language name fa</extracomment>
         <translation>Perzsa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
         <source>Finnish</source>
         <extracomment>Language name fi</extracomment>
         <translation>Finn</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="243"/>
         <source>French</source>
         <extracomment>Language name fr</extracomment>
         <translation>Francia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="245"/>
         <source>Frisian</source>
         <extracomment>Language name fy</extracomment>
         <translation>Fríz</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="247"/>
         <source>Irish</source>
         <extracomment>Language name ga</extracomment>
         <translation>�r</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="249"/>
         <source>Gaelic (Scots)</source>
         <extracomment>Language name gd</extracomment>
         <translation>Gaelic (Skót)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="251"/>
         <source>Geez</source>
         <extracomment>Language name gez</extracomment>
         <translation>Geez</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
         <source>Gothic</source>
         <extracomment>Language name got</extracomment>
         <translation>Gót</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
         <source>Manx</source>
         <extracomment>Language name gv</extracomment>
         <translation>Man-szigeteki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
         <source>Greek, Ancient (to 1453)</source>
         <extracomment>Language name grc</extracomment>
         <translation>Ógörög (1453-ig)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="262"/>
         <source>Hebrew</source>
         <extracomment>Language name he</extracomment>
         <translation>Héber</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
         <source>Hausa</source>
         <extracomment>Language name hau</extracomment>
         <translation>Hausa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
         <source>Hawaiian</source>
         <extracomment>Language name haw</extracomment>
         <translation>Hawaii</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
         <source>Hindi</source>
         <extracomment>Language name hi</extracomment>
         <translation>Hindi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="271"/>
         <source>Croatian</source>
         <extracomment>Language name hr</extracomment>
         <translation>Horvát</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="275"/>
         <source>Hungarian</source>
         <extracomment>Language name hu</extracomment>
         <translation>Magyar</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
         <source>Huave, San Mateo Del Mar</source>
         <extracomment>Language name huv</extracomment>
         <translation>Huave, San Mateo Del Mar</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
         <source>Armenian</source>
         <extracomment>Language name hy</extracomment>
         <translation>Örmény</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
         <source>Indonesian</source>
         <extracomment>Language name id</extracomment>
         <translation>Indonéz</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
         <source>Icelandic</source>
         <extracomment>Language name is</extracomment>
         <translation>Izlandi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
         <source>Italian</source>
         <extracomment>Language name it</extracomment>
         <translation>Olasz</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="291"/>
         <source>Itzu00e1</source>
         <extracomment>Language name itz</extracomment>
         <translation>Itza&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="293"/>
         <source>Ixil, San Juan Cotzal</source>
         <extracomment>Language name ixl</extracomment>
         <translation>Ixil, San Juan Cotzal</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
         <source>Japanese</source>
         <extracomment>Language name ja</extracomment>
         <translation>Japán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
         <source>Jacalteco, Eastern</source>
         <extracomment>Language name jac</extracomment>
         <translation>Jacalteco, Kelet</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
         <source>Javanese, Caribbean</source>
         <extracomment>Language name jvn</extracomment>
         <translation>Javanese, karibi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="302"/>
         <source>Georgian</source>
         <extracomment>Language name ka</extracomment>
         <translation>Grúz</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
         <source>Korean</source>
         <extracomment>Language name ko</extracomment>
         <translation>Koreai</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="315"/>
         <source>Kurdish</source>
         <extracomment>Language name ku</extracomment>
         <translation>Kurd</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
         <source>Kirghiz</source>
         <extracomment>Language name ky</extracomment>
         <translation>Kirgiz</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
         <source>Latin</source>
         <extracomment>Language name la</extracomment>
         <translation>Latin</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
         <source>Lacandon</source>
         <extracomment>Language name lac</extracomment>
         <translation>Lacandon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
         <source>Lithuanian</source>
         <extracomment>Language name lt</extracomment>
         <translation>Litván</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="332"/>
         <source>Latvian</source>
         <extracomment>Language name lv</extracomment>
         <translation>Lett</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="334"/>
         <source>Malagasy</source>
         <extracomment>Language name mg</extracomment>
         <translation>Malagasy</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="337"/>
         <source>Maori</source>
         <extracomment>Language name mi</extracomment>
         <translation>Maori</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="339"/>
         <source>Mixe, Isthmus</source>
         <extracomment>Language name mir</extracomment>
         <translation>Mixe, Isthmus</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="341"/>
         <source>Mixtec, Coatzospan</source>
         <extracomment>Language name miz</extracomment>
         <translation>Mixtec, Coatzospan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="343"/>
         <source>Macedonian</source>
         <extracomment>Language name mk</extracomment>
         <translation>Macedón</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="345"/>
         <source>Mixtec, Silacayoapan</source>
         <extracomment>Language name mks</extracomment>
         <translation>Mixtec, Silacayoapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="350"/>
         <source>More</source>
         <extracomment>Language name mos</extracomment>
         <translation>több</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
         <source>Malay</source>
         <extracomment>Language name ms</extracomment>
         <translation>Maláj</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
         <source>Maltese</source>
         <extracomment>Language name mt</extracomment>
         <translation>Máltai</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="375"/>
         <source>Low German; Low Saxon</source>
         <extracomment>Language name nds</extracomment>
         <translation>Alsó-német; Alsó-szász</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="377"/>
         <source>Nepali</source>
         <extracomment>Language name ne</extracomment>
         <translation>Nepáli</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="379"/>
         <source>Nahuatl, Guerrero</source>
         <extracomment>Language name ngu</extracomment>
         <translation>Nahuatl, Guerrero</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
         <source>Nahuatl, Northern Oaxaca</source>
         <extracomment>Language name nhy</extracomment>
         <translation>Nahuatl, Észak Oaxaca</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
         <source>Dutch</source>
         <extracomment>Language name nl</extracomment>
         <translation>Holland</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
         <source>Norwegian Nynorsk</source>
         <extracomment>Language name nn</extracomment>
         <translation>Norvég Nyorsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
         <source>Norwegian</source>
         <extracomment>Language name no</extracomment>
         <translation>Norvég</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="397"/>
         <source>Otomi, Queru00e9taro</source>
         <extracomment>Language name otq</extracomment>
         <translation>Otomi, Querétaro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
         <source>Papiamento</source>
         <extracomment>Language name pap</extracomment>
         <translation>Papiamento</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
         <source>Polish</source>
         <extracomment>Language name pl</extracomment>
         <translation>Lengyel</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="411"/>
         <source>Persian (Dari)</source>
         <extracomment>Language name prs</extracomment>
         <translation>Perzsa (dari)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="415"/>
         <source>Portuguese</source>
         <extracomment>Language name pt</extracomment>
         <translation>Portugál</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
         <source>Brasilian Portuguese</source>
         <extracomment>Language name pt_BR</extracomment>
         <translation>Brazil portugál</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
         <source>Quichu00e9, West Central</source>
         <extracomment>Language name qut</extracomment>
         <translation>K&apos;iche&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
         <source>Romanian</source>
         <extracomment>Language name ro</extracomment>
         <translation>Román</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
         <source>Russian</source>
         <extracomment>Language name ru</extracomment>
         <translation>Orosz</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="431"/>
         <source>Scots</source>
         <extracomment>Language name sco</extracomment>
         <translation>Skót</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="437"/>
         <source>Slovak</source>
         <extracomment>Language name sk</extracomment>
         <translation>Szlovák</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="439"/>
         <source>Slovenian</source>
         <extracomment>Language name sl</extracomment>
         <translation>Szlovén</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="443"/>
         <source>Somali</source>
         <extracomment>Language name so</extracomment>
         <translation>Szomáli</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
         <source>Albanian</source>
         <extracomment>Language name sq</extracomment>
         <translation>Albán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="453"/>
         <source>Swedish</source>
         <extracomment>Language name sv</extracomment>
         <translation>Svéd</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="455"/>
         <source>Swahili</source>
         <extracomment>Language name sw</extracomment>
         <translation>Szuahéli</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="457"/>
         <source>Syriac</source>
         <extracomment>Language name syr</extracomment>
         <translation>Szír</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="459"/>
         <source>Tamil</source>
         <extracomment>Language name ta</extracomment>
         <translation>Tamil</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="463"/>
         <source>Thai</source>
         <extracomment>Language name th</extracomment>
         <translation>Thai</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
         <source>Tagalog</source>
         <extracomment>Language name tl</extracomment>
         <translation>Tagalog</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="470"/>
         <source>Tswana</source>
         <extracomment>Language name tn</extracomment>
         <translation>Tswana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="472"/>
         <source>Turkish</source>
         <extracomment>Language name tr</extracomment>
         <translation>Török</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
         <source>Tektiteko</source>
         <extracomment>Language name ttc</extracomment>
         <translation>Tektiteko</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="479"/>
         <source>Tahitian</source>
         <extracomment>Language name ty</extracomment>
         <translation>Tahiti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="481"/>
         <source>Tzotzil, Zinacantu00e1n</source>
         <extracomment>Language name tzz</extracomment>
         <translation>Tzotzil, Zinacantán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
         <source>Ukrainian</source>
         <extracomment>Language name uk</extracomment>
         <translation>Ukrán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
         <source>Orya</source>
         <extracomment>Language name ury</extracomment>
         <translation>Orya</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
         <source>Uspanteco</source>
         <extracomment>Language name usp</extracomment>
         <translation>Uspanteco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="492"/>
         <source>Vietnamese</source>
         <extracomment>Language name vi</extracomment>
         <translation>Vietnámi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="496"/>
         <source>Xhosa</source>
         <extracomment>Language name xh</extracomment>
         <translation>Xhosa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="163"/>
         <source>Bavarian</source>
         <extracomment>Language name bar</extracomment>
         <translation>Bajor</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="326"/>
         <source>Lombard</source>
         <extracomment>Language name lmo</extracomment>
         <translation>Lombard</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="403"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
         <source>Uma</source>
         <extracomment>Language name ppk
 ----------
@@ -3666,456 +3841,436 @@ Language name ppk</extracomment>
         <translation>Uma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="448"/>
         <source>Sranan</source>
         <extracomment>Language name srn</extracomment>
         <translation>Srana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
         <source>Yiddish</source>
         <extracomment>Language name yi</extracomment>
         <translation>Jiddis</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
         <source>Zapotec, San Juan Guelavu00eda</source>
         <extracomment>Language name zab</extracomment>
         <translation>Zapotec, San Juan Guelavía</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="507"/>
         <source>Zapotec, Mitla</source>
         <extracomment>Language name zaw</extracomment>
         <translation>Zapotec, Mitla</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="509"/>
         <source>Chinese</source>
         <extracomment>Language name zh</extracomment>
         <translation>Kínai</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="511"/>
         <source>Zapotec, Amatlu00e1n</source>
         <extracomment>Language name zpo</extracomment>
         <translation>Zapotec, Amatlán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
         <source>Zapotec, Zoogocho</source>
         <extracomment>Language name zpq</extracomment>
         <translation>Zapotec, Zoogocho</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="515"/>
         <source>Zapotec, Yalu00e1lag</source>
         <extracomment>Language name zpu</extracomment>
         <translation>Zapotec, Yalálag</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
         <source>Zapotec, Chichicapan</source>
         <extracomment>Language name zpv</extracomment>
         <translation>Zapotec, Chichicapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
         <source>Zapotec, Southern Rincon</source>
         <extracomment>Language name zsr</extracomment>
         <translation>Zapotec, Dél Rincon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
         <source>Zapotec, Quioquitani-Quieru00ed</source>
         <extracomment>Language name ztq</extracomment>
         <translation>Zapotec, Quioquitani-Quierí</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
         <source>Zapotec, Yatee</source>
         <extracomment>Language name zty</extracomment>
         <translation>Zapotec, Yatee</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="525"/>
         <source>Zulu</source>
         <extracomment>Language name zu</extracomment>
         <translation>Zulu</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="314"/>
         <source>Footnotes</source>
         <translation>Lábjegyzetek</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="316"/>
         <source>Strong&apos;s numbers</source>
         <translation>Strong számok</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="318"/>
         <source>Headings</source>
         <translation>Fejlécek</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="320"/>
         <source>Morphological tags</source>
         <translation>Morfológiai jelek</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="322"/>
         <source>Lemmas</source>
         <translation>Kiegészítések</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="324"/>
         <source>Hebrew vowel points</source>
         <translation>Héber magánhangzó pontok</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="326"/>
         <source>Hebrew cantillation marks</source>
         <translation>Héber hangsúlyozás</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="328"/>
         <source>Greek accents</source>
         <translation>Görög kiejtés</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="330"/>
         <source>Red letter words</source>
         <translation>Piros betűs szavak</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="332"/>
         <source>Textual variants</source>
         <translation>Alternatív szöveges változat</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="334"/>
         <source>Scripture cross-references</source>
         <translation>Kereszthivatkozások</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="336"/>
         <source>Morph segmentation</source>
         <translation>Szótő elválasztás</translation>
     </message>
     <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation>Exportálás</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
         <source>Local</source>
         <translation>Helyi</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>Távoli</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Ószövetség</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Mózes/Tóra</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>Előzmény</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Próféták</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>Újszövetség</translation>
+        <source>Remote FTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Evangéliumok</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="32"/>
+        <source>Remote SFTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>Levelek</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="33"/>
+        <source>Remote HTTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Pál levelei</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="34"/>
+        <source>Remote HTTPS</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
         <source>HTML files</source>
         <translation>HTML fájlok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="438"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>All files</source>
         <translation>Összes fájl</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>Text files</source>
         <translation>Szövegfájlok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="444"/>
         <source>Save file</source>
         <translation>Fájl mentése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="130"/>
         <source>Save document ...</source>
         <translation>okumentum mentése...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
         <source>BibleTime bookmark files</source>
         <translation>BibleTime könyvjelzők</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="127"/>
         <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
         <source>unknown</source>
         <translation>ismeretlen</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="60"/>
         <source>New folder</source>
         <translation>Új mappa</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
+        <location filename="../../src/util/tool.cpp" line="48"/>
         <source>The file already exists.</source>
         <translation>A fájl már létezik.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
+        <location filename="../../src/util/tool.cpp" line="49"/>
         <source>Do you want to overwrite it?</source>
         <translation>Felülírja?</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
+        <location filename="../../src/util/tool.cpp" line="69"/>
+        <location filename="../../src/util/tool.cpp" line="75"/>
         <source>Error</source>
         <translation>Hiba</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>A fájl nem menthető.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
+        <location filename="../../src/util/tool.cpp" line="78"/>
         <source>Please check permissions etc.</source>
         <translation>Kérem ellenőrizze a jogosultságokat.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
+        <location filename="../../src/util/tool.cpp" line="197"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Legyen óvatos, a dokumentum kultikus / megkérdőjelezhető anyagot tartalmaz!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
+        <location filename="../../src/util/tool.cpp" line="218"/>
         <source>Version</source>
         <translation>Verzió</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
+        <location filename="../../src/util/tool.cpp" line="207"/>
         <source>Encrypted - needs unlock key</source>
         <translation>Titkosított - szükség van egy feloldó kulcsra</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
+        <location filename="../../src/util/tool.cpp" line="71"/>
+        <source>Error while writing to file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="72"/>
+        <source>Please check that enough disk space is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="77"/>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="231"/>
         <source>Double click for more information</source>
         <translation>kattintson kettőt bővebb információért</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
+        <location filename="../../src/util/tool.cpp" line="213"/>
         <source>Updated version available!</source>
         <translation>Frissített verzió elérhető!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
+        <location filename="../../src/util/tool.cpp" line="226"/>
         <source>Installed version</source>
         <translation>Telepített változat</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="273"/>
         <source>Haitian Creole</source>
         <extracomment>Language name ht</extracomment>
         <translation>Haiti Kreol</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
         <source>Kekchu00ed</source>
         <comment>kek</comment>
         <extracomment>Language name kek</extracomment>
         <translation>Kekchi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="357"/>
         <source>(Multiple languages)</source>
         <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
         <translation>(Több nyelv)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="359"/>
         <source>Mam, Central</source>
         <extracomment>Language name mvc</extracomment>
         <translation>Mam, Közép</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
         <source>Mam, Todos Santos Cuchumatu00e1n</source>
         <extracomment>Language name mvj</extracomment>
         <translation>Mam, Todos Santos Cuchumatán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="363"/>
         <source>Mixe, Juquila</source>
         <extracomment>Language name mxq</extracomment>
         <translation>Mixe, Juquila</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="365"/>
         <source>Mixtec, Jamiltepec</source>
         <extracomment>Language name mxt</extracomment>
         <translation>Mixtec, Jamiltepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="367"/>
         <source>Burmese</source>
         <extracomment>Language name my</extracomment>
         <translation>Burmai</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="370"/>
         <source>Norwegian Bokmu00e5l</source>
         <extracomment>Language name nb</extracomment>
         <translation>Norvég Bokmål</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="372"/>
         <source>Nahuatl, Michoacu00e1n</source>
         <extracomment>Language name ncl</extracomment>
         <translation>Nahuatl, Michoacán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
         <source>Potawatomi</source>
         <extracomment>Language name pot</extracomment>
         <translation>Potawatomi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="468"/>
         <source>Klingon</source>
         <extracomment>Language name tlh</extracomment>
         <translation>Klingon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="498"/>
         <source>Mixtec, Diuxi-Tilantongo</source>
         <extracomment>Language name xtd</extracomment>
         <translation>Mixtec, Diuxi-Tilantongo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
         <source>Yoryba</source>
         <extracomment>Language name yo</extracomment>
         <translation>Yoryba</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="407"/>
         <source>Verb tense changed</source>
         <translation>Igeidő változtatva</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>Can&apos;t write file</source>
         <translation>Nem írható fájl</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>The Sword config file can&apos;t be written!</source>
         <translation>A Sword beállítási fájlja nem írható!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="39"/>
         <source>Export Bookmarks</source>
         <translation>Könyvjelzők exportálása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="50"/>
         <source>Import bookmarks</source>
         <translation>Könyvjelzők importálása</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
+        <location filename="../../src/util/tool.cpp" line="46"/>
         <source>Overwrite File?</source>
         <translation>Felülírja a fájlt?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="276"/>
         <source>Parsing Strong&apos;s Numbers</source>
         <translation>Strong&apos;s számok követése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="154"/>
         <source>This shortcut conflicts with the shortcut for the following actions:</source>
         <translation>Ez a kombináció ütközik a következő akció kombinációjával:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
         <source>Do you want to clear the conflicting shortcuts and continue?</source>
         <translation>Törli az ütköző kombinációkat és folytatja?</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="23"/>
         <source>Indexed works</source>
         <translation>Indexelt dokumentumok</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="24"/>
         <source>Unindexed works</source>
         <translation>Nem indexelt dokumentumok</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="57"/>
         <source>CSS base template not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="74"/>
         <source>Default template &quot;%1&quot; not found!</source>
         <translation>Alapértelmezett &quot;%1&quot; sablon nem található!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="113"/>
         <source>Replace</source>
         <translation>�thelyezés</translation>
     </message>
@@ -4163,91 +4318,91 @@ Language name ppk</extracomment>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="58"/>
         <source>OK</source>
         <comment>Dialog Button</comment>
         <translation>Rendben</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="59"/>
         <source>Open</source>
         <comment>Dialog Button</comment>
         <translation>Megnyitás</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="60"/>
         <source>Save</source>
         <comment>Dialog Button</comment>
         <translation>Mentés</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="61"/>
         <source>Cancel</source>
         <comment>Dialog Button</comment>
         <translation>Mégsem</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="62"/>
         <source>Close</source>
         <comment>Dialog Button</comment>
         <translation>Bezárás</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="63"/>
         <source>Discard</source>
         <comment>Dialog Button</comment>
         <translation>Visszavonás</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="64"/>
         <source>Apply</source>
         <comment>Dialog Button</comment>
         <translation>Alkalmaz</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="65"/>
         <source>Reset</source>
         <comment>Dialog Button</comment>
         <translation>Visszaállít</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="66"/>
         <source>Restore defaults</source>
         <comment>Dialog Button</comment>
         <translation>Alapértelmezés visszaállítása</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="67"/>
         <source>Help</source>
         <comment>Dialog Button</comment>
         <translation>Segítség</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="68"/>
         <source>Save All</source>
         <comment>Dialog Button</comment>
         <translation>Minden mentése</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="69"/>
         <source>Yes</source>
         <comment>Dialog Button</comment>
         <translation>Igen</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="70"/>
         <source>Yes to all</source>
         <comment>Dialog Button</comment>
         <translation>Igen mindenre</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="71"/>
         <source>No</source>
         <comment>Dialog Button</comment>
         <translation>Nem</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="72"/>
         <source>No to all</source>
         <comment>Dialog Button</comment>
         <translation>Nem mindenre</translation>
@@ -4256,102 +4411,102 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchOptionsArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="97"/>
         <source>Search for:</source>
         <translation>Ezt keresse:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="104"/>
         <source>&amp;Search</source>
         <translation>&amp;Keresés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="106"/>
         <source>Start to search the text in the chosen works</source>
         <translation>szöveg keresésének megkezdése a választott dokumentumban</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="109"/>
         <source>Ch&amp;oose...</source>
         <translation>V&amp;álasztás...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="111"/>
         <source>Choose works for the search</source>
         <translation>Dokumentumok kijelölése a kereséshez</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="114"/>
         <source>S&amp;etup...</source>
         <translation>T&amp;elepítés...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="133"/>
         <source>All of the words (AND is added between the words)</source>
         <translation>Az összes szót (ÉS kifejezés a szavak közé lesz adva)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="137"/>
         <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
         <translation> (&lt;a href=&apos;syntax_help&apos;&gt;egyéni meghatározás&lt;/a&gt;)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="148"/>
         <source>Scope:</source>
         <translation>Hatókör:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="169"/>
         <source>The text you want to search for</source>
         <translation>A szöveg, amir keres</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="173"/>
         <source>Works:</source>
         <translation>Dokumentumok:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="346"/>
         <source>No search scope</source>
         <translation>Nincs keresési hatókör</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="128"/>
         <source>All words</source>
         <translation>Összes szó</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="116"/>
         <source>Configure predefined scopes for search</source>
         <translation>Előre meghatározott keresési hatókörök beállítása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="130"/>
         <source>Some words</source>
         <translation>Bármely szó</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
         <source>Free</source>
         <translation>Egyéni</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
         <source>Some of the words (OR is added between the words)</source>
         <translation>Bármelyik szót (OR kifejezés a szavak közé lesz adva)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
         <source>Full lucene syntax</source>
         <translation>Teljes lucene kifejezés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
         <source>Click the link to get help for search syntax</source>
         <translation>A keresési kifejezésekhez segítségért kattintson a hivatkozásra </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="159"/>
         <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
         <translation>Adja meg a hatókört (Könyvek/fejezetek/versek, amiben keressen) &lt;br /&gt; A bibliák és a kommentároknál használható.</translation>
     </message>
@@ -4359,17 +4514,17 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchResultArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="85"/>
         <source>Text of the selected search result item</source>
         <translation>A választott keresési eredmény szövege</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="88"/>
         <source>Select all</source>
         <translation>Összes kijelölése</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="92"/>
         <source>Copy</source>
         <translation>Másolás</translation>
     </message>
@@ -4377,242 +4532,242 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchSyntaxHelpDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="47"/>
         <source>Search Syntax Help</source>
         <translation>Keresési kifejezések súgó</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="94"/>
         <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
         <translation>Ez a segédlet főként a &apos;egyéni meghatározás&apos; opcióhoz van. az &apos;Összes szó&apos; és a &apos;Bármely szó&apos; opciónak sokkal korlátozottabb lehetőségei vannak; &lt;a href=&apos;#wildcards&apos;&gt;helyettesítő karakterek&lt;/a&gt; és &lt;a href=&apos;#fields&apos;&gt; szövegmezők&lt;/a&gt; támogatottak ott. Néhány egyéb szintaxis furcsa, vagy hibás eredményt okozhat az Összes szó/Bármely szó opciónál.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
         <source>Which words to find</source>
         <translation>Melyik szavakat keresi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="101"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
         <source>Grouping and order</source>
         <translation>Csoportosítás és rendezés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="103"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
         <source>Wildcards (partial words)</source>
         <translation>Helyettesítők (részleges szavak)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
         <source>Text fields (different parts of text)</source>
         <translation>Szövegmezők (a szöveg különböző részei)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="208"/>
         <source>Other syntax features</source>
         <translation>Egyéb keresési lehetőségek</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
         <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
         <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
         <translation>A keresési kifejezések szóközzel vannak elválasztva. &lt;strong&gt;AND&lt;/strong&gt; (minden szó), &lt;strong&gt;VAGY&lt;/strong&gt; (néhány szó) és a  &lt;strong&gt;NOT&lt;/strong&gt; (nem a következő szó) lehet a szavak között. Ha egyik sincs, az OR használódik automatikusan. &apos;&lt;strong&gt; + &lt;/strong&gt; szó&apos;  a szónak benne kell lennie az eredményekben, &apos;&lt;strong&gt; - &lt;/strong&gt; szó&apos; azt jelenti, hogy a szó nem szerepelhet a találatokban.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="119"/>
         <source>jesus AND god</source>
         <comment>Do not translate &quot;AND&quot;.</comment>
         <translation>Jézus AND Isten</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="121"/>
         <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
         <translation>Kiadja az összes verset amiben szerepel &apos;Jézus&apos; és &apos;Isten&apos; együtt</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="123"/>
         <source>jesus OR god</source>
         <comment>Do not translate &quot;OR&quot;.</comment>
         <translation>Jézus OR Isten</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="125"/>
         <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
         <translation>Kiadja az összes verset amiben szerepel vagy &apos;Jézus&apos;, vagy &apos;Isten&apos;, vagy mindkettő együtt</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="127"/>
         <source>jesus NOT god</source>
         <comment>Do not translate &quot;NOT&quot;.</comment>
         <translation>Jézus NOT Isten</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="133"/>
         <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
         <translation>Eredménye a &apos;Jézus&apos; tartalmú versek, &apos;Isten&apos; szó nélkül</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="131"/>
         <source>+jesus -god</source>
         <translation>+Jézus -Isten</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
         <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
         <translation>Szavakat lehet csoportosítani &lt;strong&gt; zárójellel &lt;/strong&gt;. Szigorú szórendet lehet meghatározni &lt;strong&gt; idézőjelekkel &lt;/strong&gt;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
         <source>(a AND b) OR c</source>
         <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
         <translation>(a AND b) OR c</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
         <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
         <translation>Olyan verseket eredményez, amiben az &apos;a&apos; és &apos;b&apos; is megtalálható, vagy csak a &apos;c&apos;, esetleg ezek mind együtt</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="145"/>
         <source>&quot;says lord&quot;</source>
         <translation>&quot;mondja uram&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="149"/>
         <source>&quot;says the lord&quot;</source>
         <translation>&quot;mondta az Úr&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="151"/>
         <source>Finds all verses with &apos;says the LORD&apos;</source>
         <translation>Megtalálja az összes verset a &apos;mondta az Úr&apos; kifejezzéssel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
         <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
         <translation>&apos;&lt;strong&gt; * &lt;/strong&gt; &apos; behelyettesíthető bármely 0 vagy több karakter sorozatára, míg a&apos; &lt;strong&gt;? &lt;/strong&gt;&apos; csak egy karaktert helyettesít. A helyettesítőket nem lehet használni egy szó elején sem.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="160"/>
         <source>a*</source>
         <translation>a*</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="162"/>
         <source>All words beginning with &apos;a&apos;</source>
         <translation>Minden a-val kezdődő szó</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="164"/>
         <source>a*a</source>
         <translation>a*a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="166"/>
         <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
         <translation>&apos;Asszíria&apos;, &apos;abba&apos;, &apos;atya&apos; stb.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="168"/>
         <source>a?</source>
         <translation>é?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="170"/>
         <source>&apos;at&apos; and &apos;an&apos;</source>
         <translation>&apos;és&apos; és &apos;én&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="172"/>
         <source>a??a</source>
         <translation>&apos;a??a&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="174"/>
         <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
         <translation>&apos;abba&apos;, &apos;atya&apos; stb.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
         <source>Available text fields:</source>
         <translation>Lehetséges szövegmezők:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="181"/>
         <source>Searches headings</source>
         <translation>Fejlécekben keres</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="183"/>
         <source>Searches footnotes</source>
         <translation>Lábjegyzetekben keres</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="185"/>
         <source>Searches Strong&apos;s numbers</source>
         <translation>Strong számokat keres</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="187"/>
         <source>Searches morphology codes</source>
         <translation>Morfológiai kódokat keres</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="189"/>
         <source>Examples:</source>
         <translation>Példák:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="191"/>
         <source>heading:Jesus</source>
         <comment>Do not translate &quot;heading:&quot;.</comment>
         <translation>heading:Jesus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="193"/>
         <source>Finds headings with &apos;Jesus&apos;</source>
         <translation>Megkeresi az összes fejlécet &apos;Jézus&apos; tartalommal</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="195"/>
         <source>footnote:Jesus AND footnote:said</source>
         <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
         <translation>footnote:Jesus AND footnite:said</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
         <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
         <translation>Megtalálja a &apos;Jesus&apos; és &apos;said&apos; tartalmú lábjegyzeteket</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
         <source>strong:G846</source>
         <comment>Do not translate &quot;strong:&quot;.</comment>
         <translation>strong:G846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="202"/>
         <source>Finds verses with Strong&apos;s Greek number 846</source>
         <translation>Megtalálja a Strong görög szótár 846 -os szavát tartalmazó verseket</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="204"/>
         <source>morph:&quot;N-NSF&quot;</source>
         <comment>Do not translate &quot;morph:&quot;.</comment>
         <translation>mprph:&quot;N-NSF&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="206"/>
         <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
         <translation>Olyan verseket eredményez ahol &apos;N-NSF&apos; morfológiai kódú szó áll</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="210"/>
         <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
         <translation>A BibleTime a CLucene keresőmotorját használja. Többet olvashat erről a &lt;a href=&apos;%1&apos;&gt;lucene kifejezések weboldalán&lt;/a&gt; (egy küső böngészőben).</translation>
     </message>
@@ -4658,19 +4813,19 @@ Language name ppk</extracomment>
         <translation>Nyomtatás...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="231"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="241"/>
         <source>Copying search result</source>
         <translation>Keresési eredmény másolása folyamatban</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="250"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="259"/>
         <source>Saving search result</source>
         <translation>Keresési eredmény mentése folyamatban</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="268"/>
         <source>Printing search result</source>
         <translation>Keresési eredmény nyomtatása folyamatban</translation>
     </message>
@@ -4756,42 +4911,42 @@ Language name ppk</extracomment>
 <context>
     <name>Search::CSearchDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="130"/>
         <source>Missing indices</source>
         <translation>Hiányzó mutatók</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="87"/>
         <source>Search</source>
         <translation>Keresés</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="131"/>
         <source>The following modules need to be indexed before they can be searched in:</source>
         <translation>A keresés megkezdése előtt a következő modulokat indexelni kell:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="132"/>
         <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
         <translation>Az indexelés jelentős időt vehet igénybe. Válassza az &quot;Igent&quot; a modulok indexeléséhez és a keresés megkezdéséhez, vagy a &quot;Nem&quot; gombot a keresésé felfüggesztéséhez.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="236"/>
         <source>Drag any verse reference onto an open Bible window</source>
         <translation>Húzzon bármely vershivatkozást a megnyitott Biblia ablakba</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="241"/>
         <source>&amp;Analyze results...</source>
         <translation>T&amp;alálatok elemzése...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="242"/>
         <source>Show a graphical analysis of the search result</source>
         <translation>A találatok grafikus elemzésének mutatása</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="248"/>
         <source>&amp;Close</source>
         <translation>&amp;Bezárás</translation>
     </message>
@@ -4832,19 +4987,19 @@ Language name ppk</extracomment>
         <translation>Nyomtatás...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="164"/>
         <source>Printing search result</source>
         <translation>Keresési eredmény nyomtatása folyamatban</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="192"/>
         <source>Saving search result</source>
         <translation>Keresési eredmény mentése folyamatban</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="210"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="228"/>
         <source>Copying search result</source>
         <translation>Keresési eredmény másolása folyamatban</translation>
     </message>
@@ -4855,197 +5010,91 @@ Language name ppk</extracomment>
     </message>
 </context>
 <context>
-    <name>StandardWorksTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation>Az alapértelmezett munkákat akkor használjuk, amikor nincs egyéb munka megnyitva, például amikor egy hivatkozásra kattint egy Biblában vagy lexikonban.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>Biblia:</translation>
-    </message>
+    <name>btm::InstallProgress</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>Az alapértelmezett Bibliát használjuk, ha egy kereszthivatkozásra kattintunk a Bibliában</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>Kommentár:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>Az alapértelmezett kommentárt használjuk, ha egy kereszthivatkozásra kattintunk egy kommentárban</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation>Lexikon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>Az alapértelmezett lexikont használjuk, ha egy kereszthivatkozásra kattintunk egy lexikonban</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>Napi áhitat:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>Az alapértelmezett áhitat lesz használva, egy gyors áhitat mutatásához</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>Héber Strong&apos;s lexikon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>Az alapértelmezett Héber lexikont használjuk, ha egy kereszthivatkozásra kattintunk egy Héber lexikonban</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>Görög Strong&apos;s lexikon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>Az alapértelmezett Görög lexikont használjuk, ha egy kereszthivatkozásra kattintunk egy Görög lexikonban</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>Héber morfológiai lexikon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>Az alap héber morfológiai lexikont használjuk, ha nincs egyéb kiválasztva, például, ha  egy morfológiai hivatkozásra kattintunk egy héber szövegben</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="81"/>
+        <source>Failed</source>
+        <translation type="unfinished">Sikertelen</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation>Görög morfológiai lexikon:</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="84"/>
+        <source>Completed</source>
+        <translation type="unfinished">Kész</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>Az alap görög morfológiai lexikont használjuk, ha nincs egyéb kiválasztva, például, ha  egy morfológiai hivatkozásra kattintunk egy görög szövegben</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="90"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">Törölve</translation>
     </message>
 </context>
 <context>
-    <name>TextFiltersTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="unfinished">A szűrők szabályozzák a szövegek megjelenését. Itt adhatja meg az alapértelmezett beállításokat. Ablakonként felülírhatja ezeket a beállításokat.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation type="unfinished">Sortörés alkalmazása minden vers után</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">Vers számok mutatása</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation type="unfinished">Fejléc mutatása</translation>
-    </message>
+    <name>btm::InstallSources</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">Kereszthivatkozások mutatása</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">Görög kiejtés mutatása</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Héber magánhangzó pontok mutatása</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Héber hangsúlyozás jelzése</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">Szótő elválasztás mutatása</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installsources.cpp" line="63"/>
+        <source>Failed to refresh source %1</source>
+        <translation type="unfinished">Nem sikerült a(z) %1 forrás frissítése</translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation type="unfinished">Szöveges változatok használata</translation>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="59"/>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="62"/>
+        <source>The text you want to search for</source>
+        <translation type="unfinished">A szöveg, amir keres</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation>Szöveg keresése</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="135"/>
+        <source>New Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation>A szöveg, amir keres</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="136"/>
+        <source>View Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation>Kis/nagybetűérzékeny keresés</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="137"/>
+        <source>Text Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation>Ki&amp;s- nagybetű érzékeny</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="138"/>
+        <source>User Interface Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation>Az előző hely keresése</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="141"/>
+        <source>Bookshelf Manager</source>
+        <translation type="unfinished">Könyvespolc menedzser</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation>&amp;Előző</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="187"/>
+        <source>Single</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation>Következő keresése</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="188"/>
+        <source>Tabbed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation>&amp;Következő</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="189"/>
+        <source>Auto-tile</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation>Párbeszédablak bezárása</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="190"/>
+        <source>Auto-tile horizontally</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Bezárás</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="191"/>
+        <source>Auto-tile vertically</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/messages/bibletime_ui_it.ts b/i18n/messages/bibletime_ui_it.ts
index 12b4075..6f8b1a9 100644
--- a/i18n/messages/bibletime_ui_it.ts
+++ b/i18n/messages/bibletime_ui_it.ts
@@ -6,7 +6,7 @@
     <message>
         <source></source>
         <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
 This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
@@ -22,508 +22,457 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTime</name>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
+        <location filename="../../src/bibletime_init.cpp" line="741"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizza</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&amp;Search</source>
         <translation>&amp;Cerca</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&amp;Window</source>
         <translation>&amp;Finestra</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&amp;ttings</source>
         <translation>&amp;Impostazioni</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&amp;Show toolbar</source>
         <translation>&amp;Mostra barra degli strumenti</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&amp;Fullscreen mode</source>
         <translation>&amp;Schermo intero</translation>
     </message>
     <message>
-        <source>Main Toolbar</source>
-        <translation type="obsolete">Barra degli strumenti principale</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&amp;Quit</source>
         <translation>&amp;Esci</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
+        <location filename="../../src/bibletime_init.cpp" line="251"/>
         <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
         <translation>Apri il &quot;Bible study HowTo&quot; incluso in BibleTime.&lt;br/&gt;L&apos;&quot;HowTo&quot; è un introduzione a come studiare la Bibbia in modo efficiente.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
+        <location filename="../../src/bibletime_init.cpp" line="256"/>
         <source>Information about the BibleTime program</source>
         <translation>Informazioni sul programma BibleTime</translation>
     </message>
     <message>
-        <source>Show Bookshelf</source>
-        <translation type="obsolete">Mostra Libreria</translation>
-    </message>
-    <message>
-        <source>Show Bookmarks</source>
-        <translation type="obsolete">Mostra segnalibri</translation>
-    </message>
-    <message>
-        <source>Show Mag</source>
-        <translation type="obsolete">Mostra Lente</translation>
-    </message>
-    <message>
-        <source>Text windows</source>
-        <translation type="obsolete">Finestre testo</translation>
-    </message>
-    <message>
-        <source>Show text area headers</source>
-        <translation type="obsolete">Mostra intestazioni area testo</translation>
-    </message>
-    <message>
-        <source>Show navigation</source>
-        <translation type="obsolete">Mostra navigazione</translation>
-    </message>
-    <message>
-        <source>Show work chooser buttons</source>
-        <translation type="obsolete">Mostra pulsanti scelta documento</translation>
-    </message>
-    <message>
-        <source>Show tools</source>
-        <translation type="obsolete">Mostra strumenti</translation>
-    </message>
-    <message>
-        <source>O&amp;pen Windows</source>
-        <translation type="obsolete">A&amp;pri Finestre</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation>&amp;Salva sessione</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>&amp;Carica sessione</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&amp;Delete session</source>
         <translation>&amp;Elimina sessione</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&amp;Arrangement mode</source>
         <translation>&amp;Arrangiamento</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&amp;Manual mode</source>
         <translation>&amp;Manuale</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &amp;vertically</source>
         <translation>Affianca &amp;verticalmente</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &amp;horizontally</source>
         <translation>Affianca &amp;orizzontalmente</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&amp;cascade</source>
         <translation>In &amp;cascata</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&amp;Cascade</source>
         <translation>&amp;Cascata</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &amp;vertically</source>
         <translation>Disponi &amp;verticalmente</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &amp;horizontally</source>
         <translation>Disponi &amp;orizzontalmente</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&amp;ose all windows</source>
         <translation>Ch&amp;iudi tutte le finestre</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
+        <location filename="../../src/bibletime_init.cpp" line="224"/>
         <source>Close all open windows inside BibleTime</source>
         <translation>Chiudi tutte le finestre aperte dentro BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
+        <location filename="../../src/bibletime_init.cpp" line="241"/>
         <source>&amp;Handbook</source>
         <translation>&amp;Manuale</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&amp;Bible Study Howto</source>
         <translation>HowTo Studio &amp;Bibbia</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
+        <location filename="../../src/bibletime_slots.cpp" line="533"/>
         <source>Please enter a name for the new session.</source>
         <translation>Per favore, inserisci un nome per la nuova sessione.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
+        <location filename="../../src/bibletime_slots.cpp" line="541"/>
+        <source>Session already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_slots.cpp" line="542"/>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="107"/>
         <source>Quit BibleTime</source>
         <translation>Esci da BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
+        <location filename="../../src/bibletime_init.cpp" line="114"/>
         <source>Toggle fullscreen mode of the main window</source>
         <translation>Attiva/disattiva la modalità fullscreen della finestra principale</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
+        <location filename="../../src/bibletime_init.cpp" line="123"/>
         <source>Search in &amp;open works...</source>
         <translation>Cerca nei documenti &amp;aperti...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &amp;Bible...</source>
         <translation>Cerca nella &amp;Bibbia standard...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &amp;new session...</source>
         <translation>Salva come &amp;nuova sessione...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
+        <location filename="../../src/bibletime_init.cpp" line="140"/>
         <source>Create and save a new session</source>
         <translation>Crea e salva una nuova sessione</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
+        <location filename="../../src/bibletime_init.cpp" line="147"/>
         <source>Manually arrange the open windows</source>
         <translation>Disponi manualmente le finestre aperte</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
+        <location filename="../../src/bibletime_init.cpp" line="154"/>
         <source>Automatically tile the open windows vertically (arrange side by side)</source>
         <translation>Disposizione verticale automatica delle finestre aperte (fianco a fianco)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
+        <location filename="../../src/bibletime_init.cpp" line="161"/>
         <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
         <translation>Disposizione orizzontale automatica delle finestre aperte (una sopra l&apos;altra)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
+        <location filename="../../src/bibletime_init.cpp" line="165"/>
         <source>Auto-&amp;tile</source>
         <translation>Au&amp;to-affianca</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
+        <location filename="../../src/bibletime_init.cpp" line="168"/>
         <source>Automatically tile the open windows</source>
         <translation>Affianca automaticamente le finestre aperte</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
+        <location filename="../../src/bibletime_init.cpp" line="172"/>
         <source>Ta&amp;bbed</source>
         <translation>Sc&amp;hede</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
+        <location filename="../../src/bibletime_init.cpp" line="175"/>
         <source>Automatically tab the open windows</source>
         <translation>Automaticamente metti in schede le finestre aperte</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
+        <location filename="../../src/bibletime_init.cpp" line="182"/>
         <source>Automatically cascade the open windows</source>
         <translation>Disponi automaticamente in cascata le finestre aperte</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
+        <location filename="../../src/bibletime_init.cpp" line="189"/>
         <source>Cascade the open windows</source>
         <translation>Metti in cascata le finestre aperte</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
+        <location filename="../../src/bibletime_init.cpp" line="193"/>
         <source>&amp;Tile</source>
         <translation>&amp;Affianca</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
+        <location filename="../../src/bibletime_init.cpp" line="196"/>
         <source>Tile the open windows</source>
         <translation>Affianca le finestre aperte</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
+        <location filename="../../src/bibletime_init.cpp" line="203"/>
         <source>Vertically tile (arrange side by side) the open windows</source>
         <translation>Disponi verticalmente (fianco a fianco) le finestre aperte</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
+        <location filename="../../src/bibletime_init.cpp" line="210"/>
         <source>Horizontally tile (arrange on top of each other) the open windows</source>
         <translation>Disponi orizzontalmente (una sopra l&apos;altra) le finestre aperte</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
+        <location filename="../../src/bibletime_init.cpp" line="214"/>
         <source>Close &amp;window</source>
         <translation>Chiudi &amp;finestra</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
+        <location filename="../../src/bibletime_init.cpp" line="217"/>
         <source>Close the current open window</source>
         <translation>Chiudi la finestra corrente</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
+        <location filename="../../src/bibletime_init.cpp" line="228"/>
         <source>&amp;Configure BibleTime...</source>
         <translation>&amp;Configura BibleTime...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime&apos;s preferences</source>
         <translation>Imposta preferenze BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
+        <location filename="../../src/bibletime_init.cpp" line="234"/>
         <source>Bookshelf &amp;Manager...</source>
         <translation>&amp;Gestore Libreria...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
+        <location filename="../../src/bibletime_init.cpp" line="237"/>
         <source>Configure your bookshelf and install/update/remove/index works</source>
         <translation>Configura la tua libreria e installa/aggiorna/rimuovi/indicizza documenti</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
+        <location filename="../../src/bibletime_init.cpp" line="244"/>
         <source>Open BibleTime&apos;s handbook</source>
         <translation>Apri il manuale di BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&amp;Tip of the day...</source>
         <translation>&amp;Suggerimento del giorno...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
+        <location filename="../../src/bibletime_init.cpp" line="263"/>
         <source>Show tips about BibleTime</source>
         <translation>Mostra consigli su BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
+        <location filename="../../src/bibletime_init.cpp" line="402"/>
         <source>Toggle visibility of the bookshelf window</source>
         <translation>Attiva/disattiva la visibilità della libreria</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
+        <location filename="../../src/bibletime_init.cpp" line="406"/>
         <source>Toggle visibility of the bookmarks window</source>
         <translation>Attiva/disattiva la visibilità dei segnalibri</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
+        <location filename="../../src/bibletime_init.cpp" line="410"/>
         <source>Toggle visibility of the mag window</source>
         <translation>Attiva/disattiva la visibilità della lente</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
+        <location filename="../../src/bibletime_init.cpp" line="735"/>
         <source>Main toolbar</source>
         <translation>Barra degli strumenti principale</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
+        <location filename="../../src/bibletime_init.cpp" line="736"/>
         <source>Navigation toolbar</source>
         <translation>Barra di navigazione</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
+        <location filename="../../src/bibletime_init.cpp" line="737"/>
         <source>Works toolbar</source>
         <translation>Barra dei documenti</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
+        <location filename="../../src/bibletime_init.cpp" line="738"/>
         <source>Tools toolbar</source>
         <translation>Barra degli strumenti</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
+        <location filename="../../src/bibletime_init.cpp" line="739"/>
         <source>Format toolbar</source>
         <translation>Barra di formattazione</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
+        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <source>Sw&amp;itch session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="777"/>
         <source>Show main toolbar</source>
         <translation>Mostra barra principale</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
+        <location filename="../../src/bibletime_init.cpp" line="780"/>
         <source>Show navigation bar</source>
         <translation>Mostra barra di navigazione</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
+        <location filename="../../src/bibletime_init.cpp" line="783"/>
         <source>Show works toolbar</source>
         <translation>Mostra barra dei documenti</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
+        <location filename="../../src/bibletime_init.cpp" line="786"/>
         <source>Show tools toolbar</source>
         <translation>Mostra barra degli strumenti</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
+        <location filename="../../src/bibletime_init.cpp" line="789"/>
         <source>Show formatting toolbar</source>
         <translation>Mostra barra di formattazione</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
+        <location filename="../../src/bibletime_init.cpp" line="792"/>
         <source>Show bookshelf</source>
         <translation>Mostra libreria</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
+        <location filename="../../src/bibletime_init.cpp" line="795"/>
         <source>Show bookmarks</source>
         <translation>Mostra segnalibri</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
+        <location filename="../../src/bibletime_init.cpp" line="798"/>
         <source>Show mag</source>
         <translation>Mostra lente</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
+        <location filename="../../src/bibletime_init.cpp" line="743"/>
         <source>Toolbars</source>
         <translation>Barre degli strumenti</translation>
     </message>
     <message>
-        <source>Show main</source>
-        <translation type="obsolete">Mostra principale</translation>
-    </message>
-    <message>
-        <source>Show works</source>
-        <translation type="obsolete">Mostra documenti</translation>
-    </message>
-    <message>
-        <source>Show format</source>
-        <translation type="obsolete">Mostra formato</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <location filename="../../src/bibletime_init.cpp" line="774"/>
         <source>Show toolbars in text windows</source>
         <translation>Mostra barre degli strumenti nelle finestre di testo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
+        <location filename="../../src/bibletime_init.cpp" line="801"/>
         <source>Show parallel text headers</source>
         <translation>Mostra testo intestazioni parallelo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
+        <location filename="../../src/bibletime_init.cpp" line="747"/>
         <source>O&amp;pen windows</source>
         <translation>A&amp;pri Finestre</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show &quot;Whats this widget&quot; dialog</source>
         <translation>Mostra la finestra &quot;Cos&apos;è questo widget&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
+        <location filename="../../src/bibletime_init.cpp" line="954"/>
         <source>Whats this widget?</source>
         <translation>Cos&apos;è questo widget?</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
+        <location filename="../../src/bibletime_init.cpp" line="126"/>
         <source>Search in all works that are currently open</source>
         <translation>Cerca in tutti i documenti aperti</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
+        <location filename="../../src/bibletime_init.cpp" line="133"/>
         <source>Search in the standard Bible</source>
         <translation>Cerca nella Bibbia standard</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
+        <location filename="../../src/bibletime_slots.cpp" line="532"/>
         <source>New Session</source>
         <translation>Nuova Sessione</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
+        <location filename="../../src/bibletime.cpp" line="77"/>
         <source>Initializing the SWORD engine...</source>
         <translation>Inizializzazione di SWORD...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
+        <location filename="../../src/bibletime.cpp" line="85"/>
         <source>Creating BibleTime&apos;s user interface...</source>
         <translation>Creazione dell&apos;interfaccia di BibleTime...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
+        <location filename="../../src/bibletime.cpp" line="92"/>
         <source>Initializing menu- and toolbars...</source>
         <translation>Inizializzazione menu e barre degli strumenti...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Unlock Work</source>
         <translation>Sblocca Documento</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Enter the unlock key for %1.</source>
         <translation>Inserisci la chiave di sblocco per %1.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
+        <location filename="../../src/bibletime.cpp" line="214"/>
         <source>Warning: Invalid unlock key!</source>
         <translation>Attenzione: Chiave di sblocco non valida!</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
+        <location filename="../../src/bibletime.cpp" line="215"/>
         <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
         <translation>La chiave di sblocco fornita non blocca correttamente questo modulo. Per favore riprova.</translation>
     </message>
     <message>
-        <source>Enter the unlock key for this work.</source>
-        <translation type="obsolete">Inserisci la chiave per sbloccare questo documento.</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
+        <location filename="../../src/bibletime_init.cpp" line="255"/>
         <source>&amp;About BibleTime</source>
         <translation>&amp;About BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
+        <location filename="../../src/bibletime_init.cpp" line="733"/>
         <source>Bookmarks</source>
         <translation>Segnalibri</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
+        <location filename="../../src/bibletime_init.cpp" line="734"/>
         <source>Mag</source>
         <translation>Lente</translation>
     </message>
@@ -531,7 +480,8 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTimeApp</name>
     <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
+        <location filename="../../src/bibletimeapp.cpp" line="59"/>
+        <location filename="../../src/mobile/bibletimeapp.cpp" line="63"/>
         <source>Fatal error!</source>
         <translation>Errore irreversibile!</translation>
     </message>
@@ -539,7 +489,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtAboutDialog</name>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
         <source>BibleTime is an easy to use but powerful Bible study tool.</source>
         <translation>BibleTime è un semplice, ma potente strumento per studiare la Bibbia.</translation>
     </message>
@@ -554,51 +504,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>La licenza completa, giuridicamente vincolante, è sotto.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="109"/>
         <source>About BibleTime</source>
         <translation>About BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="121"/>
         <source>&amp;BibleTime</source>
         <translation>&amp;BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="126"/>
         <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
         <translation>Stiamo cercando sviluppatori e traduttori. Se vuoi far parte del nostro team, invia una mail a %1.</translation>
     </message>
     <message>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation type="obsolete">(c)1999-2013, The BibleTime Team</translation>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="130"/>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished">(c)1999-2014, The BibleTime Team</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="137"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Collaboratori</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="148"/>
         <source>The following people contributed to BibleTime:</source>
         <translation>Le seguenti persone hanno contribuito a BibleTime:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="150"/>
         <source>documentation and translation manager</source>
         <translation>manager documentazione e traduzione</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="172"/>
         <source>project manager</source>
         <translation>project manager</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>tester</source>
         <translation>tester</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>usability expert</source>
         <translation>esperto di usabilità</translation>
     </message>
@@ -638,57 +589,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>&amp;Licenza</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
         <source>designer</source>
         <translation>designer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation>(c)1999-2013, The BibleTime Team</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="139"/>
         <source>developer</source>
         <translation>sviluppatore</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
         <source>project founder</source>
         <translation>fondatore del progetto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="157"/>
         <source>packager</source>
         <translation>packager</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="158"/>
         <source>creator of The Sword Project</source>
         <translation>creatore del progetto Sword</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
         <source>domain sponsor</source>
         <translation>dominio sponsor</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
         <source>howto</source>
         <translation>howto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="141"/>
         <source>artist</source>
         <translation>artista</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="173"/>
         <source>documentation</source>
         <translation>documentazione</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="188"/>
         <source>The following people translated BibleTime into their language:</source>
         <translation>Le seguenti persone hanno tradotto BibleTime nella loro lingua:</translation>
     </message>
@@ -716,37 +662,37 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBibleKeyWidget</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="110"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Scorri tra le voci della lista. Premi il tasto e muovi il mouse per aumentare o diminuire l&apos;elemento.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
         <source>Next book</source>
         <translation>Libro successivo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
         <source>Previous book</source>
         <translation>Libro precedente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="117"/>
         <source>Next chapter</source>
         <translation>Capitolo successivo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
         <source>Previous chapter</source>
         <translation>Capitolo precedente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="122"/>
         <source>Next verse</source>
         <translation>Versetto successivo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
         <source>Previous verse</source>
         <translation>Versetto precedente</translation>
     </message>
@@ -825,27 +771,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfGroupingMenu</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
         <source>Category/Language</source>
         <translation>Categoria/Lingua</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
         <source>Language/Category</source>
         <translation>Lingua/Categoria</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="105"/>
         <source>Language</source>
         <translation>Lingua</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="108"/>
         <source>No grouping</source>
         <translation>Nessun raggruppamento</translation>
     </message>
@@ -853,167 +799,168 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfModel</name>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
+        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="78"/>
         <source>Module</source>
         <translation>Modulo</translation>
     </message>
+</context>
+<context>
+    <name>BtBookshelfWidget</name>
     <message>
-        <source>Bibles</source>
-        <translation type="obsolete">Bibbie</translation>
-    </message>
-    <message>
-        <source>Commentaries</source>
-        <translation type="obsolete">Commenti</translation>
-    </message>
-    <message>
-        <source>Books</source>
-        <translation type="obsolete">Libri</translation>
-    </message>
-    <message>
-        <source>Cults/Unorthodox</source>
-        <translation type="obsolete">Culti/Non ortodossi</translation>
-    </message>
-    <message>
-        <source>Maps and Images</source>
-        <translation type="obsolete">Mappe e Immagini</translation>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="157"/>
+        <source>Fi&amp;lter:</source>
+        <translation>Fi&amp;ltro:</translation>
     </message>
     <message>
-        <source>Daily Devotionals</source>
-        <translation type="obsolete">Letture di devozione giornaliere</translation>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="158"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
+        <source>Grouping</source>
+        <translation>Raggruppamento</translation>
     </message>
     <message>
-        <source>Lexicons and Dictionaries</source>
-        <translation type="obsolete">Lessici e Dizionari</translation>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="159"/>
+        <source>Change the grouping of items in the bookshelf.</source>
+        <translation>Cambia il raggruppamento degli elementi nella libreria.</translation>
     </message>
     <message>
-        <source>Glossaries</source>
-        <translation type="obsolete">Glossari</translation>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
+        <source>Show/hide works</source>
+        <translation>Mostra/nascondi documenti</translation>
     </message>
+</context>
+<context>
+    <name>BtChapterDropdownChooserButton</name>
     <message>
-        <source>Unknown</source>
-        <translation type="obsolete">Sconosciuto</translation>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
+        <source>Select chapter</source>
+        <translation>Seleziona capitolo</translation>
     </message>
 </context>
 <context>
-    <name>BtBookshelfWidget</name>
+    <name>BtConfig</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
-        <source>Fi&amp;lter:</source>
-        <translation>Fi&amp;ltro:</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="46"/>
+        <source>Old testament</source>
+        <translation type="unfinished">Vecchio testamento</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
-        <source>Grouping</source>
-        <translation>Raggruppamento</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="47"/>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation type="unfinished">Mosè/Pentateuco/Torah</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
-        <source>Change the grouping of items in the bookshelf.</source>
-        <translation>Cambia il raggruppamento degli elementi nella libreria.</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="48"/>
+        <source>History</source>
+        <translation type="unfinished">Storia</translation>
     </message>
     <message>
-        <source>Use grouping from bookshelf dock</source>
-        <translation type="obsolete">Usa raggruppamento dalla libreria</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="49"/>
+        <source>Prophets</source>
+        <translation type="unfinished">Profeti</translation>
     </message>
     <message>
-        <source>Category/Language</source>
-        <translation type="obsolete">Categoria/Lingua</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="50"/>
+        <source>New testament</source>
+        <translation type="unfinished">Nuovo testamento</translation>
     </message>
     <message>
-        <source>Category</source>
-        <translation type="obsolete">Categoria</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="51"/>
+        <source>Gospels</source>
+        <translation type="unfinished">Vangeli</translation>
     </message>
     <message>
-        <source>Language/Category</source>
-        <translation type="obsolete">Lingua/Categoria</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="52"/>
+        <source>Letters/Epistles</source>
+        <translation type="unfinished">Lettere/Epistole</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation type="obsolete">Lingua</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="53"/>
+        <source>Paul&apos;s Epistles</source>
+        <translation type="unfinished">Lettere di San Paolo </translation>
     </message>
     <message>
-        <source>No grouping</source>
-        <translation type="obsolete">Nessun raggruppamento</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="89"/>
+        <source>Error loading configuration!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
-        <source>Show/hide works</source>
-        <translation>Mostra/nascondi documenti</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="90"/>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>BtChapterDropdownChooserButton</name>
+    <name>BtConfigCore</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
-        <source>Select chapter</source>
-        <translation>Seleziona capitolo</translation>
+        <location filename="../../src/backend/config/btconfigcore.cpp" line="62"/>
+        <source>Default Session</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BtDisplaySettingsButton</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="103"/>
         <source>Use linebreaks after each verse</source>
         <translation>Usa interruzione di riga dopo ciascun versetto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
         <source>Show verse numbers</source>
         <translation>Mostra i numeri dei versetti</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
         <source>Show headings</source>
         <translation>Mostra le intestazioni</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
         <source>Highlight words of Jesus</source>
         <translation>Parole di Gesú evidenziate</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
         <source>Show Hebrew vowel points</source>
         <translation>Mostra la punteggiatura vocale Ebraica</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
         <source>Show Hebrew cantillation marks</source>
         <translation>Mostra i segni di cantillazione Ebraica</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
         <source>Show Greek accents</source>
         <translation>Mostra gli accenti Greci</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
         <source>Use alternative textual variant</source>
         <translation>Usa le varianti di testo alternative</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
         <source>Show scripture cross-references</source>
         <translation>Mostra i riferimenti incrociati</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
         <source>Show footnotes</source>
         <translation>Mostra note</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
         <source>Show morph segmentation</source>
         <translation>Mostra la segmentazione morfologica</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="120"/>
         <source>Display settings</source>
         <translation>Impostazioni di visualizzazione</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="123"/>
         <source>Display settings: No options available</source>
         <translation>Impostazioni di visualizzazione: Nessuna opzione disponibile</translation>
     </message>
@@ -1021,27 +968,45 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtEditBookmarkDialog</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="71"/>
         <source>Edit Bookmark</source>
         <translation>Modifica Segnalibro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
         <source>Location:</source>
         <translation>Posizione:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
         <source>Title:</source>
         <translation>Titolo:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
         <source>Description:</source>
         <translation>Descrizione:</translation>
     </message>
 </context>
 <context>
+    <name>BtFindWidget</name>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="28"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="29"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="74"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtFontChooserWidget</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
@@ -1062,31 +1027,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <source>You can specify a custom font for each language.</source>
-        <translation type="obsolete">Puoi specificare un carattere personalizzato per ogni lingua.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="151"/>
         <source>&amp;Language:</source>
         <translation>&amp;Lingua:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
         <source>The font selection below will apply to all texts in this language</source>
         <translation>Il carattere selezionatto sotto sarà applicato a tutto il testo in questa lingua</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
         <source>Use custom font</source>
         <translation>Usa carattere personalizzato</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
         <source>Optionally specify a custom font for each language:</source>
         <translation>Opzionalmente specifica un tipo di carattere per ogni lingua:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="150"/>
         <source>Fonts</source>
         <translation>Caratteri</translation>
     </message>
@@ -1094,75 +1055,67 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtIndexPage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="107"/>
         <source>%1 KiB</source>
         <translation>%1 KB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="114"/>
         <source>0 KiB</source>
         <translation>0 KB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="124"/>
         <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
         <translation>Se selezionato, quegli indici che non hanno corrispondenti documenti saranno disattivati all&apos;avvio di BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
         <source>Automatically delete orphaned indexes when BibleTime starts</source>
         <translation>Elimina automaticamente gli indici orfani quando BibleTime inizia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="127"/>
         <source>Delete the selected indexes</source>
         <translation>Elimina gli indici selezionati</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="130"/>
         <source>Create new indexes for the selected works</source>
         <translation>Crea nuovi indici per i documenti selezionati</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Work</source>
         <translation>Documento</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Index size</source>
         <translation>Dimensione indice</translation>
     </message>
     <message>
-        <source>Create new search indexes and delete created indexes for the installed works.</source>
-        <translation type="obsolete">Crea un nuovo indice di ricerca ed elimina gli indici creati per i documenti installati.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="122"/>
         <source>Search Indexes</source>
         <translation>Ricerca Indici</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="91"/>
         <source>Indexed Works</source>
         <translation>Documenti Indicizzati</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="96"/>
         <source>Unindexed Works</source>
         <translation>Documenti non indicizzati</translation>
     </message>
     <message>
-        <source>KiB</source>
-        <translation type="obsolete">KiB</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
         <source>Create...</source>
         <translation>Crea...</translation>
     </message>
@@ -1188,17 +1141,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallModuleChooserDialogModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="88"/>
         <source>Work</source>
         <translation>Documento</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="89"/>
         <source>Installation source</source>
         <translation>Origine installazione</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="90"/>
         <source>Version</source>
         <translation>Versione</translation>
     </message>
@@ -1211,14 +1164,6 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Installa/Aggiorna</translation>
     </message>
     <message>
-        <source>Install and update works. Add remote or local sources, refresh them, select the works to be installed/updated and click Install.&lt;br/&gt;&lt;b&gt;WARNING:&lt;/b&gt; If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="obsolete">Installa e aggiorna documenti. Aggiungi fonti remote o locali, aggiornale, seleziona i documenti che devono essere installati/aggiornati e clicca Installa.&lt;br/&gt;&lt;b&gt;ATTENZIONE:&lt;/b&gt; Se vivi in un paese perseguitato e non vuoi rischiare di essere rilevato non usare origini remote.</translation>
-    </message>
-    <message>
-        <source>Install folder:</source>
-        <translation type="obsolete">Cartella d&apos;installazione:</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="265"/>
         <source>WARNING!!!</source>
         <translation>ATTENZIONE!!!</translation>
@@ -1299,20 +1244,16 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>La cartella di destinazione non è scrivibile o non esiste. L&apos;installazione fallirà se questo non viene risolto prima.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="388"/>
         <source>Delete Source?</source>
         <translation>Eliminare Fonte?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="389"/>
         <source>Do you really want to delete this source?</source>
         <translation>Vuoi davvero eliminare questa fonte?</translation>
     </message>
     <message>
-        <source>Install...</source>
-        <translation type="obsolete">Installa...</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="281"/>
         <source>Install or update selected works</source>
         <translation>Installa o aggiorna i documenti selezionati</translation>
@@ -1321,17 +1262,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPageModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="75"/>
         <source>Work</source>
         <translation>Documento</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="76"/>
         <source>Version</source>
         <translation>Versione</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="77"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
@@ -1347,99 +1288,99 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPathDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="35"/>
         <source>Bookshelf Folders</source>
         <translation>Cartelle della Libreria</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
         <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
         <translation>I documenti possono essere installati in una o più cartelle. Dopo aver impostato le cartelle qui ne puoi scegliere una nella pagina di installazione.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="45"/>
         <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
         <translation>BibleTime e la libreria SWORD hanno trovato documenti in tutte queste cartelle. Se una cartella è rimossa qui, esiste ancora nel sistema con tutti documenti dentro.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="48"/>
         <source>Configure bookshelf folders</source>
         <translation>Configura le cartelle della libreria</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="53"/>
         <source>Configuration file for the folders is: </source>
         <translation>Il file di configurazione per le cartelle è:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="61"/>
         <source>Folders where new works can be installed</source>
         <translation>Cartelle dove i nuovi documenti possono essere installati</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
         <source>Read-only folders</source>
         <translation>Cartelle in sola lettura</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="66"/>
         <source>Nonexistent folders</source>
         <translation>Cartelle non esistenti</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="80"/>
         <source>&amp;Add...</source>
         <translation>&amp;Aggiungi...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="81"/>
         <source>Add new folder</source>
         <translation>Aggiungi nuova cartella</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="86"/>
         <source>&amp;Edit...</source>
         <translation>&amp;Modifica...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="87"/>
         <source>Edit the selected folder</source>
         <translation>Modifica la cartella selezionata</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="92"/>
         <source>&amp;Remove</source>
         <translation>&amp;Rimuovi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="93"/>
         <source>Remove the selected folder</source>
         <translation>Rimuovi la cartella selezionata</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="167"/>
         <source>This default folder in your home directory can&apos;t be removed</source>
         <translation>Questa cartella predefinita nella tua home directory non può essere rimossa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="194"/>
         <source>Choose Folder</source>
         <translation>Seleziona Cartella</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>Use Folder?</source>
         <translation>Utilizzare Cartella?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
         <translation>Questa cartella non è scrivibile, quindi i documenti non possono essere installati qui utilizzando BibleTime. Vuoi utilizzare questa cartella invece di quella precedente?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
         <translation>Questa cartella non è scrivibile, quindi i documenti non possono essere installati qui utilizzando BibleTime. Vuoi comunque aggiungerla alla lista delle cartelle della libreria?</translation>
     </message>
@@ -1447,52 +1388,42 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallProgressDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Work</source>
         <translation>Documento</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Progress</source>
         <translation>Progresso</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>Ferma</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="60"/>
         <source>Stop All</source>
         <translation>Ferma tutti</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Completed</source>
         <translation>Completato</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>Cancellato</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="55"/>
         <source>Waiting for turn...</source>
         <translation>In attesa del turno...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="113"/>
         <source>Preparing install...</source>
         <translation>Preparazione installazione...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="37"/>
         <source>Install Progress</source>
         <translation>Progresso dell&apos;Installazione</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Failed</source>
         <translation>Fallito</translation>
     </message>
@@ -1500,21 +1431,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <source>Select the language in which the Biblical book names are displayed.</source>
-        <translation type="obsolete">Seleziona la lingua in cui i nomi dei libri della Bibbia sono visualizzati.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
         <source>Language for names of Bible books:</source>
         <translation>Lingua per i nomi dei libri della Bibbia:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation>Lingue che possono essere utilizzate per i nomi dei libri della Bibbia</translation>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="136"/>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="133"/>
         <source>Languages</source>
         <translation>Lingue</translation>
     </message>
@@ -1564,7 +1491,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtModuleManagerDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="57"/>
         <source>Bookshelf Manager</source>
         <translation>Gestore Libreria</translation>
     </message>
@@ -1572,7 +1499,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkAction</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="103"/>
         <source>&amp;Open work</source>
         <translation>Apri d&amp;ocumento</translation>
     </message>
@@ -1580,12 +1507,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkActionMenu</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="42"/>
         <source>&amp;Grouping order</source>
         <translation>Ordine di &amp;raggruppamento</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="43"/>
         <source>Sets the grouping order for the items in this menu.</source>
         <translation>Imposta l&apos;ordine di raggruppamento per gli elementi in questo menu.</translation>
     </message>
@@ -1621,59 +1548,47 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtRemovePage</name>
     <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Rimuovi</translation>
-    </message>
-    <message>
-        <source>Remove installed works. Select the works and click Remove button.</source>
-        <translation type="obsolete">Rimuovi i documenti installati. Seleziona i documenti e clicca il tasto Rimuovi.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="100"/>
         <source>Select &amp;works to uninstall:</source>
         <translation>Seleziona &amp;documenti da disinstallare:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&amp;Remove...</source>
         <translation>&amp;Rimuovi...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="98"/>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="111"/>
         <source>Start removal of %1 works:</source>
         <translation>Inizio rimozione di %1 documenti:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="114"/>
         <source>Start removal:</source>
         <translation>Inizia rimozione:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="145"/>
         <source>You selected the following work(s): </source>
         <translation>Hai selezioni i seguenti documenti: </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="149"/>
         <source>Do you really want to remove them from your system?</source>
         <translation>Vuoi veramente rimuoverle dal sistema?</translation>
     </message>
     <message>
-        <source>Remove...</source>
-        <translation type="obsolete">Rimuovi...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
         <source>Remove the selected works</source>
         <translation>Rimuovi i documenti selezionati</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="151"/>
         <source>Remove Works?</source>
         <translation>Rimuovere i Documenti?</translation>
     </message>
@@ -1694,12 +1609,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtSearchModuleChooserDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="47"/>
         <source>Works to Search in</source>
         <translation>Documenti in cui Cercare</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="49"/>
         <source>Select the works which should be searched.</source>
         <translation>Seleziona i documenti che devono essere cercati.</translation>
     </message>
@@ -1783,133 +1698,165 @@ scorciatoia</translation>
     </message>
 </context>
 <context>
-    <name>BtSourceArea</name>
+    <name>BtStandardWorksTab</name>
     <message>
-        <source>Work</source>
-        <translation type="obsolete">Documento</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="169"/>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation type="unfinished">I documenti standard sono utilizzati quando nessun documento particolare viene specificato, per esempio quando un collegamento ipertestuale in una Bibbia o lessico viene cliccato.</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Descrizione</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
+        <translation type="unfinished">Bibbia:</translation>
     </message>
     <message>
-        <source>&amp;Add...</source>
-        <translation type="obsolete">Aggiungi...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="174"/>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation type="unfinished">La Bibbia standard viene usata quando un ipertesto è cliccato in una Bibbia</translation>
     </message>
     <message>
-        <source>Refresh...</source>
-        <translation type="obsolete">Aggiorna...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</source>
+        <translation type="unfinished">Commento:</translation>
     </message>
     <message>
-        <source>Refresh the list of works from this source</source>
-        <translation type="obsolete">Aggiorna la lista dei documenti da questa fonte</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="178"/>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation type="unfinished">I commenti standard sono usati quando un ipertesto in un commento viene cliccato</translation>
     </message>
     <message>
-        <source>&amp;Delete...</source>
-        <translation type="obsolete">Elimina...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
+        <translation type="unfinished">Lessico:</translation>
     </message>
     <message>
-        <source>Delete this source</source>
-        <translation type="obsolete">Elimina questa fonte</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="182"/>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation type="unfinished">Il lessico standard viene usato quando un ipertesto è cliccato in un lessico</translation>
     </message>
     <message>
-        <source>Add new source</source>
-        <translation type="obsolete">Aggiungi nuova fonte</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</source>
+        <translation type="unfinished">Lettura di devozione giornaliera:</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceAreaModel</name>
     <message>
-        <source>Work</source>
-        <translation type="obsolete">Documento</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="186"/>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation type="unfinished">Le letture di devozione standard saranno usate per visualizzare uno start up devozionale breve</translation>
     </message>
     <message>
-        <source>Version</source>
-        <translation type="obsolete">Versione</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation type="unfinished">Lessico Ebraico Strong:</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Descrizione</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="190"/>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation type="unfinished">Il lessico standard Ebraico è usato quando un ipertesto dentro a lessico Ebraico è cliccato</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceWidget</name>
     <message>
-        <source>Delete Source?</source>
-        <translation type="obsolete">Eliminare Fonte?</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation type="unfinished">Lessico Greco Strong:</translation>
     </message>
     <message>
-        <source>Do you really want to delete this source?</source>
-        <translation type="obsolete">Vuoi davvero eliminare questa fonte?</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="194"/>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation type="unfinished">Il lessico standard Greco è usato quando un ipertesto dentro a lessico Greco è cliccato</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Annulla</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</source>
+        <translation type="unfinished">Lessico Ebraico morfologico:</translation>
     </message>
     <message>
-        <source>Refreshing source</source>
-        <translation type="obsolete">Aggiornamento Fonte</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="198"/>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation type="unfinished">Il lessico standard morfologico per testi Ebraici è usato quando un ipertesto di una nota morfologica in un testo Ebraico è cliccato</translation>
     </message>
     <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Connessione...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</source>
+        <translation type="unfinished">Lessico Greco morfologico:</translation>
     </message>
     <message>
-        <source>Refreshing...</source>
-        <translation type="obsolete">Aggiornamento...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="202"/>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation type="unfinished">Il lessico standard morfologico per testi Grechi è usato quando un ipertesto di una nota morfologica in un testo Greco è cliccato</translation>
     </message>
+</context>
+<context>
+    <name>BtTextFiltersTab</name>
     <message>
-        <source>No sources were found in the SWORD configuration and BibleTime couldn&apos;t create a default source. Check your SWORD configuration and that the configuration path is writable. Then restart the Bookshelf Manager.</source>
-        <translation type="obsolete">Nessuna fonte trovata nella configurazione di SWORD e BibleTime non può creare una fonte di default. Controlla la configurazione di SWORD e che il percorso di configurazione sia scrivibile. Quindi riavvia il Gestore dei Segnalibri.</translation>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="74"/>
+        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
+        <translation type="unfinished">I filtri controllano l&apos;aspetto del testo. Qui puoi specificare le impostazioni predefinites per tutti i filtri. Puoi ignorare queste impostazioni in ogni finestra.</translation>
     </message>
     <message>
-        <source>Remote:</source>
-        <translation type="obsolete">Remoto:</translation>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="78"/>
+        <source>Insert line break after each verse</source>
+        <translation type="unfinished">Inserisci interruzione di riga dopo ciascun versetto</translation>
     </message>
     <message>
-        <source>Local:</source>
-        <translation type="obsolete">Locale:</translation>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
+        <source>Show verse numbers</source>
+        <translation type="unfinished">Mostra i numeri dei versetti</translation>
     </message>
     <message>
-        <source>Not a directory!</source>
-        <translation type="obsolete">Non è una cartella!</translation>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
+        <source>Show section headings</source>
+        <translation type="unfinished">Mostra le intestazioni</translation>
     </message>
     <message>
-        <source>Not readable!</source>
-        <translation type="obsolete">Non leggibile!</translation>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
+        <source>Show scripture cross-references</source>
+        <translation type="unfinished">Mostra i riferimenti incrociati</translation>
     </message>
     <message>
-        <source>Warning</source>
-        <translation type="obsolete">Attenzione</translation>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="82"/>
+        <source>Show Greek accents</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="obsolete">La cartella di destinazione non è scrivibile o non esiste. L&apos;installazione fallirà se questo non viene risolto prima.</translation>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="83"/>
+        <source>Show Hebrew vowel points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="84"/>
+        <source>Show Hebrew cantillation marks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="85"/>
+        <source>Show morph segmentation</source>
+        <translation type="unfinished">Mostra la segmentazione morfologica</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="86"/>
+        <source>Use textual variants</source>
+        <translation type="unfinished">Usa le varianti testuali</translation>
     </message>
 </context>
 <context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
         <source>Add/remove/replace</source>
         <translation>Aggiungi/rimuovi/sostituisci</translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Rimuovi</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
         <source>Replace</source>
         <translation>Sostituisci</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
@@ -1917,95 +1864,87 @@ scorciatoia</translation>
 <context>
     <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="69"/>
         <source>Tip Of The Day</source>
         <translation>Suggerimento Del Giorno</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="83"/>
         <source>Show tips at startup</source>
         <translation>Mostra suggerimenti all&apos;avvio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="94"/>
         <source>Next Tip</source>
         <translation>Prossimo suggerimento</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
         <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
         <translation>Per aggiungere più documenti della Bibbia in parallelo nella finestra Bibbia attiva seleziona questa icona e scegli un altro documento.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
         <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
         <translation>Per aggiungere più commenti parallelo nella finestra commenti attiva seleziona questa icona e scegli un altro commento.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="134"/>
         <source>To learn more about the BibleTime project please go to our web site.</source>
         <translation>Per saperne di più sul progetto BibleTime visita il nostro sito web.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="137"/>
         <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
         <translation>Per sincronizzare una finestra commento con la finestra Bibbia attiva, attiva la finestra commento e seleziona questa icona.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
         <source>Select the icon again to stop the synchronization.</source>
         <translation>Seleziona nuovamente l&apos;icona per fermare la sincronizzazione.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="142"/>
         <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
         <translation>Per creare un segnalibro trascina qualsiasi riferimento ad un versetto della Bibbia da un documento o un commento nella finestra Segnalibri. Una freccia indicherà la posizione in cui il segnalibro andrà quando sarà rilasciato il cursore. Gli altri documenti avranno un riferimento in alto a sinistra che può essere utilizzato per creare un segnalibro.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="147"/>
         <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
         <translation>Per cambiare il titolo o la descrizione di un segnalibro, clicca con il tasto destro sul segnalibro e seleziona Modifica Segnalibro. Finita la modifica, la descrizione può essere vista passsando sopra al segnalibro.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="151"/>
         <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
         <translation>Per caricare fonti multiple di installazione per i documenti, vai al Gestoee Libreria, seleziona il pulsante Aggiungi, poi il pulsante Ottieni Lista.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="154"/>
         <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
         <translation>Per trovare più informazioni su un documento, vai nella finestra dei segnalibri, clicca di destro sul docuemnto, e seleziona About.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="157"/>
         <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
         <translation>Le finestre Libreria, Segnalibri, e Lente possono essere spostate in nuove posizioni trascinandole dal titolo nella parte superiore della finestra. Possono essere posizionate a sinistra, destra, sopra o sotto alla finestra dei documenti. Possono essere posizionate una sopra l&apos;altra e delle linguette appariranno affinchè ogni finestra possa essere selezionata. Possono essere ridimensionate trascinando il bordo tra le finestre.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="163"/>
         <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
         <translation>Puoi cercare i numeri Strong in un documento. Parti da un documento che ha i numeri Strong e vai su una parola. Clicca di destro la parola e usa la Ricerca Strong. Una finestra di dialogo si aprirà permettendoti di vedere l&apos;utilizzo dello stesso numero Strong in altre parti del documento.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="178"/>
         <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
         <translation>Puoi salvare le tue finestre aperte in una sessione. Tale sessione può essere facilmente ripristinata in seguito. Puoi salvare tante sessioni quante ne vuoi. Puoi accedere alla funzione sessione dal menu Finestra.</translation>
     </message>
     <message>
-        <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging theborder between the window and another window.</source>
-        <translation type="obsolete">La finestre Libreria, Segnalibri, e Lente possono essere spostate in nuove posizioni trascinandole dal titolo nella parte superiore della finestra. Possono essere posizionate a sinistra, destra, sopra o sotto della finestra dei documenti. Possono essere posizionate una sopra l&apos;altra e delle linguette appariranno affinchè ogni finestra possa essere selezionata. Possono essere ridimensionate trascinando il bordo tra le finestre.</translation>
-    </message>
-    <message>
-        <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the sameStrong&apos;s number in other locations of the work.</source>
-        <translation type="obsolete">Puoi cercare i numeri Strong in un documento. Parti da un documento che ha i numeri Strong e vai su una parola. Clicca di destro la parola e usa la Ricerca Strong. Una finestra di dialogo si aprirà permettendoti di vedere l&apos;utilizzo dello stesso numero Strong in altre parti del documento.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="168"/>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
         <translation>Puoi salvare delle note personali per un specifico riferimento ad un versetto. Devi installare i commenti personali. Apri il Gestore Libreria, scegli Crosswire come fonte e guarda sotto Commenti e Inglese. Una volta installato, usa la finestra della Libreria e clicca di destro su Personal. Usa la modifica come testo semplice o HTML per aprire i commenti in scrittura.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
         <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
         <translation>Puoi vedere le informazioni sui numeri Strong nella finestra della Lente passando sopra ad una parola in una Bibbia che ha i numeri Strong. Devi avere i lessici StrongsGreek e StrongsHebrew installati da Crosswire.</translation>
     </message>
@@ -2021,49 +1960,49 @@ scorciatoia</translation>
 <context>
     <name>CAcceleratorSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="128"/>
         <source>Choose action group:</source>
         <translation>Scegli un gruppo di azione:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="130"/>
         <source>Main Window</source>
         <translation>Finestra Principale</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
         <source>All text windows</source>
         <translation>Tutte le finestre di testo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="132"/>
         <source>Bible windows</source>
         <translation>Finestre di Bibbia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
         <source>Commentary windows</source>
         <translation>Finestre di Commenti</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="134"/>
         <source>Lexicon windows</source>
         <translation>Finestre di Lessico</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
         <source>Book windows</source>
         <translation>Finestre di Libri</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
         <source>
    &quot;%1&quot; in the &quot;%2&quot; group</source>
         <translation>
    &quot;%1&quot; nel &quot;%2&quot; grouppo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
         <source>Shortcuts</source>
         <translation>Scorciatoie</translation>
     </message>
@@ -2071,103 +2010,95 @@ scorciatoia</translation>
 <context>
     <name>CBibleReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="64"/>
         <source>Next book</source>
         <translation>Libro successivo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="68"/>
         <source>Previous book</source>
         <translation>Libro precedente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="72"/>
         <source>Next chapter</source>
         <translation>Capitolo successivo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="76"/>
         <source>Previous chapter</source>
         <translation>Capitolo precedente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="80"/>
         <source>Next verse</source>
         <translation>Versetto successivo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="84"/>
         <source>Previous verse</source>
         <translation>Versetto precedente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="89"/>
         <source>Copy chapter</source>
         <translation>Copia capitolo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="92"/>
         <source>Save chapter as plain text</source>
         <translation>Salva capitolo come testo semplice</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="95"/>
         <source>Save chapter as HTML</source>
         <translation>Salva capitolo come HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="98"/>
         <source>Print chapter</source>
         <translation>Stampa capitolo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="110"/>
         <source>Text of reference</source>
         <translation>Testo di riferimento</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
         <source>Reference with text</source>
         <translation>Riferimento con testo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="253"/>
         <source>Bible window</source>
         <translation>Finestra della Bibbia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="263"/>
         <source>Copy...</source>
         <translation>Copia...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="274"/>
         <source>Save...</source>
         <translation>Salva...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="287"/>
         <source>Print...</source>
         <translation>Stampa...</translation>
     </message>
     <message>
-        <source>Copy chapter to clipboard ...</source>
-        <translation type="obsolete">Copia capitolo negli appunti...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="371"/>
         <source>Copying</source>
         <translation>Copia in corso</translation>
     </message>
     <message>
-        <source>Saving chapter ...</source>
-        <translation type="obsolete">Salvataggio capitolo ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="390"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="408"/>
         <source>Saving</source>
         <translation>Salvataggio</translation>
     </message>
@@ -2175,7 +2106,7 @@ scorciatoia</translation>
 <context>
     <name>CBookReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
+        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="70"/>
         <source>Toggle tree view</source>
         <translation>Mostra/nascondi vista ad albero</translation>
     </message>
@@ -2183,97 +2114,93 @@ scorciatoia</translation>
 <context>
     <name>CBookmarkIndex</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
         <source>Bookmarks</source>
         <translation>Segnalibri</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="92"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="583"/>
         <source>New folder</source>
         <translation>Nuova cartella</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
         <source>Rename folder</source>
         <translation>Rinomina cartella</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
         <source>Delete Items</source>
         <translation>Elimina elementi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="704"/>
         <source>Do you really want to delete the selected items and child-items?</source>
         <translation>Vuoi davvero eliminare gli elementi selezionati e i loro figli?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="814"/>
         <source>The work to which the bookmark points to is not installed.</source>
         <translation>Il documento a cui il segnalibro punta non è installatos.</translation>
     </message>
     <message>
-        <source>Change bookmark description...</source>
-        <translation type="obsolete">Cambia descrizione del segnalibro...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
         <source>Print bookmarks...</source>
         <translation>Stampa segnalibri...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="103"/>
         <source>Remove selected items...</source>
         <translation>Elimina elementi selzionati...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
         <source>Import to folder...</source>
         <translation>Importa nella cartella...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
         <source>Edit bookmark...</source>
         <translation>Modifica segnalibro...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
         <source>Sort folder bookmarks...</source>
         <translation>Ordina segnalibri della cartella...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
         <source>Sort all bookmarks...</source>
         <translation>Ordina tutti i segnalibri...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="100"/>
         <source>Export from folder...</source>
         <translation>Esporta dalla cartella...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="393"/>
         <source>Can drop only bookmarks or one folder</source>
         <translation>È possibile rilasciare solo segnalibri o una cartella</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="398"/>
         <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
         <translation>Impossibile rilasciare cartela dentro se stessa o nelle sue sottocartelle</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="406"/>
         <source>Move</source>
         <translation>Muovi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="467"/>
         <source>Drag references from text views to this view</source>
         <translation>Trascina i riferimenti dalla vista testo a questa vista</translation>
     </message>
@@ -2281,42 +2208,42 @@ scorciatoia</translation>
 <context>
     <name>CCommentaryReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="31"/>
         <source>Next book</source>
         <translation>Libro successivo </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="35"/>
         <source>Previous book</source>
         <translation>Libro precedente </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="39"/>
         <source>Next chapter</source>
         <translation>Capitolo successivo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="43"/>
         <source>Previous chapter</source>
         <translation>Capitolo precedente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="47"/>
         <source>Next verse</source>
         <translation>Versetto successivo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="51"/>
         <source>Previous verse</source>
         <translation>Versetto precedente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="56"/>
         <source>Synchronize</source>
         <translation>Sincronizza</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="59"/>
         <source>Synchronize the displayed entry of this work with the active Bible window</source>
         <translation>Sincronizzare la voce visualizzata di questo documento con la finestra della Bibbia attiva</translation>
     </message>
@@ -2324,7 +2251,7 @@ scorciatoia</translation>
 <context>
     <name>CConfigurationDialog</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="41"/>
         <source>Configure BibleTime</source>
         <translation>Configura BibleTime</translation>
     </message>
@@ -2332,67 +2259,67 @@ scorciatoia</translation>
 <context>
     <name>CDisplaySettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
         <source>Display templates</source>
         <translation>Visualizza modelli</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
         <source>Available display styles:</source>
         <translation>Stili disponibili:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="113"/>
         <source>Style preview</source>
         <translation>Anteprima stile</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="131"/>
         <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
         <translation>Dio infatti ha tanto amato il mondo da dare il suo Figlio unigenito, perché chiunque crede in lui non muoia, ma abbia la vita eterna.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="138"/>
         <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
         <translation>Dio non ha mandato il Figlio nel mondo per giudicare il mondo, ma perché il mondo si salvi per mezzo di lui.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="145"/>
         <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
         <translation>Chi crede in lui non è condannato; ma chi non crede è già stato condannato, perché non ha creduto nel nome dell&apos;unigenito Figlio di Dio.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="155"/>
         <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
         <translation>Chiunque infatti fa il male, odia la luce e non viene alla luce perché non siano svelate le sue opere.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="160"/>
         <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
         <translation>Ma chi opera la verità viene alla luce, perché appaia chiaramente che le sue opere sono state fatte in Dio.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="106"/>
         <source>Display templates define how text is displayed.</source>
         <translation>I modelli di visualizzazione definiscono come il testo viene visualizzato.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="110"/>
         <source>Show the BibleTime logo on startup</source>
         <translation>Mostra il logo di BibleTime all&apos;avvio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
         <source>Show startup logo</source>
         <translation>Mostra il logo di avvio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="150"/>
         <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
         <translation>E il giudizio è questo: la luce è venuta nel mondo, ma gli uomini hanno preferito le tenebre alla luce, perché le loro opere erano malvagie.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="101"/>
         <source>Display</source>
         <translation>Mostra</translation>
     </message>
@@ -2405,159 +2332,124 @@ scorciatoia</translation>
 <context>
     <name>CDisplayWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="215"/>
         <source>Back in history</source>
         <translation>Indietro nella storia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="223"/>
         <source>Forward in history</source>
         <translation>Avanti nella storia</translation>
     </message>
     <message>
-        <source>Zoom in</source>
-        <translation type="obsolete">Zoom in</translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation type="obsolete">Zoom out</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="192"/>
         <source>Select all</source>
         <translation>Seleziona tutto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="196"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="200"/>
         <source>Find...</source>
         <translation>Trova...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="204"/>
         <source>Change location</source>
         <translation>Cambia località</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="209"/>
         <source>Search with works of this window</source>
         <translation>Cerca con i documenti di questa finestra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="393"/>
         <source>Work chooser buttons</source>
         <translation>Pulsanti di selezione documento</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="403"/>
         <source>Text area header</source>
         <translation>Intestazione area testo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="453"/>
         <source>Navigation</source>
         <translation>Navigazione</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="459"/>
         <source>Tool</source>
         <translation>Strumento</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="465"/>
         <source>Format</source>
         <translation>Formato</translation>
     </message>
-    <message>
-        <source>Tools</source>
-        <translation type="obsolete">Strumenti</translation>
-    </message>
-</context>
-<context>
-    <name>CFontChooser</name>
-    <message>
-        <source>Size:</source>
-        <translation type="obsolete">Dimensione:</translation>
-    </message>
-    <message>
-        <source>Font name:</source>
-        <translation type="obsolete">Nome carattere:</translation>
-    </message>
-    <message>
-        <source>Font style:</source>
-        <translation type="obsolete">Stile carattere:</translation>
-    </message>
 </context>
 <context>
     <name>CHTMLWriteDisplay</name>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
         <source>Bold</source>
         <translation>Grassetto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="60"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="67"/>
         <source>Italic</source>
         <translation>Corsivo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="79"/>
         <source>Underline</source>
         <translation>Sottolineato</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="84"/>
         <source>Left</source>
         <translation>Sinistra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="94"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="99"/>
         <source>Center</source>
         <translation>Centro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="104"/>
         <source>Right</source>
         <translation>Destra</translation>
     </message>
     <message>
-        <source>Select all</source>
-        <translation type="obsolete">Seleziona tutto</translation>
-    </message>
-    <message>
-        <source>HTML editor window</source>
-        <translation type="obsolete">Finestra dell&apos;editor HTML</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="231"/>
         <source>Font</source>
         <translation>Carattere</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="243"/>
         <source>Font size</source>
         <translation>Dimensione carattere</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="255"/>
         <source>Font color</source>
         <translation>Colore carattere</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="89"/>
         <source>Align left</source>
         <translation>Allinea a sinistra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="109"/>
         <source>Align right</source>
         <translation>Allinea a destra</translation>
     </message>
@@ -2565,122 +2457,24 @@ scorciatoia</translation>
 <context>
     <name>CHTMLWriteWindow</name>
     <message>
-        <source>Sync with active Bible</source>
-        <translation type="obsolete">Sincronizza con la Bibbia attiva</translation>
-    </message>
-    <message>
-        <source>Save text</source>
-        <translation type="obsolete">Salva testo</translation>
-    </message>
-    <message>
-        <source>Delete current entry</source>
-        <translation type="obsolete">Cancella voce attuale</translation>
-    </message>
-    <message>
-        <source>Restore original text</source>
-        <translation type="obsolete">Ripristina il testo originale</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="122"/>
         <source>Module not writable</source>
         <translation>Modulo non scrivibile</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="124"/>
         <source>Module is not writable.</source>
         <translation>Modulo non scrivibile.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="125"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Il modulo non può essere modificato o non hai i permessi di scrittura.</translation>
     </message>
-    <message>
-        <source>Synchronize (show the same verse) with the active Bible window</source>
-        <translation type="obsolete">Sincronizza (mostra lo stesso versetto) con la finestra della Bibbia attiva</translation>
-    </message>
-    <message>
-        <source>Delete current entry (no undo)</source>
-        <translation type="obsolete">Cancella voce attuale (no annulla)</translation>
-    </message>
-    <message>
-        <source>Restore original text, new text will be lost</source>
-        <translation type="obsolete">Ripristina il testo originale, il testo nuovo andrà perso</translation>
-    </message>
-</context>
-<context>
-    <name>CInputDialog</name>
-    <message>
-        <source>Clear</source>
-        <translation type="obsolete">Pulisci</translation>
-    </message>
-</context>
-<context>
-    <name>CKeyReferenceWidget</name>
-    <message>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="obsolete">Scorri tra le voci della lista. Premi il tasto e muovi il mouse per aumentare o diminuire l&apos;elemento.</translation>
-    </message>
-    <message>
-        <source>Next book</source>
-        <translation type="obsolete">Libro successivo </translation>
-    </message>
-    <message>
-        <source>Previous book</source>
-        <translation type="obsolete">Libro precedente </translation>
-    </message>
-    <message>
-        <source>Next chapter</source>
-        <translation type="obsolete">Capitolo successivo </translation>
-    </message>
-    <message>
-        <source>Previous chapter</source>
-        <translation type="obsolete">Capitolo precedente</translation>
-    </message>
-    <message>
-        <source>Next verse</source>
-        <translation type="obsolete">Versetto successivo</translation>
-    </message>
-    <message>
-        <source>Previous verse</source>
-        <translation type="obsolete">Versetto precedente</translation>
-    </message>
 </context>
 <context>
     <name>CLanguageSettingsPage</name>
     <message>
-        <source>Use custom font</source>
-        <translation type="obsolete">Usa carattere personalizzato</translation>
-    </message>
-    <message>
-        <source>Language for names of Bible books:</source>
-        <translation type="obsolete">Lingua per i nomi dei libri della Bibbia:</translation>
-    </message>
-    <message>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation type="obsolete">Lingue che possono essere utilizzate per i nomi dei libri della Bibbia</translation>
-    </message>
-    <message>
-        <source>The font selection below will apply to all texts in this language</source>
-        <translation type="obsolete">Il carattere selezionatto sotto sarà applicato a tutto il testo in questa lingua</translation>
-    </message>
-    <message>
-        <source>Select the language in which the Biblical book names are displayed.</source>
-        <translation type="obsolete">Seleziona la lingua in cui i nomi dei libri della Bibbia sono visualizzati.</translation>
-    </message>
-    <message>
-        <source>Fonts</source>
-        <translation type="obsolete">Caratteri</translation>
-    </message>
-    <message>
-        <source>You can specify a custom font for each language.</source>
-        <translation type="obsolete">Puoi specificare un carattere personalizzato per ogni lingua.</translation>
-    </message>
-    <message>
-        <source>Languages</source>
-        <translation type="obsolete">Lingue</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/settingsdialogs/clanguagesettings.cpp" line="297"/>
         <source></source>
         <translation></translation>
@@ -2689,22 +2483,22 @@ scorciatoia</translation>
 <context>
     <name>CLexiconKeyChooser</name>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Scorri tra le voci della lista. Premi il tasto e muovi il mouse per aumentare o diminuire l&apos;elemento.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
         <source>Entries of the current work</source>
         <translation>Voci del documento corrente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Voce successiva</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="49"/>
         <source>Previous entry</source>
         <translation>Voce precedente </translation>
     </message>
@@ -2712,189 +2506,183 @@ scorciatoia</translation>
 <context>
     <name>CLexiconReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Voce successiva</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="51"/>
         <source>Previous entry</source>
         <translation>Voce precedente </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="55"/>
         <source>Copy reference only</source>
         <translation>Copia solo riferimento</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
         <source>Save entry as HTML</source>
         <translation>Salva come HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
         <source>Print reference only</source>
         <translation>Stampa solo riferimento</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
         <source>Strong&apos;s Search</source>
         <translation>Ricerca Strong</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
         <source>Entry with text</source>
         <translation>Voce con testo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="134"/>
         <source>Entry as plain text</source>
         <translation>Voce come testo semplice</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="265"/>
         <source>Lexicon window</source>
         <translation>Finestra del lessico</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="272"/>
         <source>Copy...</source>
         <translation>Copia...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="281"/>
         <source>Save...</source>
         <translation>Salva...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="297"/>
         <source>Print...</source>
         <translation>Stampa...</translation>
     </message>
     <message>
-        <source>Saving entry ...</source>
-        <translation type="obsolete">Salvataggio voce...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="340"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="364"/>
         <source>Saving</source>
         <translation>Salvataggio</translation>
     </message>
 </context>
 <context>
-    <name>CModuleIndexDialog</name>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Annulla</translation>
-    </message>
-    <message>
-        <source>Creating indices</source>
-        <translation type="obsolete">Creazione indici</translation>
-    </message>
-    <message>
-        <source>Creating index for work: %1</source>
-        <translation type="obsolete">Creazione indici per il documento: %1</translation>
-    </message>
-    <message>
-        <source>Indexing Is Cancelled</source>
-        <translation type="obsolete">Indicizzazione Annullata</translation>
-    </message>
-    <message>
-        <source>Indexing is cancelled because modules are removed.</source>
-        <translation type="obsolete">Indicizzazione annullato perchè i moduli sono rimossi.</translation>
-    </message>
-</context>
-<context>
     <name>CPlainWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="235"/>
         <source>Sync with active Bible</source>
         <translation>Sincronizza con la Bibbia attiva</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="245"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="249"/>
         <source>Save text</source>
         <translation>Salva testo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="254"/>
         <source>Delete current entry</source>
         <translation>Cancella voce attuale</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="263"/>
         <source>Restore original text</source>
         <translation>Ripristina il testo originale</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="163"/>
         <source>Module not writable</source>
         <translation>Modulo non scrivibile</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="165"/>
         <source>Module is not writable.</source>
         <translation>Modulo non scrivibile.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="166"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Il modulo non può essere modificato o non hai i permessi di scrittura.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="240"/>
         <source>Synchronize (show the same verse) with the active Bible window</source>
         <translation>Sincronizza (mostra lo stesso versetto) con la finestra della Bibbia attiva</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="258"/>
         <source>Delete current entry (no undo)</source>
         <translation>Cancella voce attuale (no annulla)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="267"/>
         <source>Restore original text, new text will be lost</source>
         <translation>Ripristina il testo originale, il testo nuovo andrà perso</translation>
     </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save Text?</source>
+        <translation type="unfinished">Salvare il Testo?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <source>Save text before closing?</source>
+        <translation type="unfinished">Salvare il testo prima di chiudere?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save changed text?</source>
+        <translation type="unfinished">Salvare i cambiamenti del testo?</translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="232"/>
         <source>Save Search Analysis</source>
         <translation>Salva Analisi Ricerca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation>HTML file (*.html;*.HTML;*.HTM;*.htm)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="243"/>
         <source>BibleTime Search Analysis</source>
         <translation>Analisi Ricerca BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation>Cerca testo :</translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="234"/>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="259"/>
+        <source>Search text:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="263"/>
+        <source>Results by work and book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="265"/>
         <source>Book</source>
         <translation>Libro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="293"/>
         <source>Total hits</source>
         <translation>Risultati totali</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="303"/>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
         <translation>Creato da &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</translation>
     </message>
@@ -2902,168 +2690,168 @@ scorciatoia</translation>
 <context>
     <name>CSwordModuleInfo</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="763"/>
         <source>Version</source>
         <translation>Versione</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="766"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="774"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="771"/>
         <source>Markup</source>
         <translation>Marcatura</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
         <source>Location</source>
         <translation>Posizione</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="782"/>
         <source>Language</source>
         <translation>Lingua</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="787"/>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="792"/>
         <source>LCSH</source>
         <translation>LCSH</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="796"/>
         <source>Writable</source>
         <translation>Scrivibile</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>yes</source>
         <translation>si</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>no</source>
         <translation>no</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="801"/>
         <source>Unlock key</source>
         <translation>Chiave di sblocco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="822"/>
         <source>Features</source>
         <translation>Proprietá</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="830"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Fai attenzione, questo documento contiene materiale di culto discutibile!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="834"/>
         <source>About</source>
         <translation>About</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="856"/>
         <source>Distribution license</source>
         <translation>Licenza di distribuzione</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="857"/>
         <source>Distribution source</source>
         <translation>Distribuzione sorgenti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="858"/>
         <source>Distribution notes</source>
         <translation>Note di distribuzione</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="859"/>
         <source>Text source</source>
         <translation>Testo d&apos;origine</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="860"/>
         <source>Copyright notes</source>
         <translation>Note di copyright</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
         <source>Copyright holder</source>
         <translation>Titolare del copyright</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
         <source>Copyright date</source>
         <translation>Data del copyright</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
         <source>Copyright contact name</source>
         <translation>Nome contatto del copyright</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
         <source>Copyright contact address</source>
         <translation>Indirizzo contatto del copyright</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
         <source>Copyright contact email</source>
         <translation>Email contatto del copyright</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="956"/>
         <source>Bibles</source>
         <translation>Bibbie</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="958"/>
         <source>Commentaries</source>
         <translation>Commenti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="960"/>
         <source>Books</source>
         <translation>Libri</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="962"/>
         <source>Cults/Unorthodox</source>
         <translation>Culti/Non ortodossi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="964"/>
         <source>Maps and Images</source>
         <translation>Mappe e Immagini</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="966"/>
         <source>Daily Devotionals</source>
         <translation>Letture di devozione giornaliere</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="968"/>
         <source>Lexicons and Dictionaries</source>
         <translation>Lessici e Dizionari</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="970"/>
         <source>Glossaries</source>
         <translation>Glossari</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="972"/>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
@@ -3071,17 +2859,17 @@ scorciatoia</translation>
 <context>
     <name>CSwordSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="43"/>
         <source>Standard works</source>
         <translation>Documenti standard</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="44"/>
         <source>Text filters</source>
         <translation>Filtri testo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="41"/>
         <source>Desk</source>
         <translation>Scrivania</translation>
     </message>
@@ -3094,42 +2882,42 @@ scorciatoia</translation>
 <context>
     <name>CSwordSetupInstallSourcesDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="47"/>
         <source>Caption</source>
         <translation>Didascalia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="68"/>
         <source>Path</source>
         <translation>Percorso</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="91"/>
         <source>Get list...</source>
         <translation>Ottieni lista...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="92"/>
         <source>Download a list of sources from CrossWire server and add sources</source>
         <translation>Scarica una lista di fonti dal server di CrossWire e aggiungi alle fonti</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
         <source>A source with this caption already exists. Please provide a different caption.</source>
         <translation>Una fonte con questo titolo esiste già. Fornisci un titolo diverso.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="160"/>
         <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
 
 Do you want to continue?</source>
@@ -3138,137 +2926,118 @@ Do you want to continue?</source>
 Vuoi continuare?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
         <source>Get source list from remote server?</source>
         <translation>Prendere la lista delle fonti da un server remoto?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="167"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="168"/>
         <source>Downloading List</source>
         <translation>Scaricamento Lista</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="178"/>
         <source>Connecting...</source>
         <translation>Connessione...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="197"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="198"/>
         <source>Refreshing...</source>
         <translation>Aggiornamento...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
         <source>Please provide a caption.</source>
         <translation>Per favore fornisci una didascalia.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
         <source>Please provide a server name.</source>
         <translation>Per favore fornisci un nome di un server.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
         <source>Please provide a valid, readable path.</source>
         <translation>Per favore fornisci un percorso valido e leggibile.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Please provide a path.</source>
         <translation>Per favore fornisci un percorso.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="39"/>
         <source>New  Installation Source</source>
         <translation>Nuova Installazione Fonte</translation>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>Salvare il testo prima di chiudere?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>Salvare i cambiamenti del testo?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>Salvare il Testo?</translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="178"/>
         <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
         <translation>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Versione: %3&lt;/p&gt;&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="194"/>
         <source>Abbreviation</source>
         <translation>Abbreviazione</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="203"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="290"/>
         <source>Cross references</source>
         <translation>Riferimenti incrociati</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="343"/>
         <source>Footnote</source>
         <translation>Nota</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="374"/>
         <source>Strongs</source>
         <translatorcomment>Numeri di Strong </translatorcomment>
         <translation>Strongs</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="451"/>
         <source>Morphology</source>
         <translatorcomment>Note Morfologiche</translatorcomment>
         <translation>Morfologia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="472"/>
         <source>Word lookup</source>
         <translation>Ricerca parola</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="60"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
         <source>Select all</source>
         <translation>Seleziona tutto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="80"/>
         <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
         <translation>&lt;small&gt;Questo è lo spazio della Lente. Porta il mouse sopra links o altri elementi che includono dati e il contenuto apparirà nella Lente dopo poco. Muovi il mouse nella Lente rapidamente o blocca la vista tenendo premuto Shift mentri muovi il mouse.&lt;/small&gt;</translation>
     </message>
@@ -3276,28 +3045,28 @@ Vuoi continuare?</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="412"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="422"/>
         <source>Indexing aborted</source>
         <translation>Indicizzazione abortita</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="413"/>
         <source>An internal error occurred while building the index: %1</source>
         <translation>Errore interno durante la creazione dell&apos;indice: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="423"/>
         <source>An internal error occurred while building the index.</source>
         <translation>È avvenuto un errore interno durante la costruzione dell&apos;indice.</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="522"/>
         <source>Search aborted</source>
         <translation>Ricerca abortita</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="523"/>
         <source>An internal error occurred while executing your search.</source>
         <translation>È avvenuto un errore interno durante la tua ricerca.</translation>
     </message>
@@ -3338,7 +3107,7 @@ Vuoi continuare?</translation>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="122"/>
         <source>Bibles</source>
         <translation>Bibbie</translation>
     </message>
@@ -3355,740 +3124,740 @@ Vuoi continuare?</translation>
         <translation>Libri</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="390"/>
         <source>Added text</source>
         <translation>Testo aggiunto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="143"/>
         <source>Names of languages</source>
         <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
         <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
         <translation>Nomi delle lingue</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="148"/>
         <source>Afrikaans</source>
         <extracomment>Language name af</extracomment>
         <translation>Afrikaans</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="151"/>
         <source>Amuzgo, Guerrero</source>
         <extracomment>Language name amu</extracomment>
         <translation>Guerrero Amuzgo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="153"/>
         <source>English, Old (ca.450-1100)</source>
         <extracomment>Language name ang</extracomment>
         <translation>Inglese, Antico (ca.450-1100)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="155"/>
         <source>Arabic</source>
         <extracomment>Language name ar</extracomment>
         <translation>Arabo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="158"/>
         <source>Azerbaijani</source>
         <extracomment>Language name az</extracomment>
         <translation>Azerbaigiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="160"/>
         <source>Azerbaijani, South</source>
         <extracomment>Language name azb</extracomment>
         <translation>Azerbaigiano, Sud</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="165"/>
         <source>Belarusian</source>
         <extracomment>Language name be</extracomment>
         <translation>Bielorusso</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="167"/>
         <source>Bulgarian</source>
         <extracomment>Language name bg</extracomment>
         <translation>Bulgaro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="173"/>
         <source>Breton</source>
         <extracomment>Language name br</extracomment>
         <translation>Bretone</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="175"/>
         <source>Bosnian</source>
         <extracomment>Language name bs</extracomment>
         <translation>Bosniaco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="177"/>
         <source>Catalan</source>
         <extracomment>Language name ca</extracomment>
         <translation>Catalano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="180"/>
         <source>Chinantec, Comaltepec</source>
         <extracomment>Language name cco</extracomment>
         <translation>Comaltepec Chinantec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="182"/>
         <source>Cebuano</source>
         <extracomment>Language name ceb</extracomment>
         <translation>Cebuano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
         <source>Chamorro</source>
         <extracomment>Language name ch</extracomment>
         <translation>Chamorro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
         <source>Chontal, Highland Oaxaca</source>
         <extracomment>Language name chd</extracomment>
         <translation>Highland Oaxaca Chontal</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
         <source>Chinantec, Quiotepec</source>
         <extracomment>Language name chq</extracomment>
         <translation>Quiotepec Chinantec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="190"/>
         <source>Chinantec, Ozumacu00edn</source>
         <extracomment>Language name chz</extracomment>
         <translation>Ozumacín Chinantec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="193"/>
         <source>Cakchiquel, Western</source>
         <extracomment>Language name ckw</extracomment>
         <translation>Western Cakchiquel</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="195"/>
         <source>Chinantec, Lalana</source>
         <extracomment>Language name cnl</extracomment>
         <translation>Lalana Chinantec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="197"/>
         <source>Chinantec, Tepetotutla</source>
         <extracomment>Language name cnt</extracomment>
         <translation>Tepetotutla Chinantec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="199"/>
         <source>Coptic</source>
         <extracomment>Language name cop</extracomment>
         <translation>Copto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
         <source>Czech</source>
         <extracomment>Language name cs</extracomment>
         <translation>Ceco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
         <source>Chinantec, Sochiapan</source>
         <extracomment>Language name cso</extracomment>
         <translation>Sochiapan Chinantec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
         <source>Chol, Tila</source>
         <extracomment>Language name cti</extracomment>
         <translation>Tila Chol</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
         <source>Chatino, Western Highland</source>
         <extracomment>Language name ctp</extracomment>
         <translation>Western Highland Chatino</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
         <source>Church Slavic</source>
         <extracomment>Language name cu</extracomment>
         <translation>Slavo di Chiesa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="212"/>
         <source>Welsh</source>
         <extracomment>Language name cy</extracomment>
         <translation>Gallese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
         <source>Danish</source>
         <extracomment>Language name da</extracomment>
         <translation>Danese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
         <source>German</source>
         <extracomment>Language name de</extracomment>
         <translation>Tedesco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
         <source>Duruma</source>
         <extracomment>Language name dug</extracomment>
         <translation>Duruma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="221"/>
         <source>Greek, Modern (1453-)</source>
         <extracomment>Language name el</extracomment>
         <translation>Greco, Moderno (1453-)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
         <source>English</source>
         <extracomment>Language name en</extracomment>
         <translation>Inglese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="225"/>
         <source>American English</source>
         <extracomment>Language name en_US</extracomment>
         <translation>Inglese (Americano)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="227"/>
         <source>English, Middle (1100-1500)</source>
         <extracomment>Language name enm</extracomment>
         <translation>Inglese, Medioevale (1100-1500)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="229"/>
         <source>Esperanto</source>
         <extracomment>Language name eo</extracomment>
         <translation>Esperanto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="231"/>
         <source>Spanish</source>
         <extracomment>Language name es</extracomment>
         <translation>Spagnolo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
         <source>Estonian</source>
         <extracomment>Language name et</extracomment>
         <translation>Estone</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
         <source>Basque</source>
         <extracomment>Language name eu</extracomment>
         <translation>Basco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
         <source>Persian</source>
         <extracomment>Language name fa</extracomment>
         <translation>Persiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
         <source>Finnish</source>
         <extracomment>Language name fi</extracomment>
         <translation>Finlandese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="243"/>
         <source>French</source>
         <extracomment>Language name fr</extracomment>
         <translation>Francese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="245"/>
         <source>Frisian</source>
         <extracomment>Language name fy</extracomment>
         <translation>Frisone</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="247"/>
         <source>Irish</source>
         <extracomment>Language name ga</extracomment>
         <translation>Irlandese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="249"/>
         <source>Gaelic (Scots)</source>
         <extracomment>Language name gd</extracomment>
         <translation>Gaelico (Scozzese)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="251"/>
         <source>Geez</source>
         <extracomment>Language name gez</extracomment>
         <translation>Geez</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
         <source>Gothic</source>
         <extracomment>Language name got</extracomment>
         <translation>Gotico</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
         <source>Manx</source>
         <extracomment>Language name gv</extracomment>
         <translation>Mannese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
         <source>Greek, Ancient (to 1453)</source>
         <extracomment>Language name grc</extracomment>
         <translation>Greco, Antico (fino al 1453)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="262"/>
         <source>Hebrew</source>
         <extracomment>Language name he</extracomment>
         <translation>Ebreo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
         <source>Hausa</source>
         <extracomment>Language name hau</extracomment>
         <translation>Hausa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
         <source>Hawaiian</source>
         <extracomment>Language name haw</extracomment>
         <translation>Hawaiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
         <source>Hindi</source>
         <extracomment>Language name hi</extracomment>
         <translation>Hindi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="271"/>
         <source>Croatian</source>
         <extracomment>Language name hr</extracomment>
         <translation>Croato</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="275"/>
         <source>Hungarian</source>
         <extracomment>Language name hu</extracomment>
         <translation>Ungherese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
         <source>Huave, San Mateo Del Mar</source>
         <extracomment>Language name huv</extracomment>
         <translation>San Mateo Del Mar Huave</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
         <source>Armenian</source>
         <extracomment>Language name hy</extracomment>
         <translation>Armeno</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
         <source>Indonesian</source>
         <extracomment>Language name id</extracomment>
         <translation>Indonesiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
         <source>Icelandic</source>
         <extracomment>Language name is</extracomment>
         <translation>Islandese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
         <source>Italian</source>
         <extracomment>Language name it</extracomment>
         <translation>Italiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="291"/>
         <source>Itzu00e1</source>
         <extracomment>Language name itz</extracomment>
         <translation>Itzá</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="293"/>
         <source>Ixil, San Juan Cotzal</source>
         <extracomment>Language name ixl</extracomment>
         <translation>San Juan Cotzal Ixil</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
         <source>Japanese</source>
         <extracomment>Language name ja</extracomment>
         <translation>Giapponese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
         <source>Jacalteco, Eastern</source>
         <extracomment>Language name jac</extracomment>
         <translation>Eastern Jacalteco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
         <source>Javanese, Caribbean</source>
         <extracomment>Language name jvn</extracomment>
         <translation>Giavanese, Caraibi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="302"/>
         <source>Georgian</source>
         <extracomment>Language name ka</extracomment>
         <translation>Georgiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
         <source>Korean</source>
         <extracomment>Language name ko</extracomment>
         <translation>Coreano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="315"/>
         <source>Kurdish</source>
         <extracomment>Language name ku</extracomment>
         <translation>Curdo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
         <source>Kirghiz</source>
         <extracomment>Language name ky</extracomment>
         <translation>Kirghiso</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
         <source>Latin</source>
         <extracomment>Language name la</extracomment>
         <translation>Latino</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
         <source>Lacandon</source>
         <extracomment>Language name lac</extracomment>
         <translation>Lacandon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
         <source>Lithuanian</source>
         <extracomment>Language name lt</extracomment>
         <translation>Lituano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="332"/>
         <source>Latvian</source>
         <extracomment>Language name lv</extracomment>
         <translation>Lettone</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="334"/>
         <source>Malagasy</source>
         <extracomment>Language name mg</extracomment>
         <translation>Malgascio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="337"/>
         <source>Maori</source>
         <extracomment>Language name mi</extracomment>
         <translation>Maori</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="339"/>
         <source>Mixe, Isthmus</source>
         <extracomment>Language name mir</extracomment>
         <translation>Isthmus Mixe</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="341"/>
         <source>Mixtec, Coatzospan</source>
         <extracomment>Language name miz</extracomment>
         <translation>Coatzospan Mixtec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="343"/>
         <source>Macedonian</source>
         <extracomment>Language name mk</extracomment>
         <translation>Macedone</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="345"/>
         <source>Mixtec, Silacayoapan</source>
         <extracomment>Language name mks</extracomment>
         <translation>Silacayoapan Mixtec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="350"/>
         <source>More</source>
         <extracomment>Language name mos</extracomment>
         <translation>Mossi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
         <source>Malay</source>
         <extracomment>Language name ms</extracomment>
         <translation>Malese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
         <source>Maltese</source>
         <extracomment>Language name mt</extracomment>
         <translation>Maltese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="375"/>
         <source>Low German; Low Saxon</source>
         <extracomment>Language name nds</extracomment>
         <translation>Basso Germanico, Basso Sassone</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="377"/>
         <source>Nepali</source>
         <extracomment>Language name ne</extracomment>
         <translation>Nepalese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="379"/>
         <source>Nahuatl, Guerrero</source>
         <extracomment>Language name ngu</extracomment>
         <translation>Guerrero Nahuatl</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
         <source>Nahuatl, Northern Oaxaca</source>
         <extracomment>Language name nhy</extracomment>
         <translation>Northern Oaxaca Nahuatl</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
         <source>Dutch</source>
         <extracomment>Language name nl</extracomment>
         <translation>Olandese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
         <source>Norwegian Nynorsk</source>
         <extracomment>Language name nn</extracomment>
         <translation>Norvegese Nynorsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
         <source>Norwegian</source>
         <extracomment>Language name no</extracomment>
         <translation>Norvegese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="397"/>
         <source>Otomi, Queru00e9taro</source>
         <extracomment>Language name otq</extracomment>
         <translation>Querétaro Otomi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
         <source>Papiamento</source>
         <extracomment>Language name pap</extracomment>
         <translation>Papiamento</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
         <source>Polish</source>
         <extracomment>Language name pl</extracomment>
         <translation>Polacco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="411"/>
         <source>Persian (Dari)</source>
         <extracomment>Language name prs</extracomment>
         <translation>Persiano (Dari)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="415"/>
         <source>Portuguese</source>
         <extracomment>Language name pt</extracomment>
         <translation>Portoghese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
         <source>Brasilian Portuguese</source>
         <extracomment>Language name pt_BR</extracomment>
         <translation>Portoghese Brasiliano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
         <source>Quichu00e9, West Central</source>
         <extracomment>Language name qut</extracomment>
         <translation>West Central Quiché</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
         <source>Romanian</source>
         <extracomment>Language name ro</extracomment>
         <translation>Rumeno</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
         <source>Russian</source>
         <extracomment>Language name ru</extracomment>
         <translation>Russo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="431"/>
         <source>Scots</source>
         <extracomment>Language name sco</extracomment>
         <translation>Scozzese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="437"/>
         <source>Slovak</source>
         <extracomment>Language name sk</extracomment>
         <translation>Slovacco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="439"/>
         <source>Slovenian</source>
         <extracomment>Language name sl</extracomment>
         <translation>Sloveno</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="443"/>
         <source>Somali</source>
         <extracomment>Language name so</extracomment>
         <translation>Somalo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
         <source>Albanian</source>
         <extracomment>Language name sq</extracomment>
         <translation>Albanese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="453"/>
         <source>Swedish</source>
         <extracomment>Language name sv</extracomment>
         <translation>Svedese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="455"/>
         <source>Swahili</source>
         <extracomment>Language name sw</extracomment>
         <translation>Swahili</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="457"/>
         <source>Syriac</source>
         <extracomment>Language name syr</extracomment>
         <translation>Siriano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="459"/>
         <source>Tamil</source>
         <extracomment>Language name ta</extracomment>
         <translation>Tamil</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="463"/>
         <source>Thai</source>
         <extracomment>Language name th</extracomment>
         <translation>Thai</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
         <source>Tagalog</source>
         <extracomment>Language name tl</extracomment>
         <translation>Tagalog</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="470"/>
         <source>Tswana</source>
         <extracomment>Language name tn</extracomment>
         <translation>Tswana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="472"/>
         <source>Turkish</source>
         <extracomment>Language name tr</extracomment>
         <translation>Turco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
         <source>Tektiteko</source>
         <extracomment>Language name ttc</extracomment>
         <translation>Tektiteko</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="479"/>
         <source>Tahitian</source>
         <extracomment>Language name ty</extracomment>
         <translation>Tahitiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="481"/>
         <source>Tzotzil, Zinacantu00e1n</source>
         <extracomment>Language name tzz</extracomment>
         <translation>Zinacantán Tzotzil</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
         <source>Ukrainian</source>
         <extracomment>Language name uk</extracomment>
         <translation>Ucraino</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
         <source>Orya</source>
         <extracomment>Language name ury</extracomment>
         <translation>Orya</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
         <source>Uspanteco</source>
         <extracomment>Language name usp</extracomment>
         <translation>Uspanteco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="492"/>
         <source>Vietnamese</source>
         <extracomment>Language name vi</extracomment>
         <translation>Vietnamita</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="496"/>
         <source>Xhosa</source>
         <extracomment>Language name xh</extracomment>
         <translation>Xhosa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="163"/>
         <source>Bavarian</source>
         <extracomment>Language name bar</extracomment>
         <translation>Bavarese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="326"/>
         <source>Lombard</source>
         <extracomment>Language name lmo</extracomment>
         <translation>Lombardo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="403"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
         <source>Uma</source>
         <extracomment>Language name ppk
 ----------
@@ -4096,480 +3865,424 @@ Language name ppk</extracomment>
         <translation>Uma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="448"/>
         <source>Sranan</source>
         <extracomment>Language name srn</extracomment>
         <translation>Sranan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
         <source>Yiddish</source>
         <extracomment>Language name yi</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
         <source>Zapotec, San Juan Guelavu00eda</source>
         <extracomment>Language name zab</extracomment>
         <translation>San Juan Guelavía Zapotec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="507"/>
         <source>Zapotec, Mitla</source>
         <extracomment>Language name zaw</extracomment>
         <translation>Mitla Zapotec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="509"/>
         <source>Chinese</source>
         <extracomment>Language name zh</extracomment>
         <translation>Cinese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="511"/>
         <source>Zapotec, Amatlu00e1n</source>
         <extracomment>Language name zpo</extracomment>
         <translation>Amatlán Zapotec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
         <source>Zapotec, Zoogocho</source>
         <extracomment>Language name zpq</extracomment>
         <translation>Zoogocho Zapotec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="515"/>
         <source>Zapotec, Yalu00e1lag</source>
         <extracomment>Language name zpu</extracomment>
         <translation>Yalálag Zapotec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
         <source>Zapotec, Chichicapan</source>
         <extracomment>Language name zpv</extracomment>
         <translation>Chichicapan Zapotec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
         <source>Zapotec, Southern Rincon</source>
         <extracomment>Language name zsr</extracomment>
         <translation>Southern Rincon Zapotec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
         <source>Zapotec, Quioquitani-Quieru00ed</source>
         <extracomment>Language name ztq</extracomment>
         <translation>Quioquitani-Quierí Zapotec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
         <source>Zapotec, Yatee</source>
         <extracomment>Language name zty</extracomment>
         <translation>Yatee Zapotec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="525"/>
         <source>Zulu</source>
         <extracomment>Language name zu</extracomment>
         <translation>Zulu</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="314"/>
         <source>Footnotes</source>
         <translatorcomment> a piè di pagina</translatorcomment>
         <translation>Note</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="316"/>
         <source>Strong&apos;s numbers</source>
         <translatorcomment>Numeri di Strong</translatorcomment>
         <translation>Numeri di Strong</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="318"/>
         <source>Headings</source>
         <translation>Intestazioni</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="320"/>
         <source>Morphological tags</source>
         <translation>Note morfologiche</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="322"/>
         <source>Lemmas</source>
         <translation>Lemmi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="324"/>
         <source>Hebrew vowel points</source>
         <translation>Punteggiatura vocale ebraica</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="326"/>
         <source>Hebrew cantillation marks</source>
         <translation>Segni di cantillazione ebraica</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="328"/>
         <source>Greek accents</source>
         <translation>Accenti greci</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="330"/>
         <source>Red letter words</source>
         <translation>Parole in rosso</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="332"/>
         <source>Textual variants</source>
         <translation>Varianti testuali</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="334"/>
         <source>Scripture cross-references</source>
         <translation>Riferimenti incrociati scrittura</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="336"/>
         <source>Morph segmentation</source>
         <translatorcomment>Documentazione</translatorcomment>
         <translation>Segmentazione morfologica</translation>
     </message>
     <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation>Esporta</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
         <source>Local</source>
         <translation>Locale</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>Remoto</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Vecchio testamento</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Mosè/Pentateuco/Torah</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>Storia</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Profeti</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>Nuovo testamento</translation>
+        <source>Remote FTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Vangeli</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="32"/>
+        <source>Remote SFTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>Lettere/Epistole</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="33"/>
+        <source>Remote HTTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Lettere di San Paolo </translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="34"/>
+        <source>Remote HTTPS</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
         <source>HTML files</source>
         <translation>file HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="438"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>All files</source>
         <translation>Tutti i file</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>Text files</source>
         <translation>File di testo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="444"/>
         <source>Save file</source>
         <translation>Salva file</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="130"/>
         <source>Save document ...</source>
         <translation>Salva documento...</translation>
     </message>
     <message>
-        <source>Print keys</source>
-        <translation type="obsolete">Stampa chiavi</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
         <source>BibleTime bookmark files</source>
         <translation>file segnalibri BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="127"/>
         <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <source>Change description ...</source>
-        <translation type="obsolete">Cambia la descrizione ...</translation>
-    </message>
-    <message>
-        <source>Enter a new description for the chosen bookmark.</source>
-        <translation type="obsolete">Immetti una nuova descrizione per il segnalibro selezionato.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="60"/>
         <source>New folder</source>
         <translation>Nuova cartella</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
+        <location filename="../../src/util/tool.cpp" line="48"/>
         <source>The file already exists.</source>
         <translation>Il file esiste giá.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
+        <location filename="../../src/util/tool.cpp" line="49"/>
         <source>Do you want to overwrite it?</source>
         <translation>Vuoi sovrascriverlo?</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
+        <location filename="../../src/util/tool.cpp" line="69"/>
+        <location filename="../../src/util/tool.cpp" line="75"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>Il file non puó essere salvato.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
+        <location filename="../../src/util/tool.cpp" line="78"/>
         <source>Please check permissions etc.</source>
         <translation>Per favore controlla i permessi etc.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
+        <location filename="../../src/util/tool.cpp" line="197"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Fai attenzione, questo documento contiene materiale di culto discutibile!</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation type="obsolete">Lingua</translation>
-    </message>
-    <message>
-        <source>Unlock key</source>
-        <translation type="obsolete">Chiave di sblocco</translation>
-    </message>
-    <message>
-        <source>not set</source>
-        <translation type="obsolete">non impostato</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
+        <location filename="../../src/util/tool.cpp" line="218"/>
         <source>Version</source>
         <translation>Versione</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="obsolete">Opzioni</translation>
-    </message>
-    <message>
-        <source>Settings Migration</source>
-        <translation type="obsolete">Impostazioni Migrazione</translation>
-    </message>
-    <message>
-        <source>It appears you have a BibleTime configuration from KDE 3 stored in %1, and you have not migrated it to this version.  Would you like to import it?</source>
-        <translation type="obsolete">Sembra che tu abbia una configurazione di BibleTime per KDE 3 in %1, e non l&apos;hai migrata a questa versione. Vuoi importarla?</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
+        <location filename="../../src/util/tool.cpp" line="207"/>
         <source>Encrypted - needs unlock key</source>
         <translation>Criptato - serve la chiave di sblocco</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
+        <location filename="../../src/util/tool.cpp" line="231"/>
         <source>Double click for more information</source>
         <translation>Doppio click per maggiori informazioni</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
+        <location filename="../../src/util/tool.cpp" line="213"/>
         <source>Updated version available!</source>
         <translation>Versione aggiornata disponibile!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
+        <location filename="../../src/util/tool.cpp" line="71"/>
+        <source>Error while writing to file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="72"/>
+        <source>Please check that enough disk space is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="77"/>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="226"/>
         <source>Installed version</source>
         <translation>Versione installata</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="273"/>
         <source>Haitian Creole</source>
         <extracomment>Language name ht</extracomment>
         <translation>Creolo haitiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
         <source>Kekchu00ed</source>
         <comment>kek</comment>
         <extracomment>Language name kek</extracomment>
         <translation>Kekchí</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="357"/>
         <source>(Multiple languages)</source>
         <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
         <translation>(Multilingua)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="359"/>
         <source>Mam, Central</source>
         <extracomment>Language name mvc</extracomment>
         <translation>Central Mam</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
         <source>Mam, Todos Santos Cuchumatu00e1n</source>
         <extracomment>Language name mvj</extracomment>
         <translation>Todos Santos Cuchumatán Mam</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="363"/>
         <source>Mixe, Juquila</source>
         <extracomment>Language name mxq</extracomment>
         <translation>Juquila Mixe</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="365"/>
         <source>Mixtec, Jamiltepec</source>
         <extracomment>Language name mxt</extracomment>
         <translation>Jamiltepec Mixtec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="367"/>
         <source>Burmese</source>
         <extracomment>Language name my</extracomment>
         <translation>Burmese</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="370"/>
         <source>Norwegian Bokmu00e5l</source>
         <extracomment>Language name nb</extracomment>
         <translation>Norvegese Bokmål</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="372"/>
         <source>Nahuatl, Michoacu00e1n</source>
         <extracomment>Language name ncl</extracomment>
         <translation>Michoacán Nahuatl</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
         <source>Potawatomi</source>
         <extracomment>Language name pot</extracomment>
         <translation>Potawatomi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="468"/>
         <source>Klingon</source>
         <extracomment>Language name tlh</extracomment>
         <translation>Klingon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="498"/>
         <source>Mixtec, Diuxi-Tilantongo</source>
         <extracomment>Language name xtd</extracomment>
         <translation>Diuxi-Tilantongo Mixtec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
         <source>Yoryba</source>
         <extracomment>Language name yo</extracomment>
         <translation>Yoruba</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="407"/>
         <source>Verb tense changed</source>
         <translation>Tempo del verbo cambiato</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>Can&apos;t write file</source>
         <translation>Impossibile scrivere il file</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>The Sword config file can&apos;t be written!</source>
         <translation>La configurazione di Sword non può essere scritta!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="39"/>
         <source>Export Bookmarks</source>
         <translation>Esporta Segnalibri</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="50"/>
         <source>Import bookmarks</source>
         <translation>Importa segnalibri</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
+        <location filename="../../src/util/tool.cpp" line="46"/>
         <source>Overwrite File?</source>
         <translation>Sovrascrivere file?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="276"/>
         <source>Parsing Strong&apos;s Numbers</source>
         <translation>Analisi Numeri Strong</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="154"/>
         <source>This shortcut conflicts with the shortcut for the following actions:</source>
         <translation>Questa scorciatoia è in conflitto con la scorciatoia per le seguenti azioni:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
         <source>Do you want to clear the conflicting shortcuts and continue?</source>
         <translation>Vuoi pulire le scorciatoie in conflitto e continuare?</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="23"/>
         <source>Indexed works</source>
         <translation>Documenti indicizzati</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="24"/>
         <source>Unindexed works</source>
         <translation>Documenti non indicizzati</translation>
     </message>
@@ -4609,30 +4322,22 @@ Language name ppk</extracomment>
         <translation>Vedi --help per dettagli.</translation>
     </message>
     <message>
-        <source>All command-line arguments not recognized by BibleTime or Qt will be silently ignored.</source>
-        <translation type="obsolete">Tutti gli argomenti da linea di comando non riconosciuti da BibleTime o Qt saranno ignorati.</translation>
-    </message>
-    <message>
-        <source>Error: %1 expects an argument. See --help for details.</source>
-        <translation type="obsolete">Errore: %1 aspetta un argomento. Vedi --help per dettagli.</translation>
-    </message>
-    <message>
         <location filename="../../src/main.cpp" line="111"/>
         <source>Error: Invalid command-line argument: %1</source>
         <translation>Errore: Argomento da linea di comando non valido: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="57"/>
         <source>CSS base template not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="74"/>
         <source>Default template &quot;%1&quot; not found!</source>
         <translation>Modello predefinito &quot;%1&quot; non trovato!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="113"/>
         <source>Replace</source>
         <translation>Sostituisci</translation>
     </message>
@@ -4640,91 +4345,91 @@ Language name ppk</extracomment>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="58"/>
         <source>OK</source>
         <comment>Dialog Button</comment>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="59"/>
         <source>Open</source>
         <comment>Dialog Button</comment>
         <translation>Apri</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="60"/>
         <source>Save</source>
         <comment>Dialog Button</comment>
         <translation>Salva</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="61"/>
         <source>Cancel</source>
         <comment>Dialog Button</comment>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="62"/>
         <source>Close</source>
         <comment>Dialog Button</comment>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="63"/>
         <source>Discard</source>
         <comment>Dialog Button</comment>
         <translation>Scarta</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="64"/>
         <source>Apply</source>
         <comment>Dialog Button</comment>
         <translation>Applica</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="65"/>
         <source>Reset</source>
         <comment>Dialog Button</comment>
         <translation>Reset</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="66"/>
         <source>Restore defaults</source>
         <comment>Dialog Button</comment>
         <translation>Ripristina predefiniti</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="67"/>
         <source>Help</source>
         <comment>Dialog Button</comment>
         <translation>Aiuto</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="68"/>
         <source>Save All</source>
         <comment>Dialog Button</comment>
         <translation>Salva tutti</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="69"/>
         <source>Yes</source>
         <comment>Dialog Button</comment>
         <translation>Si</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="70"/>
         <source>Yes to all</source>
         <comment>Dialog Button</comment>
         <translation>Si a tutti</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="71"/>
         <source>No</source>
         <comment>Dialog Button</comment>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="72"/>
         <source>No to all</source>
         <comment>Dialog Button</comment>
         <translation>No a tutti</translation>
@@ -4733,102 +4438,102 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchOptionsArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="97"/>
         <source>Search for:</source>
         <translation>Ricerca per:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="104"/>
         <source>&amp;Search</source>
         <translation>&amp;Cerca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="106"/>
         <source>Start to search the text in the chosen works</source>
         <translation>Inizia a cercare il testo nel documento selezionato</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="109"/>
         <source>Ch&amp;oose...</source>
         <translation>S&amp;cegli...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="111"/>
         <source>Choose works for the search</source>
         <translation>Scegli documenti per la ricerca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="114"/>
         <source>S&amp;etup...</source>
         <translation>S&amp;etup...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="133"/>
         <source>All of the words (AND is added between the words)</source>
         <translation>Tutte le parole (AND è aggiunto tra le parole)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="137"/>
         <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
         <translation> (&lt;a href=&apos;syntax_help&apos;&gt;sintassi completa&lt;/a&gt;)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="148"/>
         <source>Scope:</source>
         <translation>Ambito:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="169"/>
         <source>The text you want to search for</source>
         <translation>Il testo che vuoi cercare</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="173"/>
         <source>Works:</source>
         <translation>Documenti:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="346"/>
         <source>No search scope</source>
         <translation>Non limitare la ricerca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="128"/>
         <source>All words</source>
         <translation>Tutte le parole</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="116"/>
         <source>Configure predefined scopes for search</source>
         <translation>Configurare ambiti predefiniti per la ricerca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="130"/>
         <source>Some words</source>
         <translation>Alcune parole</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
         <source>Free</source>
         <translation>Libero</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
         <source>Some of the words (OR is added between the words)</source>
         <translation>Qualcuna delle parole (OR è aggiunto tra le parole)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
         <source>Full lucene syntax</source>
         <translation>Sintassi lucene completa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
         <source>Click the link to get help for search syntax</source>
         <translation>Clicca il link per avere l&apos;aiuto per la sintassi della ricerca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="159"/>
         <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
         <translation>Scegli l&apos;ambito (libri/capitoli/versetti in cui cercare).&lt;br /&gt;Applicabile a Bibbie e commenti.</translation>
     </message>
@@ -4836,17 +4541,17 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchResultArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="85"/>
         <source>Text of the selected search result item</source>
         <translation>Testo del risultato della ricerca selezionato</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="88"/>
         <source>Select all</source>
         <translation>Seleziona tutto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="92"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
@@ -4854,242 +4559,242 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchSyntaxHelpDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="47"/>
         <source>Search Syntax Help</source>
         <translation>Aiuto Sintassi Ricerca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="94"/>
         <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
         <translation>Questo aiuto è prevalentemente per l&apos;opzione &apos;Sintassi completa&apos;. Le opzioni &apos;Tutte le parole&apos; e &apos;Alcune parole&apos; hanno una sintassi più limitata; &lt;a href=&apos;#wildcards&apos;&gt;caratteri speciali&lt;/a&gt; e &lt;a href=&apos;#fields&apos;&gt;campi di testo&lt;/a&gt; sono supportati. Alcune altre caratteristiche della sintassi possono dare risultati strani o sbagliati con Tutte le parole/Alcune parole.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
         <source>Which words to find</source>
         <translation>Parole da trovare</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="101"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
         <source>Grouping and order</source>
         <translation>Raggeruppamento e ordine</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="103"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
         <source>Wildcards (partial words)</source>
         <translation>Caratteri speciali (parole parziali)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
         <source>Text fields (different parts of text)</source>
         <translation>Campi di testo (varie parti del testo)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="208"/>
         <source>Other syntax features</source>
         <translation>Altre caratteristiche della sintassi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
         <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
         <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
         <translation>I termini di ricerca sono separati da spazi. &lt;strong&gt;AND&lt;/strong&gt; (tutte le parole), &lt;strong&gt;OR&lt;/strong&gt; (alcune parole) e &lt;strong&gt;NOT&lt;/strong&gt; (non la seguente parola) possono essere aggiunte tra le parole. Se nessuna è aggiunta esplicitamente OR è usata automaticamente. &apos;&lt;strong&gt;+&lt;/strong&gt;parola&apos; significa che la parola deve essere nei risultati, &apos;&lt;strong&gt;-&lt;/strong&gt;parola&apos; significa che la parola non deve essere nei risultati.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="119"/>
         <source>jesus AND god</source>
         <comment>Do not translate &quot;AND&quot;.</comment>
         <translation>gesù AND dio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="121"/>
         <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
         <translation>Trova versetti con sia &apos;Gesù&apos; sia &apos;Dio&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="123"/>
         <source>jesus OR god</source>
         <comment>Do not translate &quot;OR&quot;.</comment>
         <translation>gesù OR dio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="125"/>
         <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
         <translation>Trova versetti con &apos;Gesù&apos; o &apos;Dio&apos; o entrambi</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="127"/>
         <source>jesus NOT god</source>
         <comment>Do not translate &quot;NOT&quot;.</comment>
         <translation>gesù NOT dio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="133"/>
         <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
         <translation>Trova versetti con &apos;Gesù&apos; ma non con &apos;Dio&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="131"/>
         <source>+jesus -god</source>
         <translation>+gesù -dio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
         <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
         <translation>Le parole possono essere raggruppate con &lt;strong&gt;parentesi&lt;/strong&gt;. L&apos;ordine preciso delle parole può essere definito con &lt;strong&gt;apici&lt;/strong&gt;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
         <source>(a AND b) OR c</source>
         <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
         <translation>(a AND b) OR c</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
         <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
         <translation>Trova versetti con sia &apos;a&apos; sia &apos;b&apos;, e versetti con &apos;c&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="145"/>
         <source>&quot;says lord&quot;</source>
         <translation>&quot;dice signore&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="149"/>
         <source>&quot;says the lord&quot;</source>
         <translation>&quot;dice il signore&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="151"/>
         <source>Finds all verses with &apos;says the LORD&apos;</source>
         <translation>Trova tutti i versetti con &apos;dice il SIGNORE&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
         <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
         <translation>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; corrisponde a qualunque sequenza di 0 o più caratteri, mentre &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; corrisponde a qualsiasi singolo carattere. Un caratere speciale non può essere usato all&apos;inizio di una parola.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="160"/>
         <source>a*</source>
         <translation>a*</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="162"/>
         <source>All words beginning with &apos;a&apos;</source>
         <translation>Tutte le parole che iniziano per &apos;a&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="164"/>
         <source>a*a</source>
         <translation>a*a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="166"/>
         <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
         <translation>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="168"/>
         <source>a?</source>
         <translation>a?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="170"/>
         <source>&apos;at&apos; and &apos;an&apos;</source>
         <translation>&apos;at&apos; e &apos;an&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="172"/>
         <source>a??a</source>
         <translation>a??a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="174"/>
         <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
         <translation>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
         <source>Available text fields:</source>
         <translation>Campi di testo disponibili:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="181"/>
         <source>Searches headings</source>
         <translation>Cerca intestazioni</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="183"/>
         <source>Searches footnotes</source>
         <translation>Cerca note</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="185"/>
         <source>Searches Strong&apos;s numbers</source>
         <translation>Cerca numeri Strong</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="187"/>
         <source>Searches morphology codes</source>
         <translation>Cerca codici morfologici</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="189"/>
         <source>Examples:</source>
         <translation>Esempi:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="191"/>
         <source>heading:Jesus</source>
         <comment>Do not translate &quot;heading:&quot;.</comment>
         <translation>heading:Gesù</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="193"/>
         <source>Finds headings with &apos;Jesus&apos;</source>
         <translation>Trova intestazioni con &apos;Gesù&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="195"/>
         <source>footnote:Jesus AND footnote:said</source>
         <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
         <translation>footnote:Gesù AND footnote:disse</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
         <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
         <translation>Trova note con &apos;Gesù&apos; e &apos;disse&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
         <source>strong:G846</source>
         <comment>Do not translate &quot;strong:&quot;.</comment>
         <translation>strong:G846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="202"/>
         <source>Finds verses with Strong&apos;s Greek number 846</source>
         <translation>Trova versetti con numero Strong Greco 846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="204"/>
         <source>morph:&quot;N-NSF&quot;</source>
         <comment>Do not translate &quot;morph:&quot;.</comment>
         <translation>morph:&quot;N-NSF&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="206"/>
         <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
         <translation>Trova versetti con codice morfologico &apos;N-NSF&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="210"/>
         <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
         <translation>BibleTime usa il motore di ricerca CLucene, Puoi leggere di più nella &lt;a href=&apos;%1&apos;&gt;pagina web della sintassi lucene&lt;/a&gt; (in un browser esterno).</translation>
     </message>
@@ -5135,31 +4840,19 @@ Language name ppk</extracomment>
         <translation>Stampa...</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Copia il risultato della ricerca...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="231"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="241"/>
         <source>Copying search result</source>
         <translation>Copia del risultato della ricerca in atto</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Salva il risultato della ricerca...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="250"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="259"/>
         <source>Saving search result</source>
         <translation>Salvataggio del risultato di ricerca</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Stampa il risultato della ricerca...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="268"/>
         <source>Printing search result</source>
         <translation>Stampa del risultato della ricerca</translation>
     </message>
@@ -5207,14 +4900,6 @@ Language name ppk</extracomment>
         <translation>Nuovo intervallo</translation>
     </message>
     <message>
-        <source>&lt;invalid name of search range&gt;</source>
-        <translation type="obsolete">&lt;nome dell&apos;intervallo di ricerca non valido&gt;</translation>
-    </message>
-    <message>
-        <source>Select a scope from the list to edit the search ranges</source>
-        <translation type="obsolete">Selezionare un campo dalla lista per modificare gli intervalli di ricerca</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="140"/>
         <source>&amp;Add new scope</source>
         <translation>&amp;Aggiungi nuovo campo</translation>
@@ -5240,10 +4925,6 @@ Language name ppk</extracomment>
         <translation>Rinomina il campo di ricerca selezionato</translation>
     </message>
     <message>
-        <source>Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="obsolete">Cambia gli intervalli di ricerca del campo selezionato. Guarda i campi di ricerca predefiniti per vedere come gli intervalli di ricerca sono costruiti.</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="158"/>
         <source>The search ranges which will be used for the search, parsed to the canonical form</source>
         <translation>Gli intervalli che verranno utilizzati per la ricerca, analizzata la forma canonica</translation>
@@ -5257,48 +4938,42 @@ Language name ppk</extracomment>
 <context>
     <name>Search::CSearchDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="130"/>
         <source>Missing indices</source>
         <translation>Indici mancanti</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="87"/>
         <source>Search</source>
         <translation>Cerca</translation>
     </message>
     <message>
-        <source>One or more works need indexing before they can be searched.
-This could take a long time. Proceed with indexing?</source>
-        <translation type="obsolete">Uno o più documenti devono essere indicizzati prima che vi si possa effetture una ricerca.
-Questo potrebbe richiedere parecchio tempo. Procedere all&apos;indicizzazione?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="131"/>
         <source>The following modules need to be indexed before they can be searched in:</source>
         <translation>I seguenti moduli devono essere indicizzati prima che ci si possa effettuare ricerche:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="132"/>
         <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
         <translation>L&apos;indicizzazione può richiedere molto tempo. Fare clic su &quot;Si&quot; per indicizzare i moduli e avviare la ricerca, o &quot;No&quot; per annullare la ricerca.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="236"/>
         <source>Drag any verse reference onto an open Bible window</source>
         <translation>Trascina ogni versetto di riferimento su una finestra aperta della Bibbia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="241"/>
         <source>&amp;Analyze results...</source>
         <translation>&amp;Analizza risultati...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="242"/>
         <source>Show a graphical analysis of the search result</source>
         <translation>Mostra un&apos;analisi grafica del risultati della ricerca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="248"/>
         <source>&amp;Close</source>
         <translation>&amp;Chiudi</translation>
     </message>
@@ -5339,31 +5014,19 @@ Questo potrebbe richiedere parecchio tempo. Procedere all&apos;indicizzazione?</
         <translation>Stampa...</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Stampa il risultato della ricerca...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="164"/>
         <source>Printing search result</source>
         <translation>Stampa del risultao della ricerca</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Salva il risultato della ricerca...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="192"/>
         <source>Saving search result</source>
         <translation>Salvataggio del risultato di ricerca</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Copia il risultato della ricerca...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="210"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="228"/>
         <source>Copying search result</source>
         <translation>Copia del risultato della ricerca in atto</translation>
     </message>
@@ -5376,99 +5039,6 @@ Questo potrebbe richiedere parecchio tempo. Procedere all&apos;indicizzazione?</
 <context>
     <name>StandardWorksTab</name>
     <message>
-        <source>Standard works are used when no particular work is specified,   for example when a hyperlink into a Bible or lexicon was clicked .</source>
-        <translation type="obsolete">I documenti predefiniti vengono usati in caso non vengano specificati altri documenti, ad esempio quando un collegamento ipertestuale dentro una Bibbia od un lessico viene cliccato.</translation>
-    </message>
-    <message>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked .</source>
-        <translation type="obsolete">I documenti standard sono utilizzati quando nessun documento particolare viene specificato, per esempio quando un collegamento ipertestuale in una Bibbia o lessico viene cliccato.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation>I documenti standard sono utilizzati quando nessun documento particolare viene specificato, per esempio quando un collegamento ipertestuale in una Bibbia o lessico viene cliccato.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>Bibbia:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>La Bibbia standard viene usata quando un ipertesto è cliccato in una Bibbia</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>Commento:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>I commenti standard sono usati quando un ipertesto in un commento viene cliccato</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation>Lessico:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>Il lessico standard viene usato quando un ipertesto è cliccato in un lessico</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>Lettura di devozione giornaliera:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>Le letture di devozione standard saranno usate per visualizzare uno start up devozionale breve</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>Lessico Ebraico Strong:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>Il lessico standard Ebraico è usato quando un ipertesto dentro a lessico Ebraico è cliccato</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>Lessico Greco Strong:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>Il lessico standard Greco è usato quando un ipertesto dentro a lessico Greco è cliccato</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>Lessico Ebraico morfologico:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>Il lessico standard morfologico per testi Ebraici è usato quando un ipertesto di una nota morfologica in un testo Ebraico è cliccato</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation>Lessico Greco morfologico:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>Il lessico standard morfologico per testi Grechi è usato quando un ipertesto di una nota morfologica in un testo Greco è cliccato</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="62"/>
         <source></source>
         <translation></translation>
@@ -5477,112 +5047,97 @@ Questo potrebbe richiedere parecchio tempo. Procedere all&apos;indicizzazione?</
 <context>
     <name>TextFiltersTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation>Inserisci interruzione di riga dopo ciascun versetto</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation>Mostra i numeri dei versetti</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation>Mostra le intestazioni</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation>Mostra i riferimenti incrociati</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation>Mostra gli accenti greci</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation>Mostra la punteggiatura vocale ebrea</translation>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
+        <source></source>
+        <translation></translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallProgress</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation>Mostra i segni di cantillazione ebraica</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="81"/>
+        <source>Failed</source>
+        <translation type="unfinished">Fallito</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation>Mostra la segmentazione morfologica</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="84"/>
+        <source>Completed</source>
+        <translation type="unfinished">Completato</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation>Usa le varianti testuali</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="90"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">Cancellato</translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallSources</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation>I filtri controllano l&apos;aspetto del testo. Qui puoi specificare le impostazioni predefinites per tutti i filtri. Puoi ignorare queste impostazioni in ogni finestra.</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installsources.cpp" line="63"/>
+        <source>Failed to refresh source %1</source>
+        <translation type="unfinished">Impossibile aggiornare fonte %1</translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source></source>
-        <translation></translation>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="59"/>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="62"/>
+        <source>The text you want to search for</source>
+        <translation type="unfinished">Il testo che vuoi cercare</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation>Trova Testo</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="135"/>
+        <source>New Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation>Il testo che vuoi cercare</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="136"/>
+        <source>View Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation>Cerca con distinzione maiuscole/minuscole</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="137"/>
+        <source>Text Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation>Case &amp;sensitive</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="138"/>
+        <source>User Interface Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation>Trova la posizione precedente del testo</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="141"/>
+        <source>Bookshelf Manager</source>
+        <translation type="unfinished">Gestore Libreria</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation>&amp;Precedente</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="187"/>
+        <source>Single</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation>Trova la posizione successiva del testo</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="188"/>
+        <source>Tabbed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation>&amp;Successivo</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="189"/>
+        <source>Auto-tile</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation>Chiude la finestra</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="190"/>
+        <source>Auto-tile horizontally</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Chiudi</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="191"/>
+        <source>Auto-tile vertically</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/messages/bibletime_ui_nl.ts b/i18n/messages/bibletime_ui_nl.ts
deleted file mode 100644
index d9e0831..0000000
--- a/i18n/messages/bibletime_ui_nl.ts
+++ /dev/null
@@ -1,5432 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="nl_NL">
-<context>
-    <name></name>
-    <message>
-        <source></source>
-        <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
-This file is distributed under the same license as the Bibetime package.</translatorcomment>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>BTAboutModuleDialog</name>
-    <message>
-        <location filename="../../src/frontend/btaboutmoduledialog.cpp" line="45"/>
-        <source>Information About %1</source>
-        <translation>Informatie over %1</translation>
-    </message>
-</context>
-<context>
-    <name>BibleTime</name>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
-        <source>&amp;File</source>
-        <translation>&amp;Bestand</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
-        <source>&amp;View</source>
-        <translation>Beel&amp;d</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
-        <source>&amp;Search</source>
-        <translation>&amp;Zoeken</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
-        <source>&amp;Window</source>
-        <translation>&amp;Venster</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
-        <source>Se&amp;ttings</source>
-        <translation>&amp;Instellingen</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
-        <source>&amp;Help</source>
-        <translation>&amp;Help</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
-        <source>&amp;Show toolbar</source>
-        <translation>Toon &amp;werkbalk</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
-        <source>&amp;Fullscreen mode</source>
-        <translation>&amp;Volledig scherm</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Afsluiten</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
-        <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
-        <translation>Open de Bijbelstudie HowTo van BibleTime. &lt;br/&gt;Deze HowTo is een introductie op hoe u de Bijbel doeltreffend kunt bestuderen.</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
-        <source>Information about the BibleTime program</source>
-        <translation>Informatie over het programma BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation type="unfinished">&amp;Sessie opslaan</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>&amp;Laad sessie</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
-        <source>&amp;Delete session</source>
-        <translation>Verwij&amp;der sessie</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
-        <source>&amp;Arrangement mode</source>
-        <translation>R&amp;angschikking van vensters</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
-        <source>&amp;Manual mode</source>
-        <translation>Handmatige &amp;modus</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
-        <source>Auto-tile &amp;vertically</source>
-        <translation>Automatisch &amp;verticaal stapelen</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
-        <source>Auto-tile &amp;horizontally</source>
-        <translation>Automatisch &amp;horizontaal stapelen</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
-        <source>Auto-&amp;cascade</source>
-        <translation>Automatisch trapsgewijs (&amp;cascade)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
-        <source>&amp;Cascade</source>
-        <translation>Trapsgewijs (&amp;cascade)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
-        <source>Tile &amp;vertically</source>
-        <translation>&amp;Verticaal stapelen</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
-        <source>Tile &amp;horizontally</source>
-        <translation>&amp;Horizontaal stapelen</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
-        <source>Cl&amp;ose all windows</source>
-        <translation>Alle vensters &amp;sluiten</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
-        <source>Close all open windows inside BibleTime</source>
-        <translation>Sluit alle open vensters in BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
-        <source>&amp;Handbook</source>
-        <translation>&amp;Handboek</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
-        <source>&amp;Bible Study Howto</source>
-        <translation>&amp;Bijbelstudie HowTo</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
-        <source>Please enter a name for the new session.</source>
-        <translation>Voer een naam voor de nieuwe sessie in.</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
-        <source>Quit BibleTime</source>
-        <translation>BibleTime afsluiten</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
-        <source>Toggle fullscreen mode of the main window</source>
-        <translation>Volledige scherm van hoofdvenster aan/uit</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
-        <source>Search in &amp;open works...</source>
-        <translation>Zoek in ge&amp;opende modules...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
-        <source>Search in standard &amp;Bible...</source>
-        <translation>Zoek in standaard&amp;bijbel...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
-        <source>Save as &amp;new session...</source>
-        <translation>Als &amp;nieuwe sessie opslaan...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
-        <source>Create and save a new session</source>
-        <translation>Een nieuwe sessie aanmaken en opslaan</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
-        <source>Manually arrange the open windows</source>
-        <translation>Handmatig de geopende vensters rangschikken</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
-        <source>Automatically tile the open windows vertically (arrange side by side)</source>
-        <translation>Automatisch de geopende vensters verticaal stapelen (zij-aan-zij rangschikken)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
-        <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
-        <translation>Automatisch de geopende vensters horizontaal stapelen (boven op elkaar rangschikken)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
-        <source>Auto-&amp;tile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
-        <source>Automatically tile the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
-        <source>Ta&amp;bbed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
-        <source>Automatically tab the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
-        <source>Automatically cascade the open windows</source>
-        <translation>Automatisch de geopende vensters trapsgewijs rangschikken (cascade)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
-        <source>Cascade the open windows</source>
-        <translation>De geopende vensters trapsgewijs rangschikken</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
-        <source>&amp;Tile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
-        <source>Tile the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
-        <source>Vertically tile (arrange side by side) the open windows</source>
-        <translation>De geopende vensters verticaal stapelen (zij-aan-zij rangschikken)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
-        <source>Horizontally tile (arrange on top of each other) the open windows</source>
-        <translation>De geopende vensters horizontaal stapelen (boven op elkaar rangschikken)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
-        <source>Close &amp;window</source>
-        <translation>Venster &amp;sluiten</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
-        <source>Close the current open window</source>
-        <translation>Sluit het huidige geopende venster</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
-        <source>&amp;Configure BibleTime...</source>
-        <translation>BibleTime &amp;instellen...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
-        <source>Set BibleTime&apos;s preferences</source>
-        <translation>BibleTime&apos;s instellingen wijzigen</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
-        <source>Bookshelf &amp;Manager...</source>
-        <translation>Boekenplank &amp;Manager...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
-        <source>Configure your bookshelf and install/update/remove/index works</source>
-        <translation>Uw boekenplank instellen en modules installeren/updaten/verwijderen/indexeren</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
-        <source>Open BibleTime&apos;s handbook</source>
-        <translation>Open BibleTime&apos;s handboek</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
-        <source>&amp;Tip of the day...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
-        <source>Show tips about BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
-        <source>Toggle visibility of the bookshelf window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
-        <source>Toggle visibility of the bookmarks window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
-        <source>Toggle visibility of the mag window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
-        <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
-        <source>Navigation toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
-        <source>Works toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
-        <source>Tools toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
-        <source>Format toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
-        <source>Show main toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
-        <source>Show navigation bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
-        <source>Show works toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
-        <source>Show tools toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
-        <source>Show formatting toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
-        <source>Show bookshelf</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
-        <source>Show bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
-        <source>Show mag</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
-        <source>Toolbars</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
-        <source>Show toolbars in text windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
-        <source>Show parallel text headers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
-        <source>O&amp;pen windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
-        <source>Show &quot;Whats this widget&quot; dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
-        <source>Whats this widget?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
-        <source>Search in all works that are currently open</source>
-        <translation>Zoek in alle modules die momenteel geopend zijn</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
-        <source>Search in the standard Bible</source>
-        <translation>Zoek in de standaardbijbel</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
-        <source>New Session</source>
-        <translation>Nieuwe Sessie</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
-        <source>Initializing the SWORD engine...</source>
-        <translation>Bezig met initialiseren van SWORD engine...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
-        <source>Creating BibleTime&apos;s user interface...</source>
-        <translation>Bezig met aanmaken van BibleTime&apos;s gebruikersinterface...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
-        <source>Initializing menu- and toolbars...</source>
-        <translation>Bezig met initialiseren van menu- en werkbalken...</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
-        <source>Unlock Work</source>
-        <translation>Module Ontgrendelen</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
-        <source>Enter the unlock key for %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
-        <source>Warning: Invalid unlock key!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
-        <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
-        <source>&amp;About BibleTime</source>
-        <translation>&amp;Over BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
-        <source>Bookmarks</source>
-        <translation>Bladwijzers</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
-        <source>Mag</source>
-        <translation>Vergrootglas</translation>
-    </message>
-</context>
-<context>
-    <name>BibleTimeApp</name>
-    <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
-        <source>Fatal error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtAboutDialog</name>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
-        <source>BibleTime is an easy to use but powerful Bible study tool.</source>
-        <translation>BibleTime is een makkelijk te gebruiken, maar krachtig hulpmiddel voor bijbelstudie.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="271"/>
-        <source>BibleTime is released under the GPL license. You can download and use the program for personal, private, public or commercial purposes without restrictions, but can give away or distribute the program only if you also distribute the corresponding source code.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="277"/>
-        <source>The complete legally binding license is below.</source>
-        <translation>De volledige, wettelijk bindende licentie staat hieronder.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
-        <source>About BibleTime</source>
-        <translation>Over BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
-        <source>&amp;BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
-        <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
-        <source>&amp;Contributors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
-        <source>The following people contributed to BibleTime:</source>
-        <translation>De volgende personen hebben een bijdrage geleverd aan BibleTime:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
-        <source>documentation and translation manager</source>
-        <translation>documentatie- en vertaalmanager</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
-        <source>project manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
-        <source>tester</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
-        <source>usability expert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="220"/>
-        <source>Some names may be missing, please email %1 if you notice errors or omissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="237"/>
-        <source>BibleTime makes use of the SWORD Project. The SWORD Project is the CrossWire Bible Society&apos;s free Bible software project. Its purpose is to create cross-platform open-source tools &amp;mdash; covered by the GNU General Public License &amp;mdash; that allow programmers and Bible societies to write new Bible software more quickly and easily.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="243"/>
-        <source>The SWORD Project: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="251"/>
-        <source>&amp;Qt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="254"/>
-        <source>Qt toolkit version %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="260"/>
-        <source>More info...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="265"/>
-        <source>&amp;License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
-        <source>designer</source>
-        <translation>ontwerper</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
-        <source>developer</source>
-        <translation>ontwikkelaar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
-        <source>project founder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
-        <source>packager</source>
-        <translation>packager</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
-        <source>creator of The Sword Project</source>
-        <translation>grondlegger van het Sword Project</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
-        <source>domain sponsor</source>
-        <translation>sponsor van het domein</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
-        <source>howto</source>
-        <translation>handleiding</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
-        <source>artist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
-        <source>documentation</source>
-        <translation>documentatie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
-        <source>The following people translated BibleTime into their language:</source>
-        <translation>De volgende personen hebben BibleTime vertaald naar hun taal:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="231"/>
-        <source>&amp;SWORD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="235"/>
-        <source>SWORD library version %1</source>
-        <translation>SWORD bibliotheek versie %1</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="256"/>
-        <source>This program uses Qt version %1.</source>
-        <translation>Dit programma gebruikt Qt versie %1.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="258"/>
-        <source>Qt is a cross-platform application and UI framework, created with C++ language. It has been released under the LGPL license.</source>
-        <translation>Qt is een cross-platform applicatie en raamwerk voor gebruikersinterfaces, gemaakt in de programmeertaal C++. Het is uitgegeven onder de LGPL licentie.</translation>
-    </message>
-</context>
-<context>
-    <name>BtBibleKeyWidget</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="unfinished">Blader door de items in de lijst. Klik op de muisknop en beweeg de muis om voor- of achteruit te bladeren.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
-        <source>Next book</source>
-        <translation type="unfinished">Volgend boek</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
-        <source>Previous book</source>
-        <translation type="unfinished">Vorig boek</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
-        <source>Next chapter</source>
-        <translation type="unfinished">Volgend hoofdstuk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
-        <source>Previous chapter</source>
-        <translation type="unfinished">Vorig hoofdstuk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
-        <source>Next verse</source>
-        <translation type="unfinished">Volgend vers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
-        <source>Previous verse</source>
-        <translation type="unfinished">Vorig vers</translation>
-    </message>
-</context>
-<context>
-    <name>BtBookDropdownChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="64"/>
-        <source>Select book</source>
-        <translation>Selecteer boek</translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfDockWidget</name>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="150"/>
-        <source>Bookshelf</source>
-        <translation>Boekenplank</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="152"/>
-        <source>&amp;Open</source>
-        <translation>&amp;Open</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="153"/>
-        <source>&amp;Edit</source>
-        <translation>&amp;Bewerken</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="154"/>
-        <source>&amp;Plain text</source>
-        <translation>&amp;Platte tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="155"/>
-        <source>&amp;HTML</source>
-        <translation>&amp;HTML</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="156"/>
-        <source>&amp;Unlock...</source>
-        <translation>Ont&amp;grendelen...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="157"/>
-        <source>&amp;About...</source>
-        <translation>O&amp;ver...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="159"/>
-        <source>There are currently no works installed. Please click the button below to install new works.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="161"/>
-        <source>&amp;Install works...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="173"/>
-        <source>Warning: Module locked!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="174"/>
-        <source>You are trying to access an encrypted module. Please provide an unlock key in the following dialog to open the module.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="223"/>
-        <source>&amp;Search in %1...</source>
-        <translation>&amp;Zoeken in %1...</translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfGroupingMenu</name>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
-        <source>Category/Language</source>
-        <translation type="unfinished">Categorie/Taal</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
-        <source>Category</source>
-        <translation type="unfinished">Categorie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
-        <source>Language/Category</source>
-        <translation type="unfinished">Taal/Categorie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
-        <source>Language</source>
-        <translation type="unfinished">Taal</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
-        <source>No grouping</source>
-        <translation type="unfinished">Geen groepering</translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfModel</name>
-    <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
-        <source>Module</source>
-        <translation>Module</translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfWidget</name>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
-        <source>Fi&amp;lter:</source>
-        <translation type="unfinished">Fi&amp;lter:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
-        <source>Grouping</source>
-        <translation type="unfinished">Groepering</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
-        <source>Change the grouping of items in the bookshelf.</source>
-        <translation type="unfinished">Wijzig de groepering van items in de boekenplank.</translation>
-    </message>
-    <message>
-        <source>Category/Language</source>
-        <translation type="obsolete">Categorie/Taal</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Categorie</translation>
-    </message>
-    <message>
-        <source>Language/Category</source>
-        <translation type="obsolete">Taal/Categorie</translation>
-    </message>
-    <message>
-        <source>Language</source>
-        <translation type="obsolete">Taal</translation>
-    </message>
-    <message>
-        <source>No grouping</source>
-        <translation type="obsolete">Geen groepering</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
-        <source>Show/hide works</source>
-        <translation type="unfinished">Toon/verberg modules</translation>
-    </message>
-</context>
-<context>
-    <name>BtChapterDropdownChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
-        <source>Select chapter</source>
-        <translation>Selecteer hoofdstuk</translation>
-    </message>
-</context>
-<context>
-    <name>BtDisplaySettingsButton</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
-        <source>Use linebreaks after each verse</source>
-        <translation type="unfinished">Ieder vers op nieuwe regel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">Toon versnummers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
-        <source>Show headings</source>
-        <translation type="unfinished">Toon kopteksten</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
-        <source>Highlight words of Jesus</source>
-        <translation type="unfinished">Woorden van Jezus benadrukken</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Toon Hebreeuwse klinkerpunten</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Toon Hebreeuwse intonatietekens</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">Toon Griekse accenten</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
-        <source>Use alternative textual variant</source>
-        <translation type="unfinished">Alternatieve tekstuele variant gebruiken</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">Toon bijbelse kruisverwijzingen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
-        <source>Show footnotes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">Toon morfologische segmentatie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
-        <source>Display settings</source>
-        <translation type="unfinished">Beeldinstellingen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
-        <source>Display settings: No options available</source>
-        <translation type="unfinished">Beeldinstellingen: Geen opties beschikbaar</translation>
-    </message>
-</context>
-<context>
-    <name>BtEditBookmarkDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
-        <source>Edit Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtFontChooserWidget</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
-        <source>Font name:</source>
-        <translation type="unfinished">Lettertype:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="98"/>
-        <source>Font style:</source>
-        <translation type="unfinished">Stijl:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="99"/>
-        <source>Size:</source>
-        <translation type="unfinished">Grootte:</translation>
-    </message>
-</context>
-<context>
-    <name>BtFontSettingsPage</name>
-    <message>
-        <source>You can specify a custom font for each language.</source>
-        <translation type="obsolete">U kunt een aangepast lettertype opgeven voor iedere taal.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
-        <source>&amp;Language:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
-        <source>The font selection below will apply to all texts in this language</source>
-        <translation type="unfinished">De instellingen voor het lettertype zijn van toepassing op alle teksten in deze taal</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
-        <source>Use custom font</source>
-        <translation type="unfinished">Lettertype aanpassen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
-        <source>Optionally specify a custom font for each language:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
-        <source>Fonts</source>
-        <translation type="unfinished">Lettertypen</translation>
-    </message>
-</context>
-<context>
-    <name>BtIndexPage</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
-        <source>%1 KiB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
-        <source>0 KiB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
-        <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
-        <translation>Indien geselecteerd, worden indices zonder een corresponderende module verwijderd zodra BibleTime start</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
-        <source>Automatically delete orphaned indexes when BibleTime starts</source>
-        <translation>Automatisch verweesde indices verwijderen wanneer BibleTime start</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
-        <source>Delete the selected indexes</source>
-        <translation>Verwijder de geselecteerde indices</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
-        <source>Delete</source>
-        <translation>Verwijderen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
-        <source>Create new indexes for the selected works</source>
-        <translation>Nieuwe indices aanmaken voor de geselecteerde modules</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
-        <source>Work</source>
-        <translation>Module</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
-        <source>Index size</source>
-        <translation>Indexomvang</translation>
-    </message>
-    <message>
-        <source>Create new search indexes and delete created indexes for the installed works.</source>
-        <translation type="obsolete">Maak nieuwe zoekindices en verwijderen indices voor geïnstalleerde modules.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
-        <source>Search Indexes</source>
-        <translation>Zoekindices</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
-        <source>Indexed Works</source>
-        <translation>Geïndexeerde Modules</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
-        <source>Unindexed Works</source>
-        <translation>Ongeïndexeerde Modules</translation>
-    </message>
-    <message>
-        <source>KiB</source>
-        <translation type="obsolete">KiB</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
-        <source>Create...</source>
-        <translation>Aanmaken...</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallModuleChooserDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="64"/>
-        <source>Install/Update works?</source>
-        <translation type="unfinished">Modules installeren/updaten?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="67"/>
-        <source>Do you really want to install these works?</source>
-        <translation type="unfinished">Wilt u deze modules werkelijk installeren?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="68"/>
-        <source>Only one version of a work can be installed at the same time. Select only one if there are items marked with red.</source>
-        <translation type="unfinished">Er kan slechts één versie van een module tegelijk geïnstalleerd zijn. Selecteer één module indien er items in rood zijn aangegeven.</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallModuleChooserDialogModel</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
-        <source>Work</source>
-        <translation type="unfinished">Module</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
-        <source>Installation source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
-        <source>Version</source>
-        <translation type="unfinished">Versie</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPage</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="263"/>
-        <source>Install/Update</source>
-        <translation>Installeren/Updaten</translation>
-    </message>
-    <message>
-        <source>Install and update works. Add remote or local sources, refresh them, select the works to be installed/updated and click Install.&lt;br/&gt;&lt;b&gt;WARNING:&lt;/b&gt; If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="obsolete">Installeer en update modules. Voeg lokale bronnen of externe bronnen toe, selecteer modules om te installeren/updaten en klik op Installeren.&lt;br/&gt;&lt;b&gt;WAARSCHUWING:&lt;/b&gt; Als u leeft in een land waar vervolging plaatsvindt en u wilt geen risico lopen op ontdekking, gebruik dan geen externe bronnen.</translation>
-    </message>
-    <message>
-        <source>Install folder:</source>
-        <translation type="obsolete">Installatiemap:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="265"/>
-        <source>WARNING!!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="266"/>
-        <source>If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="269"/>
-        <source>Select installation &amp;source:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="270"/>
-        <source>&amp;Add...</source>
-        <translation type="unfinished">Toevoegen...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="271"/>
-        <source>Add new source</source>
-        <translation type="unfinished">Nieuwe bron toevoegen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="272"/>
-        <source>&amp;Delete...</source>
-        <translation type="unfinished">Verwijderen...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="273"/>
-        <source>Delete this source</source>
-        <translation type="unfinished">Verwijder deze bron</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="275"/>
-        <source>Select &amp;works to install:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="277"/>
-        <source>Install &amp;folder:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="278"/>
-        <source>The folder where the new works will be installed</source>
-        <translation>De map waar nieuwe modules worden geïnstalleerd</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="279"/>
-        <source>Configure folders where works are installed and found</source>
-        <translation>Configureer mappen waar modules zijn geïnstalleerd en gevonden</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="280"/>
-        <source>&amp;Install...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="254"/>
-        <source>Start installation of %1 works from %2 sources:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="258"/>
-        <source>Start installation:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="313"/>
-        <source>Warning</source>
-        <translation type="unfinished">Waarschuwing</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="313"/>
-        <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="unfinished">De bestemmingsmap is niet schrijfbaar of bestaat niet. Installatie zal mislukken, tenzij dit eerst verholpen is.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
-        <source>Delete Source?</source>
-        <translation type="unfinished">Bron verwijderen?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
-        <source>Do you really want to delete this source?</source>
-        <translation type="unfinished">Wilt u deze bron werkelijk verwijderen?</translation>
-    </message>
-    <message>
-        <source>Install...</source>
-        <translation type="obsolete">Installeren...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="281"/>
-        <source>Install or update selected works</source>
-        <translation>Installeer of update geselecteerde modules</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPageModel</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
-        <source>Work</source>
-        <translation type="unfinished">Module</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
-        <source>Version</source>
-        <translation type="unfinished">Versie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
-        <source>Description</source>
-        <translation type="unfinished">Omschrijving</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPageWorksWidget</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp" line="68"/>
-        <source>Refresh the list of works from this source</source>
-        <translation type="unfinished">Ververs de lijst met modules van deze bron</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPathDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
-        <source>Bookshelf Folders</source>
-        <translation>Boekenplank Mappen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
-        <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
-        <translation>Modules kunnen in één map of verdeeld over meerdere mappen geïnstalleerd worden. Nadat u hier installatiemappen hebt gedefinieerd, kunt u één van deze mappen selecteren in het scherm Installeren/Updaten.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
-        <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
-        <translation>BibleTime en de SWORD bibliotheek vinden de modules in al deze mappen. Als een map hier verwijderd wordt, staat deze nog steeds op de computer met alle modules erin.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
-        <source>Configure bookshelf folders</source>
-        <translation>Configureer boekenplank mappen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
-        <source>Configuration file for the folders is: </source>
-        <translation>Configuratiebestand voor de mappen is: </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
-        <source>Folders where new works can be installed</source>
-        <translation>Mappen waar nieuwe werken kunnen worden geïnstalleerd</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
-        <source>Read-only folders</source>
-        <translation>Alleen-lezen mappen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
-        <source>Nonexistent folders</source>
-        <translation>Niet-bestaande mappen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
-        <source>&amp;Add...</source>
-        <translation>Toevoegen...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
-        <source>Add new folder</source>
-        <translation>Voeg een nieuwe map toe</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
-        <source>&amp;Edit...</source>
-        <translation>Bewerken...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
-        <source>Edit the selected folder</source>
-        <translation>Bewerk de geselecteerde map</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
-        <source>&amp;Remove</source>
-        <translation>Verwijderen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
-        <source>Remove the selected folder</source>
-        <translation>Verwijder de geselecteerde map</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
-        <source>This default folder in your home directory can&apos;t be removed</source>
-        <translation>Deze standaardmap in uw home directory kan niet verwijderd worden</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
-        <source>Choose Folder</source>
-        <translation>Kies map</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
-        <source>Use Folder?</source>
-        <translation>Map gebruiken?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
-        <translation>Deze map is niet beschrijfbaar, dus modules kunnen hier niet geïnstalleerd worden met BibleTime. Wilt u deze map gebruiken in plaats van de vorige waarde?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
-        <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
-        <translation>Deze map is niet beschrijfbaar, dus modules kunnen hier niet geïnstalleerd worden met BibleTime. Wilt u deze map desondanks toevoegen aan de lijst met mappen voor de boekenplank?</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallProgressDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
-        <source>Work</source>
-        <translation>Module</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
-        <source>Progress</source>
-        <translation>Voortgang</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>Stoppen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
-        <source>Stop All</source>
-        <translation>Alles stoppen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
-        <source>Completed</source>
-        <translation>Voltooid</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>Geannuleerd</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
-        <source>Waiting for turn...</source>
-        <translatorcomment>waiting for what??</translatorcomment>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
-        <source>Preparing install...</source>
-        <translation>Bezig met voorbereiden van installatie...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
-        <source>Install Progress</source>
-        <translation>Voortgang van de installatie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
-        <source>Failed</source>
-        <translation>Mislukt</translation>
-    </message>
-</context>
-<context>
-    <name>BtLanguageSettingsPage</name>
-    <message>
-        <source>Select the language in which the Biblical book names are displayed.</source>
-        <translation type="obsolete">Selecteer de taal waarin de bijbelboeknamen moeten worden weergegeven.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
-        <source>Language for names of Bible books:</source>
-        <translation type="unfinished">Taal voor bijbelboeknamen:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation type="unfinished">De talen die gebruikt kunnen worden voor de bijbelboeknamen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
-        <source>Languages</source>
-        <translation type="unfinished">Talen</translation>
-    </message>
-</context>
-<context>
-    <name>BtModuleChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="76"/>
-        <source>Select a work [%1]</source>
-        <translation>Selecteer een module [%1]</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="79"/>
-        <source>Select an additional work</source>
-        <translation>Selecteer een additionele module</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="102"/>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="130"/>
-        <source>NONE</source>
-        <translation>GEEN</translation>
-    </message>
-</context>
-<context>
-    <name>BtModuleIndexDialog</name>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="33"/>
-        <source>Preparing to index modules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="33"/>
-        <source>Cancel</source>
-        <translation type="unfinished">Annuleren</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="37"/>
-        <source>Creating indices</source>
-        <translation type="unfinished">Bezig met aanmaken van indices</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="67"/>
-        <source>Creating index for work: %1</source>
-        <translation type="unfinished">Bezig met aanmaken van index voor module: %1</translation>
-    </message>
-</context>
-<context>
-    <name>BtModuleManagerDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
-        <source>Bookshelf Manager</source>
-        <translation>Boekenplank Manager</translation>
-    </message>
-</context>
-<context>
-    <name>BtOpenWorkAction</name>
-    <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
-        <source>&amp;Open work</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtOpenWorkActionMenu</name>
-    <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
-        <source>&amp;Grouping order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
-        <source>Sets the grouping order for the items in this menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtRefreshProgressDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="15"/>
-        <source>Refreshing source %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="16"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="17"/>
-        <source>Connecting...</source>
-        <translation type="unfinished">Bezig met verbinden...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="47"/>
-        <source>Warning</source>
-        <translation type="unfinished">Waarschuwing</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="48"/>
-        <source>Failed to refresh source %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtRemovePage</name>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">Verwijderen</translation>
-    </message>
-    <message>
-        <source>Remove installed works. Select the works and click Remove button.</source>
-        <translation type="obsolete">Verwijder geïnstalleerde modules. Selecteer de modules en klik op de knop Verwijderen.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
-        <source>Select &amp;works to uninstall:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
-        <source>&amp;Remove...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
-        <source>Start removal of %1 works:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
-        <source>Start removal:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
-        <source>You selected the following work(s): </source>
-        <translation>U heeft de volgende module(s) geselecteerd: </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
-        <source>Do you really want to remove them from your system?</source>
-        <translation>Wilt u deze werkelijk verwijderen van uw systeem?</translation>
-    </message>
-    <message>
-        <source>Remove...</source>
-        <translation type="obsolete">Verwijderen...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
-        <source>Remove the selected works</source>
-        <translation>Verwijder de geselecteerde modules</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
-        <source>Remove Works?</source>
-        <translation>Modules verwijderen?</translation>
-    </message>
-</context>
-<context>
-    <name>BtRemovePageTreeModel</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp" line="52"/>
-        <source>Work</source>
-        <translation>Module</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp" line="55"/>
-        <source>Install path</source>
-        <translation>Installatiepad</translation>
-    </message>
-</context>
-<context>
-    <name>BtSearchModuleChooserDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
-        <source>Works to Search in</source>
-        <translation type="unfinished">Modules om te doorzoeken</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
-        <source>Select the works which should be searched.</source>
-        <translation type="unfinished">Selecteer de modules die doorzocht moeten worden.</translation>
-    </message>
-</context>
-<context>
-    <name>BtShortcutsDialog</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="26"/>
-        <source>Configure shortcuts</source>
-        <translatorcomment>Do you mean &apos;hotkeys&apos; instead of &apos;shortcuts&apos;?</translatorcomment>
-        <translation>Configureer sneltoetsen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="35"/>
-        <source>Select first or second shortcut and type the shortcut with keyboard</source>
-        <translation>Selecteer eerste of tweede sneltoets en type de sneltoets op het toetsenbord</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="37"/>
-        <source>First shortcut</source>
-        <translation>Eerste sneltoets</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="42"/>
-        <source>Second shortcut</source>
-        <translation>Tweede sneltoets</translation>
-    </message>
-</context>
-<context>
-    <name>BtShortcutsEditor</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="180"/>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="187"/>
-        <source>Select to change key</source>
-        <translation>Selecteer om toets te wijzigen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
-        <source>Action
-name</source>
-        <translation>Actie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
-        <source>First
-shortcut</source>
-        <translation>Eerste
-sneltoets</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
-        <source>Second
-shortcut</source>
-        <translation>Tweede
-sneltoets</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="253"/>
-        <source>Shortcut for selected action name</source>
-        <translation>Sneltoets voor geselecteerde actie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="259"/>
-        <source>None</source>
-        <translation>Geen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="264"/>
-        <source>Default</source>
-        <translation>Standaard</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="269"/>
-        <source>Custom</source>
-        <translation>Aangepast</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="284"/>
-        <source>Default key:</source>
-        <translation>Standaardtoets:
-</translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceArea</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">Module</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="obsolete">Omschrijving</translation>
-    </message>
-    <message>
-        <source>&amp;Add...</source>
-        <translation type="obsolete">Toevoegen...</translation>
-    </message>
-    <message>
-        <source>Refresh...</source>
-        <translation type="obsolete">Verversen...</translation>
-    </message>
-    <message>
-        <source>Refresh the list of works from this source</source>
-        <translation type="obsolete">Ververs de lijst met modules van deze bron</translation>
-    </message>
-    <message>
-        <source>&amp;Delete...</source>
-        <translation type="obsolete">Verwijderen...</translation>
-    </message>
-    <message>
-        <source>Delete this source</source>
-        <translation type="obsolete">Verwijder deze bron</translation>
-    </message>
-    <message>
-        <source>Add new source</source>
-        <translation type="obsolete">Nieuwe bron toevoegen</translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceAreaModel</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">Module</translation>
-    </message>
-    <message>
-        <source>Version</source>
-        <translation type="obsolete">Versie</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="obsolete">Omschrijving</translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceWidget</name>
-    <message>
-        <source>Delete Source?</source>
-        <translation type="obsolete">Bron verwijderen?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete this source?</source>
-        <translation type="obsolete">Wilt u deze bron werkelijk verwijderen?</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Annuleren</translation>
-    </message>
-    <message>
-        <source>Refreshing source</source>
-        <translation type="obsolete">Bezig met verversen van bron</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Bezig met verbinden...</translation>
-    </message>
-    <message>
-        <source>Refreshing...</source>
-        <translation type="obsolete">Bezig met verversen...</translation>
-    </message>
-    <message>
-        <source>No sources were found in the SWORD configuration and BibleTime couldn&apos;t create a default source. Check your SWORD configuration and that the configuration path is writable. Then restart the Bookshelf Manager.</source>
-        <translation type="obsolete">Er zijn geen bronnen gevonden in de instellingen van SWORD en BibleTime kon geen standaardbron aanmaken. Controleer de instellingen van SWORD en de beschrijfbaarheid van het configuratiepad. Herstart dan de Boekenplank Manager.</translation>
-    </message>
-    <message>
-        <source>Remote:</source>
-        <translation type="obsolete">Extern:</translation>
-    </message>
-    <message>
-        <source>Local:</source>
-        <translation type="obsolete">Lokaal:</translation>
-    </message>
-    <message>
-        <source>Not a directory!</source>
-        <translation type="obsolete">Geen directory!</translation>
-    </message>
-    <message>
-        <source>Not readable!</source>
-        <translation type="obsolete">Niet leesbaar!</translation>
-    </message>
-    <message>
-        <source>Warning</source>
-        <translation type="obsolete">Waarschuwing</translation>
-    </message>
-    <message>
-        <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="obsolete">De bestemmingsmap is niet schrijfbaar of bestaat niet. Installatie zal mislukken, tenzij dit eerst verholpen is.</translation>
-    </message>
-</context>
-<context>
-    <name>BtTextFiltersTab</name>
-    <message>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="obsolete">Filters bepalen het uiterlijk van tekst. Hier kunt u standaardinstellingen specificeren voor alle filters. U kunt deze instellingen in ieder weergavevenster overstemmen.</translation>
-    </message>
-    <message>
-        <source>Insert line break after each verse</source>
-        <translation type="obsolete">Nieuwe regel na elk vers</translation>
-    </message>
-    <message>
-        <source>Show verse numbers</source>
-        <translation type="obsolete">Toon versnummers</translation>
-    </message>
-    <message>
-        <source>Show section headings</source>
-        <translation type="obsolete">Toon tussenkopjes</translation>
-    </message>
-    <message>
-        <source>Show scripture cross-references</source>
-        <translation type="obsolete">Toon bijbelse kruisverwijzingen</translation>
-    </message>
-    <message>
-        <source>Show Greek accents</source>
-        <translation type="obsolete">Toon Griekse accenten</translation>
-    </message>
-    <message>
-        <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">Toon Hebreeuwse klinkerpunten</translation>
-    </message>
-    <message>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">Toon Hebreeuwse intonatietekens</translation>
-    </message>
-    <message>
-        <source>Show morph segmentation</source>
-        <translation type="obsolete">Toon morfologische segmentatie</translation>
-    </message>
-    <message>
-        <source>Use textual variants</source>
-        <translation type="obsolete">Tekstuele variaties gebruiken</translation>
-    </message>
-</context>
-<context>
-    <name>BtTextWindowHeaderWidget</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
-        <source>Add/remove/replace</source>
-        <translation>Toevoegen/verwijderen/vervangen</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">Verwijderen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
-        <source>Replace</source>
-        <translation>Vervangen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
-        <source>Add</source>
-        <translation>Toevoegen</translation>
-    </message>
-</context>
-<context>
-    <name>BtTipDialog</name>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
-        <source>Tip Of The Day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
-        <source>Show tips at startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
-        <source>Next Tip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
-        <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
-        <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
-        <source>To learn more about the BibleTime project please go to our web site.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
-        <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
-        <source>Select the icon again to stop the synchronization.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
-        <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
-        <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
-        <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
-        <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
-        <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
-        <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
-        <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
-        <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
-        <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtVerseDropdownChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="106"/>
-        <source>Select verse</source>
-        <translation>Selecteer vers</translation>
-    </message>
-</context>
-<context>
-    <name>CAcceleratorSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
-        <source>Choose action group:</source>
-        <translation>Kies actiegroep:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
-        <source>Main Window</source>
-        <translation>Hoofdvenster</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
-        <source>All text windows</source>
-        <translation>Alle tekstvensters</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
-        <source>Bible windows</source>
-        <translation>Bijbelvensters</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
-        <source>Commentary windows</source>
-        <translation>Kanttekeningenvensters</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
-        <source>Lexicon windows</source>
-        <translation>Lexiconvensters</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
-        <source>Book windows</source>
-        <translation>Boekenvensters</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
-        <source>
-   &quot;%1&quot; in the &quot;%2&quot; group</source>
-        <translatorcomment>Translation depends on de exact output of %1 and %2.</translatorcomment>
-        <translation>Brontekst
-
-   &quot;%1&quot; in groep &quot;%2&quot;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
-        <source>Shortcuts</source>
-        <translation>Sneltoetsen</translation>
-    </message>
-</context>
-<context>
-    <name>CBibleReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
-        <source>Next book</source>
-        <translation>Volgend boek</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
-        <source>Previous book</source>
-        <translation>Vorig boek</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
-        <source>Next chapter</source>
-        <translation>Volgend hoofdstuk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
-        <source>Previous chapter</source>
-        <translation>Vorig hoofdstuk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
-        <source>Next verse</source>
-        <translation>Volgend vers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
-        <source>Previous verse</source>
-        <translation>Vorig vers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
-        <source>Copy chapter</source>
-        <translation>Kopieer hoofdstuk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
-        <source>Save chapter as plain text</source>
-        <translation>Sla hoofdstuk op als platte tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
-        <source>Save chapter as HTML</source>
-        <translation>Sla hoofdstuk op als HTML</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
-        <source>Print chapter</source>
-        <translation>Print hoofdstuk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
-        <source>Text of reference</source>
-        <translation>Referentietekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
-        <source>Reference with text</source>
-        <translation>Referentie met tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
-        <source>Bible window</source>
-        <translation>Bijbelvenster</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
-        <source>Copy...</source>
-        <translation>Kopiëren...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
-        <source>Save...</source>
-        <translation>Opslaan...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
-        <source>Print...</source>
-        <translation>Afdrukken...</translation>
-    </message>
-    <message>
-        <source>Copy chapter to clipboard ...</source>
-        <translation type="obsolete">Hoofdstuk kopiëren naar klembord...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
-        <source>Copying</source>
-        <translation>Bezig met kopiëren</translation>
-    </message>
-    <message>
-        <source>Saving chapter ...</source>
-        <translation type="obsolete">Bezig met opslaan van het hoofdstuk ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
-        <source>Saving</source>
-        <translation>Bezig met opslaan</translation>
-    </message>
-</context>
-<context>
-    <name>CBookReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
-        <source>Toggle tree view</source>
-        <translation>Boomstructuur aan/uit</translation>
-    </message>
-</context>
-<context>
-    <name>CBookmarkIndex</name>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
-        <source>Bookmarks</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
-        <source>New folder</source>
-        <translation>Nieuwe map</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
-        <source>Rename folder</source>
-        <translation>Hernoem map</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
-        <source>Delete Items</source>
-        <translation>Verwijder Items</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
-        <source>Do you really want to delete the selected items and child-items?</source>
-        <translation>Wilt u werkelijk de geselecteerde items en bijhorende subitems verwijderen?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
-        <source>The work to which the bookmark points to is not installed.</source>
-        <translation>De module waarnaar de bladwijzer verwijst is niet geïnstalleerd.</translation>
-    </message>
-    <message>
-        <source>Change bookmark description...</source>
-        <translation type="obsolete">Wijzig omschrijving van de bladwijzer...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
-        <source>Print bookmarks...</source>
-        <translation>Print bladwijzers...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
-        <source>Remove selected items...</source>
-        <translation>Verwijder geselecteerde items...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
-        <source>Import to folder...</source>
-        <translation>Importeer naar map...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
-        <source>Edit bookmark...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
-        <source>Sort folder bookmarks...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
-        <source>Sort all bookmarks...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
-        <source>Export from folder...</source>
-        <translation>Exporteer vanuit map...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
-        <source>Can drop only bookmarks or one folder</source>
-        <translation>Kan alleen bladwijzers of een map plaatsen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
-        <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
-        <translation>Kan geen map plaatsen in zichzelf of in één van zijn submappen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
-        <source>Copy</source>
-        <translation>Kopiëren</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
-        <source>Move</source>
-        <translation>Verplaatsen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
-        <source>Drag references from text views to this view</source>
-        <translation>Sleep referenties van tekstweergave naar deze weergave</translation>
-    </message>
-</context>
-<context>
-    <name>CCommentaryReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
-        <source>Next book</source>
-        <translation>Volgend boek</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
-        <source>Previous book</source>
-        <translation>Vorig boek</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
-        <source>Next chapter</source>
-        <translation>Volgend hoofdstuk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
-        <source>Previous chapter</source>
-        <translation>Vorig hoofdstuk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
-        <source>Next verse</source>
-        <translation>Volgend vers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
-        <source>Previous verse</source>
-        <translation>Vorig vers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
-        <source>Synchronize</source>
-        <translation>Synchroniseren</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
-        <source>Synchronize the displayed entry of this work with the active Bible window</source>
-        <translation>Synchroniseer de weergegeven inhoud van deze module met het actieve bijbelvenster</translation>
-    </message>
-</context>
-<context>
-    <name>CConfigurationDialog</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
-        <source>Configure BibleTime</source>
-        <translation>Configureer BibleTime</translation>
-    </message>
-</context>
-<context>
-    <name>CDisplaySettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
-        <source>Display templates</source>
-        <translation>Weergavesjablonen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
-        <source>Available display styles:</source>
-        <translation>Beschikbare weergavestijlen:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
-        <source>Style preview</source>
-        <translation>Stijlvoorbeeld</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
-        <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
-        <translation>Want alzo lief heeft God de wereld gehad, dat Hij zijn eniggeboren Zoon gegeven heeft, opdat een ieder, die in Hem gelooft, niet verloren ga, maar eeuwig leven hebbe.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
-        <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
-        <translation>Want God heeft zijn Zoon niet in de wereld gezonden, opdat Hij de wereld veroordele, maar opdat de wereld door Hem behouden worde.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
-        <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
-        <translation>Wie in Hem gelooft, wordt niet veroordeeld; wie niet gelooft, is reeds veroordeeld, omdat hij niet heeft geloofd in de naam van de eniggeboren Zoon van God.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
-        <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
-        <translation>Want een ieder, die kwaad bedrijft, haat het licht, en gaat niet tot het licht, opdat zijn werken niet aan de dag komen.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
-        <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
-        <translation>maar wie de waarheid doet, gaat tot het licht, opdat van zijn werken blijke, dat zij in God verricht zijn.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
-        <source>Display templates define how text is displayed.</source>
-        <translation>Weergavesjablonen bepalen hoe tekst wordt weergegeven.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
-        <source>Show the BibleTime logo on startup</source>
-        <translation>Toon het BibleTime logo bij het opstarten</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
-        <source>Show startup logo</source>
-        <translation>Toon logo bij opstarten</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
-        <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
-        <source>Display</source>
-        <translation>Beeld</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="193"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>CDisplayWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
-        <source>Back in history</source>
-        <translation>Terug in de historie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
-        <source>Forward in history</source>
-        <translation>Vooruit in de historie</translation>
-    </message>
-    <message>
-        <source>Zoom in</source>
-        <translation type="obsolete">Zoom in</translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation type="obsolete">Zoom uit</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
-        <source>Select all</source>
-        <translation>Selecteer alles</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
-        <source>Copy</source>
-        <translation>Kopiëren</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
-        <source>Find...</source>
-        <translation>Zoeken...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
-        <source>Change location</source>
-        <translation>Wijzig locatie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
-        <source>Search with works of this window</source>
-        <translation>Zoeken in modules van dit venster</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
-        <source>Work chooser buttons</source>
-        <translation>Module selectieknoppen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
-        <source>Text area header</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
-        <source>Navigation</source>
-        <translation>Navigatie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
-        <source>Tool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CFontChooser</name>
-    <message>
-        <source>Size:</source>
-        <translation type="obsolete">Grootte:</translation>
-    </message>
-    <message>
-        <source>Font name:</source>
-        <translation type="obsolete">Lettertype:</translation>
-    </message>
-    <message>
-        <source>Font style:</source>
-        <translation type="obsolete">Stijl:</translation>
-    </message>
-</context>
-<context>
-    <name>CHTMLWriteDisplay</name>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
-        <source>Bold</source>
-        <translation>Vet</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
-        <source>Italic</source>
-        <translation>Italic</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
-        <source>Underline</source>
-        <translation>Onderstrepen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
-        <source>Left</source>
-        <translation>Links</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
-        <source>Center</source>
-        <translation>Centreren</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
-        <source>Right</source>
-        <translation>Rechts</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
-        <source>Font</source>
-        <translation>Lettertype</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
-        <source>Font size</source>
-        <translation>Lettergrootte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
-        <source>Font color</source>
-        <translation>Tekstkleur</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
-        <source>Align left</source>
-        <translation>Links uitlijnen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
-        <source>Align right</source>
-        <translation>Rechts uitlijnen</translation>
-    </message>
-</context>
-<context>
-    <name>CHTMLWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
-        <source>Module not writable</source>
-        <translation>Module niet beschrijfbaar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
-        <source>Module is not writable.</source>
-        <translation>Module is niet beschrijfbaar.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
-        <source>Either the module may not be edited, or you do not have write permission.</source>
-        <translation>De module mag niet gewijzigd worden of u heb geen schrijfrechten.</translation>
-    </message>
-</context>
-<context>
-    <name>CInputDialog</name>
-    <message>
-        <source>Clear</source>
-        <translatorcomment>onzeker waar deze vertaling zich voordoet in de applicatie?</translatorcomment>
-        <translation type="obsolete">Wissen</translation>
-    </message>
-</context>
-<context>
-    <name>CKeyReferenceWidget</name>
-    <message>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="obsolete">Blader door de items in de lijst. Klik op de muisknop en beweeg de muis om voor- of achteruit te bladeren.</translation>
-    </message>
-    <message>
-        <source>Next book</source>
-        <translation type="obsolete">Volgend boek</translation>
-    </message>
-    <message>
-        <source>Previous book</source>
-        <translation type="obsolete">Vorig boek</translation>
-    </message>
-    <message>
-        <source>Next chapter</source>
-        <translation type="obsolete">Volgend hoofdstuk</translation>
-    </message>
-    <message>
-        <source>Previous chapter</source>
-        <translation type="obsolete">Vorig hoofdstuk</translation>
-    </message>
-    <message>
-        <source>Next verse</source>
-        <translation type="obsolete">Volgend vers</translation>
-    </message>
-    <message>
-        <source>Previous verse</source>
-        <translation type="obsolete">Vorig vers</translation>
-    </message>
-</context>
-<context>
-    <name>CLanguageSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/clanguagesettings.cpp" line="297"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>CLexiconKeyChooser</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation>Blader door de items in de lijst. Klik op de muisknop en beweeg de muis om voor- of achteruit te bladeren.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
-        <source>Entries of the current work</source>
-        <translation>Items in de huidige module</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
-        <source>Next entry</source>
-        <translation>Volgend item</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
-        <source>Previous entry</source>
-        <translation>Vorig item</translation>
-    </message>
-</context>
-<context>
-    <name>CLexiconReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
-        <source>Next entry</source>
-        <translation>Volgende invoer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
-        <source>Previous entry</source>
-        <translation>Vorige invoer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
-        <source>Copy reference only</source>
-        <translation>Kopieer alleen de referentie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
-        <source>Save entry as HTML</source>
-        <translation>Sla invoer op als HTML</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
-        <source>Print reference only</source>
-        <translation>Print alleen de referentie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
-        <source>Strong&apos;s Search</source>
-        <translation>Zoeken op Strong&apos;s</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
-        <source>Entry with text</source>
-        <translation>Tekstinvoer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
-        <source>Entry as plain text</source>
-        <translation>Invoer als platte tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
-        <source>Lexicon window</source>
-        <translation>Lexicon-venster</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
-        <source>Copy...</source>
-        <translation>Kopiëren...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
-        <source>Save...</source>
-        <translation>Opslaan...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
-        <source>Print...</source>
-        <translation>Afdrukken...</translation>
-    </message>
-    <message>
-        <source>Saving entry ...</source>
-        <translation type="obsolete">Bezig met opslaan van invoer ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
-        <source>Saving</source>
-        <translation>Bezig met opslaan</translation>
-    </message>
-</context>
-<context>
-    <name>CModuleIndexDialog</name>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Annuleren</translation>
-    </message>
-    <message>
-        <source>Creating indices</source>
-        <translation type="obsolete">Bezig met aanmaken van indices</translation>
-    </message>
-    <message>
-        <source>Creating index for work: %1</source>
-        <translation type="obsolete">Bezig met aanmaken van index voor module: %1</translation>
-    </message>
-    <message>
-        <source>Indexing Is Cancelled</source>
-        <translation type="obsolete">Indexeren is geannuleerd</translation>
-    </message>
-    <message>
-        <source>Indexing is cancelled because modules are removed.</source>
-        <translation type="obsolete">Indexeren is geannuleerd omdat de modules verwijderd zijn.</translation>
-    </message>
-</context>
-<context>
-    <name>CPlainWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
-        <source>Sync with active Bible</source>
-        <translation>Synchroniseren met actieve bijbel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
-        <source>Save text</source>
-        <translation>Tekst opslaan</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
-        <source>Delete current entry</source>
-        <translation>Huidig item verwijderen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
-        <source>Restore original text</source>
-        <translation>Oorspronkelijke tekst herstellen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
-        <source>Module not writable</source>
-        <translation>Module niet beschrijfbaar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
-        <source>Module is not writable.</source>
-        <translation>Module is niet beschrijfbaar.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
-        <source>Either the module may not be edited, or you do not have write permission.</source>
-        <translation>De module mag niet gewijzigd worden of u heb geen schrijfrechten.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
-        <source>Synchronize (show the same verse) with the active Bible window</source>
-        <translation>Synchroniseren met actief bijbelvenster (hetzelfde vers tonen)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
-        <source>Delete current entry (no undo)</source>
-        <translation>Verwijder huidig item (definitief)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
-        <source>Restore original text, new text will be lost</source>
-        <translation>Herstel originele tekst; nieuwe tekst gaat verloren</translation>
-    </message>
-</context>
-<context>
-    <name>CSearchAnalysisScene</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>Save Search Analysis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
-        <source>BibleTime Search Analysis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
-        <source>Book</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
-        <source>Total hits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
-        <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CSwordModuleInfo</name>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
-        <source>Version</source>
-        <translation>Versie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
-        <source>unknown</source>
-        <translation>onbekend</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
-        <source>Markup</source>
-        <translation>Opmaak</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
-        <source>Location</source>
-        <translation>Locatie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
-        <source>Language</source>
-        <translation>Taal</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
-        <source>Category</source>
-        <translation>Categorie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
-        <source>LCSH</source>
-        <translatorcomment>What does this stand for?</translatorcomment>
-        <translation>LCSH</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
-        <source>Writable</source>
-        <translation>Schrijfbaar</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
-        <source>yes</source>
-        <translation>ja</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
-        <source>no</source>
-        <translation>nee</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
-        <source>Unlock key</source>
-        <translation>Sleutel voor ontgrendeling</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
-        <source>Features</source>
-        <translation>Functies</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
-        <source>Take care, this work contains cult / questionable material!</source>
-        <translation>Opgepast, deze module bevat sektarisch/bedenkelijk materiaal!</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
-        <source>About</source>
-        <translation>Over</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
-        <source>Distribution license</source>
-        <translation>Distributielicentie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
-        <source>Distribution source</source>
-        <translation>Distributiebron</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
-        <source>Distribution notes</source>
-        <translation>Opmerkingen bij distributie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
-        <source>Text source</source>
-        <translation>Tekstbron</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
-        <source>Copyright notes</source>
-        <translation>Opmerkingen bij copyright</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
-        <source>Copyright holder</source>
-        <translation>Houder van het copyright</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
-        <source>Copyright date</source>
-        <translation>Datum copyright</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
-        <source>Copyright contact name</source>
-        <translation>Copyright contactnaam</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
-        <source>Copyright contact address</source>
-        <translation>Copyright contactadres</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
-        <source>Copyright contact email</source>
-        <translation>Copyright contact e-mail</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
-        <source>Bibles</source>
-        <translation type="unfinished">Bijbels</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
-        <source>Commentaries</source>
-        <translation type="unfinished">Kanttekeningen</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
-        <source>Books</source>
-        <translation type="unfinished">Boeken</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
-        <source>Cults/Unorthodox</source>
-        <translation type="unfinished">Sektarisch/Onorthodox</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
-        <source>Maps and Images</source>
-        <translation type="unfinished">Kaarten en afbeeldingen</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
-        <source>Daily Devotionals</source>
-        <translation type="unfinished">Dagelijkse overdenkingen</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
-        <source>Lexicons and Dictionaries</source>
-        <translation type="unfinished">Lexicons en Woordenboeken</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
-        <source>Glossaries</source>
-        <translation type="unfinished">Woordenlijsten</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
-        <source>Unknown</source>
-        <translation type="unfinished">Onbekend</translation>
-    </message>
-</context>
-<context>
-    <name>CSwordSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
-        <source>Standard works</source>
-        <translation>Standaardmodules</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
-        <source>Text filters</source>
-        <translation>Tekstfilters</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
-        <source>Desk</source>
-        <translation>Werkblad</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="359"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>CSwordSetupInstallSourcesDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
-        <source>Caption</source>
-        <translation>Titel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
-        <source>Server</source>
-        <translation>Server</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
-        <source>Path</source>
-        <translation>Bestandspad</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
-        <source>Get list...</source>
-        <translation>Lijst ophalen...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
-        <source>A source with this caption already exists. Please provide a different caption.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
-        <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
-
-Do you want to continue?</source>
-        <translation>Lijst met bronnen zal gedownload worden van een externe server. De bronnen worden toegevoegd aan de huidige lijst. Een nieuwe bron vervangt een oude als deze hetzelfde label heeft. U kunt later bronnen verwijderen die u niet wilt behouden.
-
-Wilt u doorgaan?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
-        <source>Get source list from remote server?</source>
-        <translation>Lijst met bronnen ophalen van externe server?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
-        <source>Cancel</source>
-        <translation>Annuleren</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
-        <source>Downloading List</source>
-        <translation>Bezig met downloaden van lijst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
-        <source>Connecting...</source>
-        <translation>Bezig met verbinden...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
-        <source>Refreshing...</source>
-        <translation>Bezig met verversen...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
-        <source>Error</source>
-        <translation>Fout</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
-        <source>Download a list of sources from CrossWire server and add sources</source>
-        <translation>Download een lijst met bronnen van de CrossWire server en voeg de bronnen toe</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <source>Please provide a caption.</source>
-        <translation>Geef een titel op.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <source>Please provide a server name.</source>
-        <translation>Geef een servernaam op.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <source>Please provide a valid, readable path.</source>
-        <translation>Geef een geldig, leesbaar bestandspad op.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
-        <source>Please provide a path.</source>
-        <translation>Geef een bestandspad op.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
-        <source>New  Installation Source</source>
-        <translation>Nieuwe installatiebron</translation>
-    </message>
-</context>
-<context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>Tekst opslaan voor afsluiten?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>Gewijzigde tekst opslaan?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>Tekst opslaan?</translation>
-    </message>
-</context>
-<context>
-    <name>InfoDisplay::CInfoDisplay</name>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
-        <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
-        <source>Abbreviation</source>
-        <translation>Afkorting</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
-        <source>Cross references</source>
-        <translation>Kruisverwijzingen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
-        <source>Footnote</source>
-        <translation>Voetnoot</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
-        <source>Strongs</source>
-        <translation>Strongs</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
-        <source>Morphology</source>
-        <translation>Morfologie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
-        <source>Word lookup</source>
-        <translation>Woord opzoeken</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
-        <source>Copy</source>
-        <translation>Kopiëren</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
-        <source>Select all</source>
-        <translation type="unfinished">Selecteer alles</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
-        <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
-        <translation>&lt;small&gt;Dit is het vergrootglasgebied. Beweeg de muis over links en andere items die gegevens bevatten en de inhoud verschijnt na een korte pauze in het vergrootglas. Bevries de weergave door de muis snel naar het vergrootglasgebied te bewegen of door de muist snel naar het vergrootglas te bewegen.&lt;/small&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>QCoreApplication</name>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
-        <source>Indexing aborted</source>
-        <translation>Indexeren afgebroken</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <source>An internal error occurred while building the index: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
-        <source>An internal error occurred while building the index.</source>
-        <translation>Er is een interne fout opgetreden tijdens het bouwen van de index.</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
-        <source>Search aborted</source>
-        <translation>Zoekopdracht afgebroken</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
-        <source>An internal error occurred while executing your search.</source>
-        <translation>Er is een interne fout opgetreden tijdens het uitvoeren van uw zoekopdracht.</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="126"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="240"/>
-        <source>Commentaries</source>
-        <translation>Kanttekeningen</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="127"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="246"/>
-        <source>Cults/Unorthodox</source>
-        <translation>Sektarisch/Onorthodox</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="128"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="245"/>
-        <source>Maps and Images</source>
-        <translation>Kaarten en afbeeldingen</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="129"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="244"/>
-        <source>Daily Devotionals</source>
-        <translation>Dagelijkse overdenkingen</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="130"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="242"/>
-        <source>Lexicons and Dictionaries</source>
-        <translation>Lexicons en Woordenboeken</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
-        <source>Bibles</source>
-        <translation>Bijbels</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="132"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="243"/>
-        <source>Glossaries</source>
-        <translation>Woordenlijsten</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="133"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="241"/>
-        <source>Books</source>
-        <translation>Boeken</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
-        <source>Added text</source>
-        <translation>Toegevoegde tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
-        <source>Names of languages</source>
-        <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
-        <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
-        <translation>Namen van talen</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
-        <source>Afrikaans</source>
-        <extracomment>Language name af</extracomment>
-        <translation>Afrikaans</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
-        <source>Amuzgo, Guerrero</source>
-        <extracomment>Language name amu</extracomment>
-        <translation>Amuzgo, Guerrero</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
-        <source>English, Old (ca.450-1100)</source>
-        <extracomment>Language name ang</extracomment>
-        <translation>Engels, Oud (ca.450-1100)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
-        <source>Arabic</source>
-        <extracomment>Language name ar</extracomment>
-        <translation>Arabisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
-        <source>Azerbaijani</source>
-        <extracomment>Language name az</extracomment>
-        <translation>Azerbeidzjaans</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
-        <source>Azerbaijani, South</source>
-        <extracomment>Language name azb</extracomment>
-        <translation>Azerbeidzjaans, Zuidelijk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
-        <source>Belarusian</source>
-        <extracomment>Language name be</extracomment>
-        <translation>Wit-Russisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
-        <source>Bulgarian</source>
-        <extracomment>Language name bg</extracomment>
-        <translation>Bulgaars</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
-        <source>Breton</source>
-        <extracomment>Language name br</extracomment>
-        <translation>Bretoens</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
-        <source>Bosnian</source>
-        <extracomment>Language name bs</extracomment>
-        <translation>Bosnisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
-        <source>Catalan</source>
-        <extracomment>Language name ca</extracomment>
-        <translation>Catalaans</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
-        <source>Chinantec, Comaltepec</source>
-        <extracomment>Language name cco</extracomment>
-        <translation>Chinanteeks, Comaltepec</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
-        <source>Cebuano</source>
-        <extracomment>Language name ceb</extracomment>
-        <translation>Cebuano</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
-        <source>Chamorro</source>
-        <extracomment>Language name ch</extracomment>
-        <translation>Chamorro</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
-        <source>Chontal, Highland Oaxaca</source>
-        <extracomment>Language name chd</extracomment>
-        <translation>Chontal, Hooglanden Oaxaca</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
-        <source>Chinantec, Quiotepec</source>
-        <extracomment>Language name chq</extracomment>
-        <translation>Chinanteeks, Quiotepec</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
-        <source>Chinantec, Ozumacu00edn</source>
-        <extracomment>Language name chz</extracomment>
-        <translatorcomment>English has strange characters</translatorcomment>
-        <translation>Chinanteeks, Ozumacín</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
-        <source>Cakchiquel, Western</source>
-        <extracomment>Language name ckw</extracomment>
-        <translation>Kaqchikel, Westelijk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
-        <source>Chinantec, Lalana</source>
-        <extracomment>Language name cnl</extracomment>
-        <translation>Chinanteeks, Lalana</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
-        <source>Chinantec, Tepetotutla</source>
-        <extracomment>Language name cnt</extracomment>
-        <translation>Chinanteeks, Tepetotutla</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
-        <source>Coptic</source>
-        <extracomment>Language name cop</extracomment>
-        <translation>Koptisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
-        <source>Czech</source>
-        <extracomment>Language name cs</extracomment>
-        <translation>Tsjechisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
-        <source>Chinantec, Sochiapan</source>
-        <extracomment>Language name cso</extracomment>
-        <translation>Chinanteeks, Sochiapan</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
-        <source>Chol, Tila</source>
-        <extracomment>Language name cti</extracomment>
-        <translation>Ch&apos;ol, Tila</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
-        <source>Chatino, Western Highland</source>
-        <extracomment>Language name ctp</extracomment>
-        <translation>Chatino, Westelijke Hooglanden</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
-        <source>Church Slavic</source>
-        <extracomment>Language name cu</extracomment>
-        <translation>Kerkslavisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
-        <source>Welsh</source>
-        <extracomment>Language name cy</extracomment>
-        <translation>Welsh</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
-        <source>Danish</source>
-        <extracomment>Language name da</extracomment>
-        <translation>Deens</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
-        <source>German</source>
-        <extracomment>Language name de</extracomment>
-        <translation>Duits</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
-        <source>Duruma</source>
-        <extracomment>Language name dug</extracomment>
-        <translation>Duruma</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
-        <source>Greek, Modern (1453-)</source>
-        <extracomment>Language name el</extracomment>
-        <translation>Grieks, Modern (1453-)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
-        <source>English</source>
-        <extracomment>Language name en</extracomment>
-        <translation>Engels</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
-        <source>American English</source>
-        <extracomment>Language name en_US</extracomment>
-        <translation>Amerikaans Engels</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
-        <source>English, Middle (1100-1500)</source>
-        <extracomment>Language name enm</extracomment>
-        <translation>Engels, Midden (110-1500)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
-        <source>Esperanto</source>
-        <extracomment>Language name eo</extracomment>
-        <translation>Esperanto</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
-        <source>Spanish</source>
-        <extracomment>Language name es</extracomment>
-        <translation>Spaans</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
-        <source>Estonian</source>
-        <extracomment>Language name et</extracomment>
-        <translation>Estlands</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
-        <source>Basque</source>
-        <extracomment>Language name eu</extracomment>
-        <translation>Baskisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
-        <source>Persian</source>
-        <extracomment>Language name fa</extracomment>
-        <translation>Perzisch (Farsi)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
-        <source>Finnish</source>
-        <extracomment>Language name fi</extracomment>
-        <translation>Fins</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
-        <source>French</source>
-        <extracomment>Language name fr</extracomment>
-        <translation>Frans</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
-        <source>Frisian</source>
-        <extracomment>Language name fy</extracomment>
-        <translation>Fries</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
-        <source>Irish</source>
-        <extracomment>Language name ga</extracomment>
-        <translation>Iers</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
-        <source>Gaelic (Scots)</source>
-        <extracomment>Language name gd</extracomment>
-        <translation>Gaelic (Schots)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
-        <source>Geez</source>
-        <extracomment>Language name gez</extracomment>
-        <translation>Geez</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
-        <source>Gothic</source>
-        <extracomment>Language name got</extracomment>
-        <translation>Gotisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
-        <source>Manx</source>
-        <extracomment>Language name gv</extracomment>
-        <translation>Manx</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
-        <source>Greek, Ancient (to 1453)</source>
-        <extracomment>Language name grc</extracomment>
-        <translation>Grieks, Oud (tot 1453)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
-        <source>Hebrew</source>
-        <extracomment>Language name he</extracomment>
-        <translation>Hebreeuws</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
-        <source>Hausa</source>
-        <extracomment>Language name hau</extracomment>
-        <translation>Hausa</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
-        <source>Hawaiian</source>
-        <extracomment>Language name haw</extracomment>
-        <translation>Hawaïaans</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
-        <source>Hindi</source>
-        <extracomment>Language name hi</extracomment>
-        <translation>Hindi</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
-        <source>Croatian</source>
-        <extracomment>Language name hr</extracomment>
-        <translation>Kroaats</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
-        <source>Hungarian</source>
-        <extracomment>Language name hu</extracomment>
-        <translation>Hongaars</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
-        <source>Huave, San Mateo Del Mar</source>
-        <extracomment>Language name huv</extracomment>
-        <translation>Huave, San Mateo Del Mar</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
-        <source>Armenian</source>
-        <extracomment>Language name hy</extracomment>
-        <translation>Armeens</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
-        <source>Indonesian</source>
-        <extracomment>Language name id</extracomment>
-        <translation>Indonesisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
-        <source>Icelandic</source>
-        <extracomment>Language name is</extracomment>
-        <translation>IJslands</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
-        <source>Italian</source>
-        <extracomment>Language name it</extracomment>
-        <translation>Italiaans</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
-        <source>Itzu00e1</source>
-        <extracomment>Language name itz</extracomment>
-        <translatorcomment>English has strange characters</translatorcomment>
-        <translation>Itzá</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
-        <source>Ixil, San Juan Cotzal</source>
-        <extracomment>Language name ixl</extracomment>
-        <translation>Ixil, San Juan Cotzal</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
-        <source>Japanese</source>
-        <extracomment>Language name ja</extracomment>
-        <translation>Japans</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
-        <source>Jacalteco, Eastern</source>
-        <extracomment>Language name jac</extracomment>
-        <translation>Jacalteeks (Popti&apos;), Oostelijk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
-        <source>Javanese, Caribbean</source>
-        <extracomment>Language name jvn</extracomment>
-        <translation>Javaans, Caribisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
-        <source>Georgian</source>
-        <extracomment>Language name ka</extracomment>
-        <translation>Georgisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
-        <source>Korean</source>
-        <extracomment>Language name ko</extracomment>
-        <translation>Koreaans</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
-        <source>Kurdish</source>
-        <extracomment>Language name ku</extracomment>
-        <translation>Koerdisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
-        <source>Kirghiz</source>
-        <extracomment>Language name ky</extracomment>
-        <translation>Kirgizisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
-        <source>Latin</source>
-        <extracomment>Language name la</extracomment>
-        <translation>Latijn</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
-        <source>Lacandon</source>
-        <extracomment>Language name lac</extracomment>
-        <translation>Lacandon</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
-        <source>Lithuanian</source>
-        <extracomment>Language name lt</extracomment>
-        <translation>Litouws</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
-        <source>Latvian</source>
-        <extracomment>Language name lv</extracomment>
-        <translation>Lets</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
-        <source>Malagasy</source>
-        <extracomment>Language name mg</extracomment>
-        <translation>Malagasi</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
-        <source>Maori</source>
-        <extracomment>Language name mi</extracomment>
-        <translation>Maori</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
-        <source>Mixe, Isthmus</source>
-        <extracomment>Language name mir</extracomment>
-        <translation>Mixe, Isthmus</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
-        <source>Mixtec, Coatzospan</source>
-        <extracomment>Language name miz</extracomment>
-        <translation>Mixteeks, Coatzospan</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
-        <source>Macedonian</source>
-        <extracomment>Language name mk</extracomment>
-        <translation>Macedonisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
-        <source>Mixtec, Silacayoapan</source>
-        <extracomment>Language name mks</extracomment>
-        <translation>Mixteeks, Silacayoapan</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
-        <source>More</source>
-        <extracomment>Language name mos</extracomment>
-        <translation>More (taal van de Mossis, Burkina Faso)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
-        <source>Malay</source>
-        <extracomment>Language name ms</extracomment>
-        <translation>Maleis</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
-        <source>Maltese</source>
-        <extracomment>Language name mt</extracomment>
-        <translation>Maltees</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
-        <source>Low German; Low Saxon</source>
-        <extracomment>Language name nds</extracomment>
-        <translation>Laagduits; Laagsaksisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
-        <source>Nepali</source>
-        <extracomment>Language name ne</extracomment>
-        <translation>Nepalees</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
-        <source>Nahuatl, Guerrero</source>
-        <extracomment>Language name ngu</extracomment>
-        <translation>Nahuatl, Guerrero</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
-        <source>Nahuatl, Northern Oaxaca</source>
-        <extracomment>Language name nhy</extracomment>
-        <translation>Nahuatl, Noordelijk Oaxaca</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
-        <source>Dutch</source>
-        <extracomment>Language name nl</extracomment>
-        <translation>Nederlands</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
-        <source>Norwegian Nynorsk</source>
-        <extracomment>Language name nn</extracomment>
-        <translation>Nieuw-Noors (Nynorsk)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
-        <source>Norwegian</source>
-        <extracomment>Language name no</extracomment>
-        <translation>Noors</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
-        <source>Otomi, Queru00e9taro</source>
-        <extracomment>Language name otq</extracomment>
-        <translatorcomment>English has strange characters</translatorcomment>
-        <translation>Otomí Querétaro</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
-        <source>Papiamento</source>
-        <extracomment>Language name pap</extracomment>
-        <translation>Papiaments</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
-        <source>Polish</source>
-        <extracomment>Language name pl</extracomment>
-        <translation>Pools</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
-        <source>Persian (Dari)</source>
-        <extracomment>Language name prs</extracomment>
-        <translation>Perzisch (Dari)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
-        <source>Portuguese</source>
-        <extracomment>Language name pt</extracomment>
-        <translation>Portugees</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
-        <source>Brasilian Portuguese</source>
-        <extracomment>Language name pt_BR</extracomment>
-        <translation>Braziliaans Portugees</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
-        <source>Quichu00e9, West Central</source>
-        <extracomment>Language name qut</extracomment>
-        <translation>Quechua, Westelijk Centraal</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
-        <source>Romanian</source>
-        <extracomment>Language name ro</extracomment>
-        <translation>Roemeens</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
-        <source>Russian</source>
-        <extracomment>Language name ru</extracomment>
-        <translation>Russisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
-        <source>Scots</source>
-        <extracomment>Language name sco</extracomment>
-        <translation>Schots</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
-        <source>Slovak</source>
-        <extracomment>Language name sk</extracomment>
-        <translation>Slowaaks</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
-        <source>Slovenian</source>
-        <extracomment>Language name sl</extracomment>
-        <translation>Sloweens</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
-        <source>Somali</source>
-        <extracomment>Language name so</extracomment>
-        <translation>Somalisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
-        <source>Albanian</source>
-        <extracomment>Language name sq</extracomment>
-        <translation>Albanees</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
-        <source>Swedish</source>
-        <extracomment>Language name sv</extracomment>
-        <translation>Zweeds</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
-        <source>Swahili</source>
-        <extracomment>Language name sw</extracomment>
-        <translation>Swahili</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
-        <source>Syriac</source>
-        <extracomment>Language name syr</extracomment>
-        <translation>Syrisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
-        <source>Tamil</source>
-        <extracomment>Language name ta</extracomment>
-        <translation>Tamil</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
-        <source>Thai</source>
-        <extracomment>Language name th</extracomment>
-        <translation>Thai</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
-        <source>Tagalog</source>
-        <extracomment>Language name tl</extracomment>
-        <translation>Tagalog</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
-        <source>Tswana</source>
-        <extracomment>Language name tn</extracomment>
-        <translation>Tswana (Setswana)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
-        <source>Turkish</source>
-        <extracomment>Language name tr</extracomment>
-        <translation>Turks</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
-        <source>Tektiteko</source>
-        <extracomment>Language name ttc</extracomment>
-        <translation>Tektiteko</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
-        <source>Tahitian</source>
-        <extracomment>Language name ty</extracomment>
-        <translation>Tahitisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
-        <source>Tzotzil, Zinacantu00e1n</source>
-        <extracomment>Language name tzz</extracomment>
-        <translatorcomment>English has strange characters</translatorcomment>
-        <translation>Tzotzil, Zinacantán</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
-        <source>Ukrainian</source>
-        <extracomment>Language name uk</extracomment>
-        <translation>Oekraïens</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
-        <source>Orya</source>
-        <extracomment>Language name ury</extracomment>
-        <translation>Orya</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
-        <source>Uspanteco</source>
-        <extracomment>Language name usp</extracomment>
-        <translation>Uspanteeks</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
-        <source>Vietnamese</source>
-        <extracomment>Language name vi</extracomment>
-        <translation>Vietnamees</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
-        <source>Xhosa</source>
-        <extracomment>Language name xh</extracomment>
-        <translation>Xhosa</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
-        <source>Bavarian</source>
-        <extracomment>Language name bar</extracomment>
-        <translation>Beiers</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
-        <source>Lombard</source>
-        <extracomment>Language name lmo</extracomment>
-        <translation>Lombardisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
-        <source>Uma</source>
-        <extracomment>Language name ppk
-----------
-Language name ppk</extracomment>
-        <translation>Uma</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
-        <source>Sranan</source>
-        <extracomment>Language name srn</extracomment>
-        <translation>Sranantongo</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
-        <source>Yiddish</source>
-        <extracomment>Language name yi</extracomment>
-        <translation>Jiddisch</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
-        <source>Zapotec, San Juan Guelavu00eda</source>
-        <extracomment>Language name zab</extracomment>
-        <translatorcomment>English has strange characters</translatorcomment>
-        <translation>Zapoteeks, San Juan Guelavía</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
-        <source>Zapotec, Mitla</source>
-        <extracomment>Language name zaw</extracomment>
-        <translation>Zapoteeks, Mitla</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
-        <source>Chinese</source>
-        <extracomment>Language name zh</extracomment>
-        <translation>Chinees</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
-        <source>Zapotec, Amatlu00e1n</source>
-        <extracomment>Language name zpo</extracomment>
-        <translatorcomment>English has strange characters</translatorcomment>
-        <translation>Zapoteeks, Amatlán</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
-        <source>Zapotec, Zoogocho</source>
-        <extracomment>Language name zpq</extracomment>
-        <translation>Zapoteeks, Zoogocho</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
-        <source>Zapotec, Yalu00e1lag</source>
-        <extracomment>Language name zpu</extracomment>
-        <translatorcomment>English has strange characters</translatorcomment>
-        <translation>Zapoteeks, Yalálag</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
-        <source>Zapotec, Chichicapan</source>
-        <extracomment>Language name zpv</extracomment>
-        <translation>Zapoteeks, Chichicapan</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
-        <source>Zapotec, Southern Rincon</source>
-        <extracomment>Language name zsr</extracomment>
-        <translation>Zapoteeks, Zuidelijk Rincon</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
-        <source>Zapotec, Quioquitani-Quieru00ed</source>
-        <extracomment>Language name ztq</extracomment>
-        <translatorcomment>English has strange characters</translatorcomment>
-        <translation>Zapoteeks, Quioquitani-Quierí</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
-        <source>Zapotec, Yatee</source>
-        <extracomment>Language name zty</extracomment>
-        <translation>Zapoteeks, Yatee</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
-        <source>Zulu</source>
-        <extracomment>Language name zu</extracomment>
-        <translation>Zoeloe</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
-        <source>Footnotes</source>
-        <translation>Voetnoten</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
-        <source>Strong&apos;s numbers</source>
-        <translation>Strong-nummering</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
-        <source>Headings</source>
-        <translation>Kopteksten</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
-        <source>Morphological tags</source>
-        <translation>Morfologische aanduidingen</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
-        <source>Lemmas</source>
-        <translation>Trefwoorden</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
-        <source>Hebrew vowel points</source>
-        <translation>Hebreeuwse klinkerpunten</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
-        <source>Hebrew cantillation marks</source>
-        <translation>Hebreeuwse intonatietekens</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
-        <source>Greek accents</source>
-        <translation>Griekse accenten</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
-        <source>Red letter words</source>
-        <translation>Roodgekleurde woorden</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
-        <source>Textual variants</source>
-        <translation>Tekstuele variaties</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
-        <source>Scripture cross-references</source>
-        <translation>Bijbelse kruisverwijzingen</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
-        <source>Morph segmentation</source>
-        <translation>Morfologische segmentatie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation>Export</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
-        <source>Local</source>
-        <translation>Lokaal</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>Extern</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Eerste testament</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Mozes/Pentateuch/Tora</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>Geschiedenis</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Profeten</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>Nieuwe testament</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Evangeliën</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>Brieven</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Brieven van Paulus</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <source>HTML files</source>
-        <translation>HTML-bestanden</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
-        <source>All files</source>
-        <translation>Alle bestanden</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
-        <source>Text files</source>
-        <translation>Tekstbestanden</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
-        <source>Save file</source>
-        <translation>Bestand opslaan</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
-        <source>Save document ...</source>
-        <translation>Document opslaan...</translation>
-    </message>
-    <message>
-        <source>Print keys</source>
-        <translation type="obsolete">Printertoetsen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <source>BibleTime bookmark files</source>
-        <translation>BibleTime bladwijzerbestanden</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
-        <source>unknown</source>
-        <translation>onbekend</translation>
-    </message>
-    <message>
-        <source>Change description ...</source>
-        <translation type="obsolete">Wijzig omschrijving ...</translation>
-    </message>
-    <message>
-        <source>Enter a new description for the chosen bookmark.</source>
-        <translation type="obsolete">Voer een beschrijving voor de gekozen bladwijzer in.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
-        <source>New folder</source>
-        <translation>Nieuwe map</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
-        <source>The file already exists.</source>
-        <translation>Het bestand bestaat al.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
-        <source>Do you want to overwrite it?</source>
-        <translation>Wilt u overschrijven?</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
-        <source>Error</source>
-        <translation>Fout</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>Het bestand kon niet worden opgeslagen.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
-        <source>Please check permissions etc.</source>
-        <translation>Controleer de lees- en schrijfrechten.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
-        <source>Take care, this work contains cult / questionable material!</source>
-        <translation>Opgepast, deze module bevat sektarisch / bedenkelijk materiaal!</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
-        <source>Version</source>
-        <translation>Versie</translation>
-    </message>
-    <message>
-        <source>Settings Migration</source>
-        <translation type="obsolete">Instellingenmigratie</translation>
-    </message>
-    <message>
-        <source>It appears you have a BibleTime configuration from KDE 3 stored in %1, and you have not migrated it to this version.  Would you like to import it?</source>
-        <translation type="obsolete">Het lijkt erop dat er een BibleTime configuratiebestand uit KDE 3 staat in %1; deze instellingen zijn niet gemigreerd naar deze versie.  Wilt u deze instellingen importeren?</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
-        <source>Encrypted - needs unlock key</source>
-        <translation>Gecodeerd - sleutel voor ontgrendeling benodigd</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
-        <source>Double click for more information</source>
-        <translation>Dubbelklik voor meer informatie</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
-        <source>Updated version available!</source>
-        <translation>Nieuwe versie beschikbaar!</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
-        <source>Installed version</source>
-        <translation>Geïnstalleerde versie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
-        <source>Haitian Creole</source>
-        <extracomment>Language name ht</extracomment>
-        <translation>Haïtiaans Creools (Kreyòl, Patua)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
-        <source>Kekchu00ed</source>
-        <comment>kek</comment>
-        <extracomment>Language name kek</extracomment>
-        <translatorcomment>English contains strange characters; the name of the language seems better spelled as Q&apos;eqchi&apos;</translatorcomment>
-        <translation>Q&apos;eqchi&apos; (Kekchi)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
-        <source>(Multiple languages)</source>
-        <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
-        <translation>(Meertalig)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
-        <source>Mam, Central</source>
-        <extracomment>Language name mvc</extracomment>
-        <translation>Mam, Centraal</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
-        <source>Mam, Todos Santos Cuchumatu00e1n</source>
-        <extracomment>Language name mvj</extracomment>
-        <translatorcomment>English has strange characters</translatorcomment>
-        <translation>Mam, Todos Santos Cuchumatán</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
-        <source>Mixe, Juquila</source>
-        <extracomment>Language name mxq</extracomment>
-        <translation>Mixe, Juquila</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
-        <source>Mixtec, Jamiltepec</source>
-        <extracomment>Language name mxt</extracomment>
-        <translation>Mixteeks, Jamiltepec</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
-        <source>Burmese</source>
-        <extracomment>Language name my</extracomment>
-        <translation>Birmees</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
-        <source>Norwegian Bokmu00e5l</source>
-        <extracomment>Language name nb</extracomment>
-        <translatorcomment>English has strange characters</translatorcomment>
-        <translation>Noors, Bokmål</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
-        <source>Nahuatl, Michoacu00e1n</source>
-        <extracomment>Language name ncl</extracomment>
-        <translatorcomment>English has strange characters</translatorcomment>
-        <translation>Nahuatl, Michoacán</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
-        <source>Potawatomi</source>
-        <extracomment>Language name pot</extracomment>
-        <translation>Potawatomi</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
-        <source>Klingon</source>
-        <extracomment>Language name tlh</extracomment>
-        <translation>Klingon</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
-        <source>Mixtec, Diuxi-Tilantongo</source>
-        <extracomment>Language name xtd</extracomment>
-        <translation>Mixteeks, Diuxi-Tilantongo</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
-        <source>Yoryba</source>
-        <extracomment>Language name yo</extracomment>
-        <translation>Yorùbá</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
-        <source>Verb tense changed</source>
-        <translation>Werkwoordstijd gewijzigd</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
-        <source>Can&apos;t write file</source>
-        <translation>Kan niet schrijven naar bestand</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
-        <source>The Sword config file can&apos;t be written!</source>
-        <translation>Het Sword configuratiebestand kan niet worden geschreven!</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
-        <source>Export Bookmarks</source>
-        <translation>Exporteer Bladwijzers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
-        <source>Import bookmarks</source>
-        <translation>Importeer bladwijzers</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
-        <source>Overwrite File?</source>
-        <translation>Bestand overschrijven?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
-        <source>Parsing Strong&apos;s Numbers</source>
-        <translation>Bezig met verwerken van Strong&apos;s-nummers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
-        <source>This shortcut conflicts with the shortcut for the following actions:</source>
-        <translation>Deze sneltoets conflicteert met de sneltoets voor de volgende acties:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
-        <source>Do you want to clear the conflicting shortcuts and continue?</source>
-        <translation>Wilt u de conflicterende sneltoetsen verwijderen en doorgaan?</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
-        <source>Indexed works</source>
-        <translation>Geïndexeerde modules</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
-        <source>Unindexed works</source>
-        <translation>Niet-geïndexeerde modules</translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="44"/>
-        <source>Show this help message and exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="47"/>
-        <source>Output BibleTime version and exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="50"/>
-        <source>Open a clean session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="53"/>
-        <source>Open the default Bible with the reference &lt;ref&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="56"/>
-        <source>For command-line arguments parsed by the Qt toolkit, see %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="103"/>
-        <source>Error: %1 expects an argument.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="106"/>
-        <source>See --help for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="111"/>
-        <source>Error: Invalid command-line argument: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
-        <source>CSS base template not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
-        <source>Default template &quot;%1&quot; not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
-        <source>Replace</source>
-        <translation type="unfinished">Vervangen</translation>
-    </message>
-</context>
-<context>
-    <name>QPushButton</name>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
-        <source>OK</source>
-        <comment>Dialog Button</comment>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
-        <source>Open</source>
-        <comment>Dialog Button</comment>
-        <translation>Openen</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
-        <source>Save</source>
-        <comment>Dialog Button</comment>
-        <translation>Opslaan</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
-        <source>Cancel</source>
-        <comment>Dialog Button</comment>
-        <translation>Annuleren</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
-        <source>Close</source>
-        <comment>Dialog Button</comment>
-        <translation>Sluiten</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
-        <source>Discard</source>
-        <comment>Dialog Button</comment>
-        <translation>Verwerpen</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
-        <source>Apply</source>
-        <comment>Dialog Button</comment>
-        <translation>Toepassen</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
-        <source>Reset</source>
-        <comment>Dialog Button</comment>
-        <translation>Reset</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
-        <source>Restore defaults</source>
-        <comment>Dialog Button</comment>
-        <translation>Standaardwaarden</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
-        <source>Help</source>
-        <comment>Dialog Button</comment>
-        <translation>Help</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
-        <source>Save All</source>
-        <comment>Dialog Button</comment>
-        <translation>Alles opslaan</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
-        <source>Yes</source>
-        <comment>Dialog Button</comment>
-        <translation>Ja</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
-        <source>Yes to all</source>
-        <comment>Dialog Button</comment>
-        <translation>Ja op alles</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
-        <source>No</source>
-        <comment>Dialog Button</comment>
-        <translation>Nee</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
-        <source>No to all</source>
-        <comment>Dialog Button</comment>
-        <translation>Nee op alles</translation>
-    </message>
-</context>
-<context>
-    <name>Search::BtSearchOptionsArea</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
-        <source>Search for:</source>
-        <translation>Zoeken naar:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
-        <source>&amp;Search</source>
-        <translation>&amp;Zoeken</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
-        <source>Start to search the text in the chosen works</source>
-        <translation>Start met zoeken naar deze tekst in de geselecteerde modules</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
-        <source>Ch&amp;oose...</source>
-        <translation>&amp;Selecteren...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
-        <source>Choose works for the search</source>
-        <translation>Selecteer modules voor de zoekopdracht</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
-        <source>S&amp;etup...</source>
-        <translation>&amp;Instellen...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
-        <source>All of the words (AND is added between the words)</source>
-        <translation>Alle woorden (AND wordt toegevoegd tussen de woorden)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
-        <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
-        <translation> (&lt;a href=&apos;syntax_help&apos;&gt;volledige syntax&lt;/a&gt;)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
-        <source>Scope:</source>
-        <translation>Bereik:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
-        <source>The text you want to search for</source>
-        <translation>De tekst waar u naar wilt zoeken</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
-        <source>Works:</source>
-        <translation>Modules:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
-        <source>No search scope</source>
-        <translation>Geen zoekbereik</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
-        <source>All words</source>
-        <translation>Alle woorden</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
-        <source>Configure predefined scopes for search</source>
-        <translation>Voorgedefinieerde zoekbereiken instellen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
-        <source>Some words</source>
-        <translation>Enkele woorden</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
-        <source>Free</source>
-        <translation>Vrij</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
-        <source>Some of the words (OR is added between the words)</source>
-        <translation>Enkele van de woorden (OR is toegevoegd tussen de woorden)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
-        <source>Full lucene syntax</source>
-        <translation>Volledige lucene syntax</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
-        <source>Click the link to get help for search syntax</source>
-        <translation>Klik op de snelkoppeling om hulp te krijgen voor de zoeksyntax</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
-        <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
-        <translation>Kies het bereik (boeken/hoofdstukken/verzen om te doorzoeken).&lt;br /&gt;Toepasbaar op bijbels en kanttekeningen.</translation>
-    </message>
-</context>
-<context>
-    <name>Search::BtSearchResultArea</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
-        <source>Text of the selected search result item</source>
-        <translation>Tekst van het geselecteerde zoekresultaat</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
-        <source>Select all</source>
-        <translation type="unfinished">Selecteer alles</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
-        <source>Copy</source>
-        <translation type="unfinished">Kopiëren</translation>
-    </message>
-</context>
-<context>
-    <name>Search::BtSearchSyntaxHelpDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
-        <source>Search Syntax Help</source>
-        <translation type="unfinished">Zoeksyntax Help</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
-        <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
-        <source>Which words to find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
-        <source>Grouping and order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
-        <source>Wildcards (partial words)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
-        <source>Text fields (different parts of text)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
-        <source>Other syntax features</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
-        <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
-        <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
-        <source>jesus AND god</source>
-        <comment>Do not translate &quot;AND&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
-        <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
-        <source>jesus OR god</source>
-        <comment>Do not translate &quot;OR&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
-        <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
-        <source>jesus NOT god</source>
-        <comment>Do not translate &quot;NOT&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
-        <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
-        <source>+jesus -god</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
-        <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
-        <source>(a AND b) OR c</source>
-        <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
-        <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
-        <source>&quot;says lord&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
-        <source>&quot;says the lord&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
-        <source>Finds all verses with &apos;says the LORD&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
-        <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
-        <source>a*</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
-        <source>All words beginning with &apos;a&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
-        <source>a*a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
-        <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
-        <source>a?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
-        <source>&apos;at&apos; and &apos;an&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
-        <source>a??a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
-        <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
-        <source>Available text fields:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
-        <source>Searches headings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
-        <source>Searches footnotes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
-        <source>Searches Strong&apos;s numbers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
-        <source>Searches morphology codes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
-        <source>Examples:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
-        <source>heading:Jesus</source>
-        <comment>Do not translate &quot;heading:&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
-        <source>Finds headings with &apos;Jesus&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
-        <source>footnote:Jesus AND footnote:said</source>
-        <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
-        <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
-        <source>strong:G846</source>
-        <comment>Do not translate &quot;strong:&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
-        <source>Finds verses with Strong&apos;s Greek number 846</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
-        <source>morph:&quot;N-NSF&quot;</source>
-        <comment>Do not translate &quot;morph:&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
-        <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
-        <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::CModuleResultView</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="50"/>
-        <source>Work</source>
-        <translation>Module</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="50"/>
-        <source>Hits</source>
-        <translation>Treffers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="64"/>
-        <source>Copy...</source>
-        <translation>Kopiëren...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="66"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="76"/>
-        <source>Reference only</source>
-        <translation>Alleen referentie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="69"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="79"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="86"/>
-        <source>Reference with text</source>
-        <translation>Referentie met tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="74"/>
-        <source>Save...</source>
-        <translation>Opslaan...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="84"/>
-        <source>Print...</source>
-        <translation>Afdrukken...</translation>
-    </message>
-    <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Kopieer zoekresultaat...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
-        <source>Copying search result</source>
-        <translation>Zoekresultaat wordt gekopieerd</translation>
-    </message>
-    <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Zoekresultaat opslaan...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
-        <source>Saving search result</source>
-        <translation>Zoekresultaat wordt opgeslagen</translation>
-    </message>
-    <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Zoekresultaat afdrukken...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
-        <source>Printing search result</source>
-        <translation>Zoekresultaat wordt afgedrukt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="49"/>
-        <source>Works chosen for the search and the number of the hits in each work</source>
-        <translation>Gekozen modules voor de zoekopdracht en het aantal zoekresultaten in iedere module</translation>
-    </message>
-</context>
-<context>
-    <name>Search::CRangeChooserDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="136"/>
-        <source>S&amp;earch range:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="137"/>
-        <source>Select a scope from the list to edit the searchranges</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="148"/>
-        <source>&amp;Name:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="151"/>
-        <source>Edi&amp;t current range:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="152"/>
-        <source>Change the search ranges of the selected searchscope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="157"/>
-        <source>Parsed search range:</source>
-        <translation>Ontleed zoekbereik:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="171"/>
-        <source>New range</source>
-        <translation>Nieuw bereik</translation>
-    </message>
-    <message>
-        <source>&lt;invalid name of search range&gt;</source>
-        <translation type="obsolete">&lt;ongeldige naam van zoekbereik&gt;</translation>
-    </message>
-    <message>
-        <source>Select a scope from the list to edit the search ranges</source>
-        <translation type="obsolete">Selecteer een zoekbereik uit de lijst om de zoekbereiken te bewerken</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="140"/>
-        <source>&amp;Add new scope</source>
-        <translation>&amp;Nieuw zoekbereik toevoegen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="141"/>
-        <source>Add a new search scope. First enter an appropriate name, then edit the search ranges.</source>
-        <translation>Voeg een nieuw zoekbereik toe. Geef eerst een passende naam in, wijzig daarna het zoekbereik.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="145"/>
-        <source>Delete current &amp;scope</source>
-        <translation>&amp;Verwijder huidig zoekbereik</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="146"/>
-        <source>Delete the selected search scope</source>
-        <translation>Verwijder het geselecteerde zoekbereik</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="149"/>
-        <source>Change the name of the selected search scope</source>
-        <translation>Wijzig de naam van het geselecteerde zoekbereik</translation>
-    </message>
-    <message>
-        <source>Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="obsolete">Wijzig het bereik van het geselecteerde zoekbereik in de lijst. Kijk naar de voorgedefinieerde zoekbereiken om te zien hoe zoekbereiken opgebouwd zijn.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="158"/>
-        <source>The search ranges which will be used for the search, parsed to the canonical form</source>
-        <translation>De zoekbereiken welke gebruikt worden voor de zoekopdracht, verwerkt in kanonieke vorm</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="134"/>
-        <source>Setup Search Scopes</source>
-        <translation>Zoekbereiken Instellen</translation>
-    </message>
-</context>
-<context>
-    <name>Search::CSearchDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
-        <source>Missing indices</source>
-        <translation>Ontbrekende indices</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
-        <source>Search</source>
-        <translation>Zoeken</translation>
-    </message>
-    <message>
-        <source>One or more works need indexing before they can be searched.
-This could take a long time. Proceed with indexing?</source>
-        <translation type="obsolete">Eén of meerdere modules moeten geïndexeerd worden, voordat ze doorzocht kunnen worden.
-Dit kan enige tijd duren. Doorgaan met indexeren?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
-        <source>The following modules need to be indexed before they can be searched in:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
-        <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
-        <source>Drag any verse reference onto an open Bible window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
-        <source>&amp;Analyze results...</source>
-        <translation>&amp;Analyseer resultaten...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
-        <source>Show a graphical analysis of the search result</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Sluiten</translation>
-    </message>
-</context>
-<context>
-    <name>Search::CSearchResultView</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="39"/>
-        <source>Results</source>
-        <translation>Resultaten</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="47"/>
-        <source>Copy...</source>
-        <translation>Kopiëren...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="50"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="64"/>
-        <source>Reference only</source>
-        <translation>Alleen referentie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="54"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="68"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="76"/>
-        <source>Reference with text</source>
-        <translation>Referentie met tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="61"/>
-        <source>Save...</source>
-        <translation>Opslaan...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="73"/>
-        <source>Print...</source>
-        <translation>Afdrukken...</translation>
-    </message>
-    <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Zoekresultaat afdrukken...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
-        <source>Printing search result</source>
-        <translation>Zoekresultaat wordt afgedrukt</translation>
-    </message>
-    <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Zoekresultaat opslaan...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
-        <source>Saving search result</source>
-        <translation>Zoekresultaat wordt opgeslagen</translation>
-    </message>
-    <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Kopieer zoekresultaat...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
-        <source>Copying search result</source>
-        <translation>Zoekresultaat wordt gekopieerd</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="38"/>
-        <source>Search result of the selected work</source>
-        <translation>Zoekresultaat van geselecteerde module</translation>
-    </message>
-</context>
-<context>
-    <name>StandardWorksTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>Bijbel:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>De standaardbijbel wordt gebruikt wanneer er een hyperlink naar een bijbel wordt aangeklikt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>Kanttekeningen:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>De standaardkanttekeningen worden gebruikt wanneer een hyperlink naar kanttekeningen wordt aangeklikt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation>Lexicon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>Het standaardlexicon wordt gebruikt wanneer een hyperlink naar een lexicon wordt aangeklikt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>Dagelijkse overdenking:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>De standaard dagelijkse overdenking wordt gebruikt om een korte overdenking te tonen bij het opstarten</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>Hebreeuws Strong&apos;s lexicon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>Het standaard Hebreeuwse lexicon wordt gebruikt wanneer een hyperlink naar een Hebreeuws lexicon wordt aangeklikt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>Grieks Strong&apos;s lexicon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>Het standaard Griekse lexicon wordt gebruikt wanneer een hyperlink naar een Grieks lexicon wordt aangeklikt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>Hebreeuws morfologisch lexicon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>Het standaard morfologische lexicon voor Hebreeuwse teksten wordt gebruikt wanneer een hyperlink of een morfologische tag in een Hebreeuwse tekst wordt aangeklikt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation>Grieks morfologisch lexicon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>Het standaard morfologische lexicon voor Griekse teksten wordt gebruikt wanneer een hyperlink of een morfologische tag in een Griekse tekst wordt aangeklikt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="62"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>TextFiltersTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation type="unfinished">Nieuwe regel na elk vers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">Toon versnummers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation type="unfinished">Toon tussenkopjes</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">Toon bijbelse kruisverwijzingen</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">Toon Griekse accenten</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Toon Hebreeuwse klinkerpunten</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Toon Hebreeuwse intonatietekens</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">Toon morfologische segmentatie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation type="unfinished">Tekstuele variaties gebruiken</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="unfinished">Filters bepalen het uiterlijk van tekst. Hier kunt u standaardinstellingen specificeren voor alle filters. U kunt deze instellingen in ieder weergavevenster overstemmen.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>findTextDialog</name>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation>Zoek Tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation>De tekst waarnaar u wilt zoeken</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation>&amp;Hoofdlettergevoelig</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation>Vind de vorige locatie van de zoekterm</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation>&amp;Vorige</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation>Vind de volgende locatie van de zoekterm</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation>Volge&amp;nde</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation>Sluit het dialoogvenster</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Sluiten</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/messages/bibletime_ui_nn_NO.ts b/i18n/messages/bibletime_ui_nn_NO.ts
deleted file mode 100644
index c367d83..0000000
--- a/i18n/messages/bibletime_ui_nn_NO.ts
+++ /dev/null
@@ -1,5249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="nn_NO">
-<context>
-    <name></name>
-    <message>
-        <source></source>
-        <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
-This file is distributed under the same license as the Bibetime package.</translatorcomment>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>BTAboutModuleDialog</name>
-    <message>
-        <location filename="../../src/frontend/btaboutmoduledialog.cpp" line="45"/>
-        <source>Information About %1</source>
-        <translation>Informasjon om %1</translation>
-    </message>
-</context>
-<context>
-    <name>BibleTime</name>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
-        <source>&amp;File</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
-        <source>&amp;View</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
-        <source>&amp;Search</source>
-        <translation>&amp;Søk</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
-        <source>&amp;Window</source>
-        <translation>&amp;Vindauge</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
-        <source>Se&amp;ttings</source>
-        <translation>&amp;Innstillingar</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
-        <source>&amp;Help</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
-        <source>&amp;Show toolbar</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
-        <source>&amp;Fullscreen mode</source>
-        <translation>&amp;Fullskjermmodus</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
-        <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
-        <source>Information about the BibleTime program</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation type="unfinished">Lagre &amp;økt</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>&amp;Opne økt</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
-        <source>&amp;Delete session</source>
-        <translation>&amp;Slett økt</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
-        <source>&amp;Arrangement mode</source>
-        <translation>&amp;Oppstillingsmodus</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
-        <source>&amp;Manual mode</source>
-        <translation>&amp;Manuell modus</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
-        <source>Auto-tile &amp;vertically</source>
-        <translation>Automatisk, vertikal &amp;flislegging</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
-        <source>Auto-tile &amp;horizontally</source>
-        <translation>Automatisk, horisontal f&amp;lislegging</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
-        <source>Auto-&amp;cascade</source>
-        <translation>Automatisk b&amp;ak kvarandre</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
-        <source>&amp;Cascade</source>
-        <translation>&amp;Bak kvarandre</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
-        <source>Tile &amp;vertically</source>
-        <translation>Flislegg &amp;vertikalt</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
-        <source>Tile &amp;horizontally</source>
-        <translation>Flislegg &amp;horisontalt</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
-        <source>Cl&amp;ose all windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
-        <source>Close all open windows inside BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
-        <source>&amp;Handbook</source>
-        <translation>&amp;Handbok</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
-        <source>&amp;Bible Study Howto</source>
-        <translation>Korleis studera &amp;Bibelen</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
-        <source>Please enter a name for the new session.</source>
-        <translation>Skriv inn namnet på den nye økta.</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
-        <source>Quit BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
-        <source>Toggle fullscreen mode of the main window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
-        <source>Search in &amp;open works...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
-        <source>Search in standard &amp;Bible...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
-        <source>Save as &amp;new session...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
-        <source>Create and save a new session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
-        <source>Manually arrange the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
-        <source>Automatically tile the open windows vertically (arrange side by side)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
-        <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
-        <source>Auto-&amp;tile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
-        <source>Automatically tile the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
-        <source>Ta&amp;bbed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
-        <source>Automatically tab the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
-        <source>Automatically cascade the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
-        <source>Cascade the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
-        <source>&amp;Tile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
-        <source>Tile the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
-        <source>Vertically tile (arrange side by side) the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
-        <source>Horizontally tile (arrange on top of each other) the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
-        <source>Close &amp;window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
-        <source>Close the current open window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
-        <source>&amp;Configure BibleTime...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
-        <source>Set BibleTime&apos;s preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
-        <source>Bookshelf &amp;Manager...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
-        <source>Configure your bookshelf and install/update/remove/index works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
-        <source>Open BibleTime&apos;s handbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
-        <source>&amp;Tip of the day...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
-        <source>Show tips about BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
-        <source>Toggle visibility of the bookshelf window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
-        <source>Toggle visibility of the bookmarks window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
-        <source>Toggle visibility of the mag window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
-        <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
-        <source>Navigation toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
-        <source>Works toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
-        <source>Tools toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
-        <source>Format toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
-        <source>Show main toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
-        <source>Show navigation bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
-        <source>Show works toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
-        <source>Show tools toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
-        <source>Show formatting toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
-        <source>Show bookshelf</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
-        <source>Show bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
-        <source>Show mag</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
-        <source>Toolbars</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
-        <source>Show toolbars in text windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
-        <source>Show parallel text headers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
-        <source>O&amp;pen windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
-        <source>Show &quot;Whats this widget&quot; dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
-        <source>Whats this widget?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
-        <source>Search in all works that are currently open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
-        <source>Search in the standard Bible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
-        <source>New Session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
-        <source>Initializing the SWORD engine...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
-        <source>Creating BibleTime&apos;s user interface...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
-        <source>Initializing menu- and toolbars...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
-        <source>Unlock Work</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
-        <source>Enter the unlock key for %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
-        <source>Warning: Invalid unlock key!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
-        <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
-        <source>&amp;About BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
-        <source>Bookmarks</source>
-        <translation type="unfinished">Bokmerke</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
-        <source>Mag</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BibleTimeApp</name>
-    <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
-        <source>Fatal error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtAboutDialog</name>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
-        <source>BibleTime is an easy to use but powerful Bible study tool.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="271"/>
-        <source>BibleTime is released under the GPL license. You can download and use the program for personal, private, public or commercial purposes without restrictions, but can give away or distribute the program only if you also distribute the corresponding source code.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="277"/>
-        <source>The complete legally binding license is below.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
-        <source>About BibleTime</source>
-        <translation type="unfinished">Om BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
-        <source>&amp;BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
-        <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
-        <source>&amp;Contributors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
-        <source>The following people contributed to BibleTime:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
-        <source>documentation and translation manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
-        <source>project manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
-        <source>tester</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
-        <source>usability expert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="220"/>
-        <source>Some names may be missing, please email %1 if you notice errors or omissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="237"/>
-        <source>BibleTime makes use of the SWORD Project. The SWORD Project is the CrossWire Bible Society&apos;s free Bible software project. Its purpose is to create cross-platform open-source tools &amp;mdash; covered by the GNU General Public License &amp;mdash; that allow programmers and Bible societies to write new Bible software more quickly and easily.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="243"/>
-        <source>The SWORD Project: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="251"/>
-        <source>&amp;Qt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="254"/>
-        <source>Qt toolkit version %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="260"/>
-        <source>More info...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="265"/>
-        <source>&amp;License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
-        <source>designer</source>
-        <translation>designar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
-        <source>developer</source>
-        <translation>utviklar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
-        <source>project founder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
-        <source>packager</source>
-        <translation>pakkar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
-        <source>creator of The Sword Project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
-        <source>domain sponsor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
-        <source>howto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
-        <source>artist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
-        <source>documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
-        <source>The following people translated BibleTime into their language:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="231"/>
-        <source>&amp;SWORD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="235"/>
-        <source>SWORD library version %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="256"/>
-        <source>This program uses Qt version %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="258"/>
-        <source>Qt is a cross-platform application and UI framework, created with C++ language. It has been released under the LGPL license.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtBibleKeyWidget</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
-        <source>Next book</source>
-        <translation type="unfinished">Neste bok</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
-        <source>Previous book</source>
-        <translation type="unfinished">Førre bok</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
-        <source>Next chapter</source>
-        <translation type="unfinished">Neste kapittel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
-        <source>Previous chapter</source>
-        <translation type="unfinished">Førre kapittel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
-        <source>Next verse</source>
-        <translation type="unfinished">Neste vers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
-        <source>Previous verse</source>
-        <translation type="unfinished">Førre vers</translation>
-    </message>
-</context>
-<context>
-    <name>BtBookDropdownChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="64"/>
-        <source>Select book</source>
-        <translation>Vel bok</translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfDockWidget</name>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="150"/>
-        <source>Bookshelf</source>
-        <translation type="unfinished">Bokhylle</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="152"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="153"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="154"/>
-        <source>&amp;Plain text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="155"/>
-        <source>&amp;HTML</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="156"/>
-        <source>&amp;Unlock...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="157"/>
-        <source>&amp;About...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="159"/>
-        <source>There are currently no works installed. Please click the button below to install new works.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="161"/>
-        <source>&amp;Install works...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="173"/>
-        <source>Warning: Module locked!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="174"/>
-        <source>You are trying to access an encrypted module. Please provide an unlock key in the following dialog to open the module.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="223"/>
-        <source>&amp;Search in %1...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfGroupingMenu</name>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
-        <source>Category/Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
-        <source>Category</source>
-        <translation type="unfinished">Kategori</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
-        <source>Language/Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
-        <source>Language</source>
-        <translation type="unfinished">Språk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
-        <source>No grouping</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfModel</name>
-    <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
-        <source>Module</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfWidget</name>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
-        <source>Fi&amp;lter:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
-        <source>Grouping</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
-        <source>Change the grouping of items in the bookshelf.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategori</translation>
-    </message>
-    <message>
-        <source>Language</source>
-        <translation type="obsolete">Språk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
-        <source>Show/hide works</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtChapterDropdownChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
-        <source>Select chapter</source>
-        <translation>Vel kapittel</translation>
-    </message>
-</context>
-<context>
-    <name>BtDisplaySettingsButton</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
-        <source>Use linebreaks after each verse</source>
-        <translation type="unfinished">Ny line etter kvart vers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">Vis versnummer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
-        <source>Show headings</source>
-        <translation type="unfinished">Vis overskrifter</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
-        <source>Highlight words of Jesus</source>
-        <translation type="unfinished">Markér Jesus-ord</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Vis hebraiske vokalpunkt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Vis hebraiske kantillasjonsteikn</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">Vis greske aksentteikn</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
-        <source>Use alternative textual variant</source>
-        <translation type="unfinished">Vis alternativ tekstvariant</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">Vis bibelske kryssreferansar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
-        <source>Show footnotes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">Vis morfemoppdeling</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
-        <source>Display settings</source>
-        <translation type="unfinished">Innstillingar for vising</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
-        <source>Display settings: No options available</source>
-        <translation type="unfinished">Innstillingar for vising: Ingen val tilgjengelege</translation>
-    </message>
-</context>
-<context>
-    <name>BtEditBookmarkDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
-        <source>Edit Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtFontChooserWidget</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
-        <source>Font name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="98"/>
-        <source>Font style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="99"/>
-        <source>Size:</source>
-        <translation type="unfinished">Storleik:</translation>
-    </message>
-</context>
-<context>
-    <name>BtFontSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
-        <source>&amp;Language:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
-        <source>The font selection below will apply to all texts in this language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
-        <source>Use custom font</source>
-        <translation type="unfinished">Bruk sjølvvald skrifttype</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
-        <source>Optionally specify a custom font for each language:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
-        <source>Fonts</source>
-        <translation type="unfinished">Skrifttypar</translation>
-    </message>
-</context>
-<context>
-    <name>BtIndexPage</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
-        <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
-        <source>Automatically delete orphaned indexes when BibleTime starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
-        <source>Delete the selected indexes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
-        <source>Delete</source>
-        <translation>Slett</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
-        <source>Create new indexes for the selected works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
-        <source>Work</source>
-        <translation>Verk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
-        <source>Index size</source>
-        <translation type="unfinished">Indonesisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
-        <source>%1 KiB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
-        <source>0 KiB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
-        <source>Search Indexes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
-        <source>Indexed Works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
-        <source>Unindexed Works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KiB</source>
-        <translation type="obsolete">
-            </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
-        <source>Create...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallModuleChooserDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="64"/>
-        <source>Install/Update works?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="67"/>
-        <source>Do you really want to install these works?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="68"/>
-        <source>Only one version of a work can be installed at the same time. Select only one if there are items marked with red.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallModuleChooserDialogModel</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
-        <source>Work</source>
-        <translation type="unfinished">Verk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
-        <source>Installation source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
-        <source>Version</source>
-        <translation type="unfinished">Versjon</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPage</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="263"/>
-        <source>Install/Update</source>
-        <translation>Installer/Oppdater</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="265"/>
-        <source>WARNING!!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="266"/>
-        <source>If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="269"/>
-        <source>Select installation &amp;source:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="270"/>
-        <source>&amp;Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="271"/>
-        <source>Add new source</source>
-        <translation type="unfinished">Legg til ei ny kjelde</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="272"/>
-        <source>&amp;Delete...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="273"/>
-        <source>Delete this source</source>
-        <translation type="unfinished">Fjern denne kjelda</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="275"/>
-        <source>Select &amp;works to install:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="277"/>
-        <source>Install &amp;folder:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="278"/>
-        <source>The folder where the new works will be installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="279"/>
-        <source>Configure folders where works are installed and found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="280"/>
-        <source>&amp;Install...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="254"/>
-        <source>Start installation of %1 works from %2 sources:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="258"/>
-        <source>Start installation:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="313"/>
-        <source>Warning</source>
-        <translation type="unfinished">Ã…tvaring</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="313"/>
-        <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
-        <source>Delete Source?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
-        <source>Do you really want to delete this source?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install...</source>
-        <translation type="obsolete">Installer...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="281"/>
-        <source>Install or update selected works</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPageModel</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
-        <source>Work</source>
-        <translation type="unfinished">Verk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
-        <source>Version</source>
-        <translation type="unfinished">Versjon</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPageWorksWidget</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp" line="68"/>
-        <source>Refresh the list of works from this source</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPathDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
-        <source>Bookshelf Folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
-        <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
-        <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
-        <source>Configure bookshelf folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
-        <source>Configuration file for the folders is: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
-        <source>Folders where new works can be installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
-        <source>Read-only folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
-        <source>Nonexistent folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
-        <source>&amp;Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
-        <source>Add new folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
-        <source>&amp;Edit...</source>
-        <translation>Rediger...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
-        <source>Edit the selected folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
-        <source>&amp;Remove</source>
-        <translation>Fjern</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
-        <source>Remove the selected folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
-        <source>This default folder in your home directory can&apos;t be removed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
-        <source>Choose Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
-        <source>Use Folder?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
-        <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallProgressDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
-        <source>Work</source>
-        <translation type="unfinished">Verk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
-        <source>Progress</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>Stopp</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
-        <source>Stop All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
-        <source>Completed</source>
-        <translation>Ferdig</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>Avbroten</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
-        <source>Waiting for turn...</source>
-        <translation>Ventar på tur...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
-        <source>Preparing install...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
-        <source>Install Progress</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
-        <source>Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtLanguageSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
-        <source>Language for names of Bible books:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
-        <source>Languages</source>
-        <translation type="unfinished">Språk</translation>
-    </message>
-</context>
-<context>
-    <name>BtModuleChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="76"/>
-        <source>Select a work [%1]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="79"/>
-        <source>Select an additional work</source>
-        <translation type="unfinished">Vel eit tilleggsverk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="102"/>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="130"/>
-        <source>NONE</source>
-        <translation type="unfinished">INGEN</translation>
-    </message>
-</context>
-<context>
-    <name>BtModuleIndexDialog</name>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="33"/>
-        <source>Preparing to index modules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="33"/>
-        <source>Cancel</source>
-        <translation type="unfinished">Avbryt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="37"/>
-        <source>Creating indices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="67"/>
-        <source>Creating index for work: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtModuleManagerDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
-        <source>Bookshelf Manager</source>
-        <translation>Bokhyllehandsamar</translation>
-    </message>
-</context>
-<context>
-    <name>BtOpenWorkAction</name>
-    <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
-        <source>&amp;Open work</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtOpenWorkActionMenu</name>
-    <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
-        <source>&amp;Grouping order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
-        <source>Sets the grouping order for the items in this menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtRefreshProgressDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="15"/>
-        <source>Refreshing source %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="16"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="17"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="47"/>
-        <source>Warning</source>
-        <translation type="unfinished">Ã…tvaring</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="48"/>
-        <source>Failed to refresh source %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtRemovePage</name>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">Fjern</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
-        <source>Select &amp;works to uninstall:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
-        <source>&amp;Remove...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
-        <source>Start removal of %1 works:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
-        <source>Start removal:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
-        <source>You selected the following work(s): </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
-        <source>Do you really want to remove them from your system?</source>
-        <translation type="unfinished">Vil du verkeleg fjerne dei frå systemet ditt?</translation>
-    </message>
-    <message>
-        <source>Remove...</source>
-        <translation type="obsolete">Fjern...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
-        <source>Remove the selected works</source>
-        <translation type="unfinished">Fjern dei valde verka</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
-        <source>Remove Works?</source>
-        <translation>Fjern verk?</translation>
-    </message>
-</context>
-<context>
-    <name>BtRemovePageTreeModel</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp" line="52"/>
-        <source>Work</source>
-        <translation type="unfinished">Verk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp" line="55"/>
-        <source>Install path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtSearchModuleChooserDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
-        <source>Works to Search in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
-        <source>Select the works which should be searched.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtShortcutsDialog</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="26"/>
-        <source>Configure shortcuts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="35"/>
-        <source>Select first or second shortcut and type the shortcut with keyboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="37"/>
-        <source>First shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="42"/>
-        <source>Second shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtShortcutsEditor</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="180"/>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="187"/>
-        <source>Select to change key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
-        <source>Action
-name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
-        <source>First
-shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
-        <source>Second
-shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="253"/>
-        <source>Shortcut for selected action name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="259"/>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="264"/>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="269"/>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="284"/>
-        <source>Default key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceArea</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">Verk</translation>
-    </message>
-    <message>
-        <source>Delete this source</source>
-        <translation type="obsolete">Fjern denne kjelda</translation>
-    </message>
-    <message>
-        <source>Add new source</source>
-        <translation type="obsolete">Legg til ei ny kjelde</translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceAreaModel</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">Verk</translation>
-    </message>
-    <message>
-        <source>Version</source>
-        <translation type="obsolete">Versjon</translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceWidget</name>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Avbryt</translation>
-    </message>
-    <message>
-        <source>Local:</source>
-        <translation type="obsolete">Lokal:</translation>
-    </message>
-    <message>
-        <source>Warning</source>
-        <translation type="obsolete">Ã…tvaring</translation>
-    </message>
-</context>
-<context>
-    <name>BtTextFiltersTab</name>
-    <message>
-        <source>Insert line break after each verse</source>
-        <translation type="obsolete">Ny line etter kvart vers</translation>
-    </message>
-    <message>
-        <source>Show verse numbers</source>
-        <translation type="obsolete">Vis versnummer</translation>
-    </message>
-    <message>
-        <source>Show section headings</source>
-        <translation type="obsolete">Vis avsnittsoverskrifter</translation>
-    </message>
-    <message>
-        <source>Show scripture cross-references</source>
-        <translation type="obsolete">Vis bibelske kryssreferansar</translation>
-    </message>
-    <message>
-        <source>Show Greek accents</source>
-        <translation type="obsolete">Vis greske aksentteikn</translation>
-    </message>
-    <message>
-        <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">Vis hebraiske vokalpunkt</translation>
-    </message>
-    <message>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">Vis hebraiske kantillasjonsteikn</translation>
-    </message>
-    <message>
-        <source>Show morph segmentation</source>
-        <translation type="obsolete">Vis morfemoppdeling</translation>
-    </message>
-    <message>
-        <source>Use textual variants</source>
-        <translation type="obsolete">Bruk tekstvariantar</translation>
-    </message>
-</context>
-<context>
-    <name>BtTextWindowHeaderWidget</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
-        <source>Add/remove/replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">Fjern</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
-        <source>Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtTipDialog</name>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
-        <source>Tip Of The Day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
-        <source>Show tips at startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
-        <source>Next Tip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
-        <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
-        <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
-        <source>To learn more about the BibleTime project please go to our web site.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
-        <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
-        <source>Select the icon again to stop the synchronization.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
-        <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
-        <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
-        <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
-        <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
-        <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
-        <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
-        <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
-        <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
-        <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtVerseDropdownChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="106"/>
-        <source>Select verse</source>
-        <translation>Vel vers</translation>
-    </message>
-</context>
-<context>
-    <name>CAcceleratorSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
-        <source>Choose action group:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
-        <source>Main Window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
-        <source>All text windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
-        <source>Bible windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
-        <source>Commentary windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
-        <source>Lexicon windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
-        <source>Book windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
-        <source>
-   &quot;%1&quot; in the &quot;%2&quot; group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
-        <source>Shortcuts</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CBibleReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
-        <source>Next book</source>
-        <translation>Neste bok</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
-        <source>Previous book</source>
-        <translation>Førre bok</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
-        <source>Next chapter</source>
-        <translation>Neste kapittel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
-        <source>Previous chapter</source>
-        <translation>Førre kapittel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
-        <source>Next verse</source>
-        <translation>Neste vers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
-        <source>Previous verse</source>
-        <translation>Førre vers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
-        <source>Copy chapter</source>
-        <translation>Kopier kapittel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
-        <source>Save chapter as plain text</source>
-        <translation>Lagre kapittel som rein tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
-        <source>Save chapter as HTML</source>
-        <translation>Lagre kapittel som HTML</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
-        <source>Print chapter</source>
-        <translation>Skriv ut kapittel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
-        <source>Text of reference</source>
-        <translation>Referansetekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
-        <source>Reference with text</source>
-        <translation>Referanse med tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
-        <source>Bible window</source>
-        <translation>Bibelvindauge</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
-        <source>Copy...</source>
-        <translation>Kopier...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
-        <source>Save...</source>
-        <translation>Lagre...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
-        <source>Print...</source>
-        <translation>Skriv ut ...</translation>
-    </message>
-    <message>
-        <source>Copy chapter to clipboard ...</source>
-        <translation type="obsolete">Kopier kapittel til utklippstavla ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
-        <source>Copying</source>
-        <translation>Kopierer</translation>
-    </message>
-    <message>
-        <source>Saving chapter ...</source>
-        <translation type="obsolete">Lagrar kapittel...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
-        <source>Saving</source>
-        <translation>Lagrar</translation>
-    </message>
-</context>
-<context>
-    <name>CBookReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
-        <source>Toggle tree view</source>
-        <translation>Skru på/av trevising</translation>
-    </message>
-</context>
-<context>
-    <name>CBookmarkIndex</name>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
-        <source>Bookmarks</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
-        <source>New folder</source>
-        <translation>Ny mappe</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
-        <source>Rename folder</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
-        <source>Delete Items</source>
-        <translation>Slett element</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
-        <source>Do you really want to delete the selected items and child-items?</source>
-        <translation>Vil du verkeleg sletta valde dei valde elementa og alt som ligg under dei?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
-        <source>The work to which the bookmark points to is not installed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
-        <source>Print bookmarks...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
-        <source>Remove selected items...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
-        <source>Import to folder...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
-        <source>Edit bookmark...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
-        <source>Sort folder bookmarks...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
-        <source>Sort all bookmarks...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
-        <source>Export from folder...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
-        <source>Can drop only bookmarks or one folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
-        <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
-        <source>Copy</source>
-        <translation>Kopier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
-        <source>Move</source>
-        <translation>Flytt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
-        <source>Drag references from text views to this view</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CCommentaryReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
-        <source>Next book</source>
-        <translation>Neste bok</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
-        <source>Previous book</source>
-        <translation>Førre bok</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
-        <source>Next chapter</source>
-        <translation>Neste kapittel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
-        <source>Previous chapter</source>
-        <translation>Førre kapittel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
-        <source>Next verse</source>
-        <translation>Neste vers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
-        <source>Previous verse</source>
-        <translation>Førre vers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
-        <source>Synchronize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
-        <source>Synchronize the displayed entry of this work with the active Bible window</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CConfigurationDialog</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
-        <source>Configure BibleTime</source>
-        <translation>Set opp BibleTime</translation>
-    </message>
-</context>
-<context>
-    <name>CDisplaySettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
-        <source>Display templates</source>
-        <translation>Visingsmalar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
-        <source>Available display styles:</source>
-        <translation>Tilgjengelege visingsmalar:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
-        <source>Style preview</source>
-        <translation>Førehandsvising av stil:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
-        <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
-        <translation>For så elska Gud verda at han gav Son sin, den einborne, så kvar den som trur på han, ikkje skal gå fortapt, men ha evig liv.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
-        <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
-        <translation>For Gud sende ikkje Son til verda for å døma verda, men for at verda skulle verta frelst ved han.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
-        <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
-        <translation>Den som trur på han, vert ikkje dømd. Den som ikkje trur, er alt dømd, av di han ikkje har trudd på namnet å Guds einborne Son.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
-        <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
-        <translation>For kvar den som gjer det vonde, hatar ljoset og kjem ikkje til ljoset, så ikkje gjerningane hans skal verta refsa.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
-        <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
-        <translation>Men den som gjer etter sanninga, kjem til ljoset, så gjerningane hans kan koma for dagen, for dei er gjorde i Gud.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
-        <source>Display templates define how text is displayed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
-        <source>Show the BibleTime logo on startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
-        <source>Show startup logo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
-        <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
-        <source>Display</source>
-        <translation type="unfinished">Utsjånad</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="193"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>CDisplayWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
-        <source>Back in history</source>
-        <translation>Tilbake i historia</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
-        <source>Forward in history</source>
-        <translation>Framover i historia</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
-        <source>Select all</source>
-        <translation>Vel alle</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
-        <source>Copy</source>
-        <translation>Kopier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
-        <source>Find...</source>
-        <translation>Finn...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
-        <source>Change location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
-        <source>Search with works of this window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
-        <source>Work chooser buttons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
-        <source>Text area header</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
-        <source>Navigation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
-        <source>Tool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CFontChooser</name>
-    <message>
-        <source>Size:</source>
-        <translation type="obsolete">Storleik:</translation>
-    </message>
-</context>
-<context>
-    <name>CHTMLWriteDisplay</name>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
-        <source>Bold</source>
-        <translation>Halvfeit</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
-        <source>Italic</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
-        <source>Underline</source>
-        <translation>Understreka</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
-        <source>Left</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
-        <source>Center</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
-        <source>Right</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
-        <source>Font</source>
-        <translation type="unfinished">Skrifttype</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
-        <source>Font color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
-        <source>Align left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
-        <source>Align right</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CHTMLWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
-        <source>Module not writable</source>
-        <translation>
-            </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
-        <source>Module is not writable.</source>
-        <translation>
-            </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
-        <source>Either the module may not be edited, or you do not have write permission.</source>
-        <translation>
-            </translation>
-    </message>
-</context>
-<context>
-    <name>CKeyReferenceWidget</name>
-    <message>
-        <source>Next book</source>
-        <translation type="obsolete">Neste bok</translation>
-    </message>
-    <message>
-        <source>Previous book</source>
-        <translation type="obsolete">Førre bok</translation>
-    </message>
-    <message>
-        <source>Next chapter</source>
-        <translation type="obsolete">Neste kapittel</translation>
-    </message>
-    <message>
-        <source>Previous chapter</source>
-        <translation type="obsolete">Førre kapittel</translation>
-    </message>
-    <message>
-        <source>Next verse</source>
-        <translation type="obsolete">Neste vers</translation>
-    </message>
-    <message>
-        <source>Previous verse</source>
-        <translation type="obsolete">Førre vers</translation>
-    </message>
-</context>
-<context>
-    <name>CLanguageSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/clanguagesettings.cpp" line="297"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>CLexiconKeyChooser</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
-        <source>Entries of the current work</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
-        <source>Next entry</source>
-        <translation type="unfinished">Neste oppføring</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
-        <source>Previous entry</source>
-        <translation type="unfinished">Førre oppføring</translation>
-    </message>
-</context>
-<context>
-    <name>CLexiconReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
-        <source>Next entry</source>
-        <translation>Neste oppføring</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
-        <source>Previous entry</source>
-        <translation>Førre oppføring</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
-        <source>Copy reference only</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
-        <source>Save entry as HTML</source>
-        <translation>Lagre oppføring som HTML</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
-        <source>Print reference only</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
-        <source>Strong&apos;s Search</source>
-        <translation>Strong-tal</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
-        <source>Entry with text</source>
-        <translation>Oppføring med tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
-        <source>Entry as plain text</source>
-        <translation>Oppføring som rein tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
-        <source>Lexicon window</source>
-        <translation>Leksikonvindauge</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
-        <source>Copy...</source>
-        <translation>Kopier...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
-        <source>Save...</source>
-        <translation>Lagre...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
-        <source>Print...</source>
-        <translation>Skriv ut ...</translation>
-    </message>
-    <message>
-        <source>Saving entry ...</source>
-        <translation type="obsolete">Lagrar oppføring ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
-        <source>Saving</source>
-        <translation>Lagrar</translation>
-    </message>
-</context>
-<context>
-    <name>CModuleIndexDialog</name>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Avbryt</translation>
-    </message>
-</context>
-<context>
-    <name>CPlainWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
-        <source>Sync with active Bible</source>
-        <translation>Synkroniser med aktiv bibel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
-        <source>Save text</source>
-        <translation>Lagre tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
-        <source>Delete current entry</source>
-        <translation>Slett gjeldande oppføring</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
-        <source>Restore original text</source>
-        <translation>Gjenopprett opphavleg tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
-        <source>Module not writable</source>
-        <translation>
-            </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
-        <source>Module is not writable.</source>
-        <translation>
-            </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
-        <source>Either the module may not be edited, or you do not have write permission.</source>
-        <translation>
-            </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
-        <source>Synchronize (show the same verse) with the active Bible window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
-        <source>Delete current entry (no undo)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
-        <source>Restore original text, new text will be lost</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CSearchAnalysisScene</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>Save Search Analysis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
-        <source>BibleTime Search Analysis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
-        <source>Book</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
-        <source>Total hits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
-        <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CSwordModuleInfo</name>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
-        <source>Version</source>
-        <translation>Versjon</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
-        <source>unknown</source>
-        <translation>ukjend</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
-        <source>Markup</source>
-        <translation>Merking</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
-        <source>Location</source>
-        <translation>Stad</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
-        <source>Language</source>
-        <translation>Språk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
-        <source>Category</source>
-        <translation>Kategori</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
-        <source>LCSH</source>
-        <translation>LCSH</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
-        <source>Writable</source>
-        <translation>Skrivbar</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
-        <source>yes</source>
-        <translation>ja</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
-        <source>no</source>
-        <translation>nei</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
-        <source>Unlock key</source>
-        <translation>Nøkkel</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
-        <source>Features</source>
-        <translation>Funksjonar</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
-        <source>Take care, this work contains cult / questionable material!</source>
-        <translation>Ã…tvaring: Dette verket kan innehalde sekterisk eller tvilsamt materiale!</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
-        <source>About</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
-        <source>Distribution license</source>
-        <translation>Distribusjonslisens</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
-        <source>Distribution source</source>
-        <translation>Distribusjonskjelde</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
-        <source>Distribution notes</source>
-        <translation>Kommentarar til distribusjonen</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
-        <source>Text source</source>
-        <translation>Tekstkjelde</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
-        <source>Copyright notes</source>
-        <translation>Kopirett</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
-        <source>Copyright holder</source>
-        <translation>Innehavar av kopirett</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
-        <source>Copyright date</source>
-        <translation>Dato for kopirett</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
-        <source>Copyright contact name</source>
-        <translation>Kontaktnamn for kopirett</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
-        <source>Copyright contact address</source>
-        <translation>Kontaktadresse for kopirett</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
-        <source>Copyright contact email</source>
-        <translation>Epostadresse for kopirett</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
-        <source>Bibles</source>
-        <translation type="unfinished">Biblar</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
-        <source>Commentaries</source>
-        <translation type="unfinished">Kommentarar</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
-        <source>Books</source>
-        <translation type="unfinished">Bøker</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
-        <source>Cults/Unorthodox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
-        <source>Maps and Images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
-        <source>Daily Devotionals</source>
-        <translation type="unfinished">Andaktsbøker</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
-        <source>Lexicons and Dictionaries</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
-        <source>Glossaries</source>
-        <translation type="unfinished">Ordbøker</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CSwordSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
-        <source>Standard works</source>
-        <translation>Standardverk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
-        <source>Text filters</source>
-        <translation>Tekstfilter</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
-        <source>Desk</source>
-        <translation type="unfinished">Skrivebord</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="359"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>CSwordSetupInstallSourcesDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
-        <source>Caption</source>
-        <translation type="unfinished">Skildring</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
-        <source>Type</source>
-        <translation type="unfinished">Type</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
-        <source>Server</source>
-        <translation type="unfinished">Tenar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
-        <source>Path</source>
-        <translation type="unfinished">Filbane</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
-        <source>Get list...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
-        <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
-
-Do you want to continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
-        <source>Get source list from remote server?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
-        <source>Cancel</source>
-        <translation type="unfinished">Avbryt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
-        <source>Downloading List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
-        <source>Refreshing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
-        <source>Download a list of sources from CrossWire server and add sources</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <source>Please provide a caption.</source>
-        <translation type="unfinished">Ver venleg og skriv inn ei skildring.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
-        <source>A source with this caption already exists. Please provide a different caption.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <source>Please provide a server name.</source>
-        <translation type="unfinished">Ver venleg og oppgje namnet på ein tenar.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <source>Please provide a valid, readable path.</source>
-        <translation type="unfinished">Ver venleg og oppgje ein gyldig, lesbar filbane.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
-        <source>Please provide a path.</source>
-        <translation type="unfinished">Ver venleg og oppgje ein filbane.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
-        <source>New  Installation Source</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>Lagra teksten før du lukkar?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>Lagra endra tekst?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InfoDisplay::CInfoDisplay</name>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
-        <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
-        <source>Abbreviation</source>
-        <translation>Forkorting</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
-        <source>Cross references</source>
-        <translation>Kryssreferansar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
-        <source>Footnote</source>
-        <translation>Fotnotar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
-        <source>Strongs</source>
-        <translation>Strong-tal</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
-        <source>Morphology</source>
-        <translation>Morfologi</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
-        <source>Word lookup</source>
-        <translation>Slå opp ord</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
-        <source>Copy</source>
-        <translation>Kopier</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
-        <source>Select all</source>
-        <translation type="unfinished">Vel alle</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
-        <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QCoreApplication</name>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
-        <source>Indexing aborted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <source>An internal error occurred while building the index: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
-        <source>An internal error occurred while building the index.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
-        <source>Search aborted</source>
-        <translation type="unfinished">Søket vart avbrote</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
-        <source>An internal error occurred while executing your search.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="126"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="240"/>
-        <source>Commentaries</source>
-        <translation>Kommentarar</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="127"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="246"/>
-        <source>Cults/Unorthodox</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="128"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="245"/>
-        <source>Maps and Images</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="129"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="244"/>
-        <source>Daily Devotionals</source>
-        <translation>Andaktsbøker</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="130"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="242"/>
-        <source>Lexicons and Dictionaries</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
-        <source>Bibles</source>
-        <translation>Biblar</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="132"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="243"/>
-        <source>Glossaries</source>
-        <translation>Ordbøker</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="133"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="241"/>
-        <source>Books</source>
-        <translation>Bøker</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
-        <source>Added text</source>
-        <translation>Tillagt tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
-        <source>Names of languages</source>
-        <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
-        <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
-        <source>Afrikaans</source>
-        <extracomment>Language name af</extracomment>
-        <translation>Afrikaans</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
-        <source>Amuzgo, Guerrero</source>
-        <extracomment>Language name amu</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
-        <source>English, Old (ca.450-1100)</source>
-        <extracomment>Language name ang</extracomment>
-        <translation>Engelsk, gammal- (ca 450-1100)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
-        <source>Arabic</source>
-        <extracomment>Language name ar</extracomment>
-        <translation>Arabisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
-        <source>Azerbaijani</source>
-        <extracomment>Language name az</extracomment>
-        <translation>Aserbadsjansk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
-        <source>Azerbaijani, South</source>
-        <extracomment>Language name azb</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
-        <source>Belarusian</source>
-        <extracomment>Language name be</extracomment>
-        <translation>Kviterussisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
-        <source>Bulgarian</source>
-        <extracomment>Language name bg</extracomment>
-        <translation>Bulgarsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
-        <source>Breton</source>
-        <extracomment>Language name br</extracomment>
-        <translation>Bretonsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
-        <source>Bosnian</source>
-        <extracomment>Language name bs</extracomment>
-        <translation>Bosnisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
-        <source>Catalan</source>
-        <extracomment>Language name ca</extracomment>
-        <translation>Katalansk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
-        <source>Chinantec, Comaltepec</source>
-        <extracomment>Language name cco</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
-        <source>Cebuano</source>
-        <extracomment>Language name ceb</extracomment>
-        <translation>Cebuano</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
-        <source>Chamorro</source>
-        <extracomment>Language name ch</extracomment>
-        <translation>Chamorro</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
-        <source>Chontal, Highland Oaxaca</source>
-        <extracomment>Language name chd</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
-        <source>Chinantec, Quiotepec</source>
-        <extracomment>Language name chq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
-        <source>Chinantec, Ozumacu00edn</source>
-        <extracomment>Language name chz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
-        <source>Cakchiquel, Western</source>
-        <extracomment>Language name ckw</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
-        <source>Chinantec, Lalana</source>
-        <extracomment>Language name cnl</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
-        <source>Chinantec, Tepetotutla</source>
-        <extracomment>Language name cnt</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
-        <source>Coptic</source>
-        <extracomment>Language name cop</extracomment>
-        <translation>Koptisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
-        <source>Czech</source>
-        <extracomment>Language name cs</extracomment>
-        <translation>Tsjekkisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
-        <source>Chinantec, Sochiapan</source>
-        <extracomment>Language name cso</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
-        <source>Chol, Tila</source>
-        <extracomment>Language name cti</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
-        <source>Chatino, Western Highland</source>
-        <extracomment>Language name ctp</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
-        <source>Church Slavic</source>
-        <extracomment>Language name cu</extracomment>
-        <translation>Kyrkjeslavisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
-        <source>Welsh</source>
-        <extracomment>Language name cy</extracomment>
-        <translation>Walisisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
-        <source>Danish</source>
-        <extracomment>Language name da</extracomment>
-        <translation>Dansk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
-        <source>German</source>
-        <extracomment>Language name de</extracomment>
-        <translation>Tysk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
-        <source>Duruma</source>
-        <extracomment>Language name dug</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
-        <source>Greek, Modern (1453-)</source>
-        <extracomment>Language name el</extracomment>
-        <translation>Gresk, moderne (1453-)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
-        <source>English</source>
-        <extracomment>Language name en</extracomment>
-        <translation>Engelsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
-        <source>American English</source>
-        <extracomment>Language name en_US</extracomment>
-        <translation>Engelsk, Amerikansk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
-        <source>English, Middle (1100-1500)</source>
-        <extracomment>Language name enm</extracomment>
-        <translation>Engelsk, middelalder (1100-1500)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
-        <source>Esperanto</source>
-        <extracomment>Language name eo</extracomment>
-        <translation>Esperanto</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
-        <source>Spanish</source>
-        <extracomment>Language name es</extracomment>
-        <translation>Spansk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
-        <source>Estonian</source>
-        <extracomment>Language name et</extracomment>
-        <translation>Estisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
-        <source>Basque</source>
-        <extracomment>Language name eu</extracomment>
-        <translation>Baskisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
-        <source>Persian</source>
-        <extracomment>Language name fa</extracomment>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
-        <source>Finnish</source>
-        <extracomment>Language name fi</extracomment>
-        <translation>Finsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
-        <source>French</source>
-        <extracomment>Language name fr</extracomment>
-        <translation>Fransk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
-        <source>Frisian</source>
-        <extracomment>Language name fy</extracomment>
-        <translation>Frisisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
-        <source>Irish</source>
-        <extracomment>Language name ga</extracomment>
-        <translation>Irsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
-        <source>Gaelic (Scots)</source>
-        <extracomment>Language name gd</extracomment>
-        <translation>Gælisk (Skotsk)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
-        <source>Geez</source>
-        <extracomment>Language name gez</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
-        <source>Gothic</source>
-        <extracomment>Language name got</extracomment>
-        <translation>Gotisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
-        <source>Manx</source>
-        <extracomment>Language name gv</extracomment>
-        <translation>Manx</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
-        <source>Greek, Ancient (to 1453)</source>
-        <extracomment>Language name grc</extracomment>
-        <translation>Gresk, antikk (-1453)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
-        <source>Hebrew</source>
-        <extracomment>Language name he</extracomment>
-        <translation>Hebraisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
-        <source>Hausa</source>
-        <extracomment>Language name hau</extracomment>
-        <translation>Hausa</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
-        <source>Hawaiian</source>
-        <extracomment>Language name haw</extracomment>
-        <translation>Hawaisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
-        <source>Hindi</source>
-        <extracomment>Language name hi</extracomment>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
-        <source>Croatian</source>
-        <extracomment>Language name hr</extracomment>
-        <translation>Kroatisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
-        <source>Hungarian</source>
-        <extracomment>Language name hu</extracomment>
-        <translation>Ungarsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
-        <source>Huave, San Mateo Del Mar</source>
-        <extracomment>Language name huv</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
-        <source>Armenian</source>
-        <extracomment>Language name hy</extracomment>
-        <translation>Armensk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
-        <source>Indonesian</source>
-        <extracomment>Language name id</extracomment>
-        <translation>Indonesisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
-        <source>Icelandic</source>
-        <extracomment>Language name is</extracomment>
-        <translation>Islandsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
-        <source>Italian</source>
-        <extracomment>Language name it</extracomment>
-        <translation>Italiensk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
-        <source>Itzu00e1</source>
-        <extracomment>Language name itz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
-        <source>Ixil, San Juan Cotzal</source>
-        <extracomment>Language name ixl</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
-        <source>Japanese</source>
-        <extracomment>Language name ja</extracomment>
-        <translation>Japansk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
-        <source>Jacalteco, Eastern</source>
-        <extracomment>Language name jac</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
-        <source>Javanese, Caribbean</source>
-        <extracomment>Language name jvn</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
-        <source>Georgian</source>
-        <extracomment>Language name ka</extracomment>
-        <translation>Georgisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
-        <source>Korean</source>
-        <extracomment>Language name ko</extracomment>
-        <translation>Koreansk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
-        <source>Kurdish</source>
-        <extracomment>Language name ku</extracomment>
-        <translation>Kurdisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
-        <source>Kirghiz</source>
-        <extracomment>Language name ky</extracomment>
-        <translation>Kirgisisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
-        <source>Latin</source>
-        <extracomment>Language name la</extracomment>
-        <translation>Latin</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
-        <source>Lacandon</source>
-        <extracomment>Language name lac</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
-        <source>Lithuanian</source>
-        <extracomment>Language name lt</extracomment>
-        <translation>Litauisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
-        <source>Latvian</source>
-        <extracomment>Language name lv</extracomment>
-        <translation>Latvisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
-        <source>Malagasy</source>
-        <extracomment>Language name mg</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
-        <source>Maori</source>
-        <extracomment>Language name mi</extracomment>
-        <translation>Maori</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
-        <source>Mixe, Isthmus</source>
-        <extracomment>Language name mir</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
-        <source>Mixtec, Coatzospan</source>
-        <extracomment>Language name miz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
-        <source>Macedonian</source>
-        <extracomment>Language name mk</extracomment>
-        <translation>Makedonsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
-        <source>Mixtec, Silacayoapan</source>
-        <extracomment>Language name mks</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
-        <source>More</source>
-        <extracomment>Language name mos</extracomment>
-        <translation>Mòoré</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
-        <source>Malay</source>
-        <extracomment>Language name ms</extracomment>
-        <translation>Malayisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
-        <source>Maltese</source>
-        <extracomment>Language name mt</extracomment>
-        <translation>Maltesisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
-        <source>Low German; Low Saxon</source>
-        <extracomment>Language name nds</extracomment>
-        <translation>LÃ¥gtysk; LÃ¥gsaksisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
-        <source>Nepali</source>
-        <extracomment>Language name ne</extracomment>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
-        <source>Nahuatl, Guerrero</source>
-        <extracomment>Language name ngu</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
-        <source>Nahuatl, Northern Oaxaca</source>
-        <extracomment>Language name nhy</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
-        <source>Dutch</source>
-        <extracomment>Language name nl</extracomment>
-        <translation>Nederlandsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
-        <source>Norwegian Nynorsk</source>
-        <extracomment>Language name nn</extracomment>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
-        <source>Norwegian</source>
-        <extracomment>Language name no</extracomment>
-        <translation>Norsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
-        <source>Otomi, Queru00e9taro</source>
-        <extracomment>Language name otq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
-        <source>Papiamento</source>
-        <extracomment>Language name pap</extracomment>
-        <translation>Papiamento</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
-        <source>Polish</source>
-        <extracomment>Language name pl</extracomment>
-        <translation>Polsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
-        <source>Persian (Dari)</source>
-        <extracomment>Language name prs</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
-        <source>Portuguese</source>
-        <extracomment>Language name pt</extracomment>
-        <translation>Portugisisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
-        <source>Brasilian Portuguese</source>
-        <extracomment>Language name pt_BR</extracomment>
-        <translation>Brasiliansk-portugisisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
-        <source>Quichu00e9, West Central</source>
-        <extracomment>Language name qut</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
-        <source>Romanian</source>
-        <extracomment>Language name ro</extracomment>
-        <translation>Rumensk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
-        <source>Russian</source>
-        <extracomment>Language name ru</extracomment>
-        <translation>Russisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
-        <source>Scots</source>
-        <extracomment>Language name sco</extracomment>
-        <translation>Skotsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
-        <source>Slovak</source>
-        <extracomment>Language name sk</extracomment>
-        <translation>Slovakisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
-        <source>Slovenian</source>
-        <extracomment>Language name sl</extracomment>
-        <translation>Slovensk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
-        <source>Somali</source>
-        <extracomment>Language name so</extracomment>
-        <translation>Somalisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
-        <source>Albanian</source>
-        <extracomment>Language name sq</extracomment>
-        <translation>Albansk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
-        <source>Swedish</source>
-        <extracomment>Language name sv</extracomment>
-        <translation>Svensk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
-        <source>Swahili</source>
-        <extracomment>Language name sw</extracomment>
-        <translation>Swahili</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
-        <source>Syriac</source>
-        <extracomment>Language name syr</extracomment>
-        <translation>Syrisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
-        <source>Tamil</source>
-        <extracomment>Language name ta</extracomment>
-        <translation>Tamilsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
-        <source>Thai</source>
-        <extracomment>Language name th</extracomment>
-        <translation>Thailandsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
-        <source>Tagalog</source>
-        <extracomment>Language name tl</extracomment>
-        <translation>Tagalog</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
-        <source>Tswana</source>
-        <extracomment>Language name tn</extracomment>
-        <translation>Tswana</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
-        <source>Turkish</source>
-        <extracomment>Language name tr</extracomment>
-        <translation>Tyrkisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
-        <source>Tektiteko</source>
-        <extracomment>Language name ttc</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
-        <source>Tahitian</source>
-        <extracomment>Language name ty</extracomment>
-        <translation>Tahitisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
-        <source>Tzotzil, Zinacantu00e1n</source>
-        <extracomment>Language name tzz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
-        <source>Ukrainian</source>
-        <extracomment>Language name uk</extracomment>
-        <translation>Ukrainsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
-        <source>Orya</source>
-        <extracomment>Language name ury</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
-        <source>Uspanteco</source>
-        <extracomment>Language name usp</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
-        <source>Vietnamese</source>
-        <extracomment>Language name vi</extracomment>
-        <translation>Vietnamesisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
-        <source>Xhosa</source>
-        <extracomment>Language name xh</extracomment>
-        <translation>Xhosa</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
-        <source>Bavarian</source>
-        <extracomment>Language name bar</extracomment>
-        <translation>Bayersk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
-        <source>Lombard</source>
-        <extracomment>Language name lmo</extracomment>
-        <translation>Lombardisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
-        <source>Uma</source>
-        <extracomment>Language name ppk
-----------
-Language name ppk</extracomment>
-        <translation>Uma</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
-        <source>Sranan</source>
-        <extracomment>Language name srn</extracomment>
-        <translation>Sranan</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
-        <source>Yiddish</source>
-        <extracomment>Language name yi</extracomment>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
-        <source>Zapotec, San Juan Guelavu00eda</source>
-        <extracomment>Language name zab</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
-        <source>Zapotec, Mitla</source>
-        <extracomment>Language name zaw</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
-        <source>Chinese</source>
-        <extracomment>Language name zh</extracomment>
-        <translation>Kinesisk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
-        <source>Zapotec, Amatlu00e1n</source>
-        <extracomment>Language name zpo</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
-        <source>Zapotec, Zoogocho</source>
-        <extracomment>Language name zpq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
-        <source>Zapotec, Yalu00e1lag</source>
-        <extracomment>Language name zpu</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
-        <source>Zapotec, Chichicapan</source>
-        <extracomment>Language name zpv</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
-        <source>Zapotec, Southern Rincon</source>
-        <extracomment>Language name zsr</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
-        <source>Zapotec, Quioquitani-Quieru00ed</source>
-        <extracomment>Language name ztq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
-        <source>Zapotec, Yatee</source>
-        <extracomment>Language name zty</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
-        <source>Zulu</source>
-        <extracomment>Language name zu</extracomment>
-        <translation>Zulu</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
-        <source>Footnotes</source>
-        <translation>Fotnoter</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
-        <source>Strong&apos;s numbers</source>
-        <translation>Strong-tal</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
-        <source>Headings</source>
-        <translation>Overskrifter</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
-        <source>Morphological tags</source>
-        <translation>Morfologiske markørar</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
-        <source>Lemmas</source>
-        <translation>Lemma</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
-        <source>Hebrew vowel points</source>
-        <translation>Hebraiske vokalpunkt</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
-        <source>Hebrew cantillation marks</source>
-        <translation>Vis hebraiske kantillasjonsteikn</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
-        <source>Greek accents</source>
-        <translation>Greske aksentar</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
-        <source>Red letter words</source>
-        <translation>Ord i raudt</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
-        <source>Textual variants</source>
-        <translation>Tekstvariantar</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
-        <source>Scripture cross-references</source>
-        <translation>Bibelske kryssreferansar</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
-        <source>Morph segmentation</source>
-        <translation>Morfemoppdeling</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
-        <source>Local</source>
-        <translation>Lokalt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>Fjernkjelde</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Det gamle testamentet</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Mosebøkene/Toraen</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>Historie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Profetane</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>Det nye testamentet</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Evangelia</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>Breva</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Paulus-breva</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <source>HTML files</source>
-        <translation>HTML-filer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
-        <source>All files</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
-        <source>Text files</source>
-        <translation>Tekstfiler</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
-        <source>Save file</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
-        <source>Save document ...</source>
-        <translation>Lagre dokument...</translation>
-    </message>
-    <message>
-        <source>Print keys</source>
-        <translation type="obsolete">Skriv ut nøklar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <source>BibleTime bookmark files</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
-        <source>unknown</source>
-        <translation>ukjend</translation>
-    </message>
-    <message>
-        <source>Change description ...</source>
-        <translation type="obsolete">Endra skildring...</translation>
-    </message>
-    <message>
-        <source>Enter a new description for the chosen bookmark.</source>
-        <translation type="obsolete">Skriv inn ei ny skildring for vald bokmerke,</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
-        <source>New folder</source>
-        <translation>Ny mappe</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
-        <source>The file already exists.</source>
-        <translation>Denne fila eksisterer allereie.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
-        <source>Do you want to overwrite it?</source>
-        <translation>Ynskjer du å overskriva ho?</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
-        <source>Error</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>Fila kunne ikkje lagrast.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
-        <source>Please check permissions etc.</source>
-        <translation>Kontroller tilgangsløyve o.l.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
-        <source>Take care, this work contains cult / questionable material!</source>
-        <translation>Ã…tvaring: Dette verket kan innehalde sekterisk eller tvilsamt materiale!</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
-        <source>Version</source>
-        <translation>Versjon</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
-        <source>Encrypted - needs unlock key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
-        <source>Double click for more information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
-        <source>Updated version available!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
-        <source>Installed version</source>
-        <translation type="unfinished">Installert versjon</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
-        <source>Haitian Creole</source>
-        <extracomment>Language name ht</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
-        <source>Kekchu00ed</source>
-        <comment>kek</comment>
-        <extracomment>Language name kek</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
-        <source>(Multiple languages)</source>
-        <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
-        <source>Mam, Central</source>
-        <extracomment>Language name mvc</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
-        <source>Mam, Todos Santos Cuchumatu00e1n</source>
-        <extracomment>Language name mvj</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
-        <source>Mixe, Juquila</source>
-        <extracomment>Language name mxq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
-        <source>Mixtec, Jamiltepec</source>
-        <extracomment>Language name mxt</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
-        <source>Burmese</source>
-        <extracomment>Language name my</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
-        <source>Norwegian Bokmu00e5l</source>
-        <extracomment>Language name nb</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
-        <source>Nahuatl, Michoacu00e1n</source>
-        <extracomment>Language name ncl</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
-        <source>Potawatomi</source>
-        <extracomment>Language name pot</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
-        <source>Klingon</source>
-        <extracomment>Language name tlh</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
-        <source>Mixtec, Diuxi-Tilantongo</source>
-        <extracomment>Language name xtd</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
-        <source>Yoryba</source>
-        <extracomment>Language name yo</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
-        <source>Verb tense changed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
-        <source>Can&apos;t write file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
-        <source>The Sword config file can&apos;t be written!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
-        <source>Export Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
-        <source>Import bookmarks</source>
-        <translation type="unfinished">Importer bokmerke</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
-        <source>Overwrite File?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
-        <source>Parsing Strong&apos;s Numbers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
-        <source>This shortcut conflicts with the shortcut for the following actions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
-        <source>Do you want to clear the conflicting shortcuts and continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
-        <source>Indexed works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
-        <source>Unindexed works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="44"/>
-        <source>Show this help message and exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="47"/>
-        <source>Output BibleTime version and exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="50"/>
-        <source>Open a clean session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="53"/>
-        <source>Open the default Bible with the reference &lt;ref&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="56"/>
-        <source>For command-line arguments parsed by the Qt toolkit, see %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="103"/>
-        <source>Error: %1 expects an argument.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="106"/>
-        <source>See --help for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="111"/>
-        <source>Error: Invalid command-line argument: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
-        <source>CSS base template not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
-        <source>Default template &quot;%1&quot; not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
-        <source>Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPushButton</name>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
-        <source>OK</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
-        <source>Open</source>
-        <comment>Dialog Button</comment>
-        <translation>Opne</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
-        <source>Save</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished">Lagre</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
-        <source>Cancel</source>
-        <comment>Dialog Button</comment>
-        <translation>Avbryt</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
-        <source>Close</source>
-        <comment>Dialog Button</comment>
-        <translation>Lukk</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
-        <source>Discard</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
-        <source>Apply</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
-        <source>Reset</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
-        <source>Restore defaults</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
-        <source>Help</source>
-        <comment>Dialog Button</comment>
-        <translation>Hjelp</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
-        <source>Save All</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
-        <source>Yes</source>
-        <comment>Dialog Button</comment>
-        <translation>Ja</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
-        <source>Yes to all</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
-        <source>No</source>
-        <comment>Dialog Button</comment>
-        <translation>Nei</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
-        <source>No to all</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::BtSearchOptionsArea</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
-        <source>Search for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
-        <source>&amp;Search</source>
-        <translation type="unfinished">&amp;Søk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
-        <source>Start to search the text in the chosen works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
-        <source>Ch&amp;oose...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
-        <source>Choose works for the search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
-        <source>S&amp;etup...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
-        <source>All of the words (AND is added between the words)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
-        <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
-        <source>Scope:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
-        <source>The text you want to search for</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
-        <source>Works:</source>
-        <translation>Verk:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
-        <source>No search scope</source>
-        <translation type="unfinished">Tomt søkjeområde</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
-        <source>All words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
-        <source>Configure predefined scopes for search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
-        <source>Some words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
-        <source>Free</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
-        <source>Some of the words (OR is added between the words)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
-        <source>Full lucene syntax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
-        <source>Click the link to get help for search syntax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
-        <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::BtSearchResultArea</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
-        <source>Text of the selected search result item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
-        <source>Select all</source>
-        <translation type="unfinished">Vel alle</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
-        <source>Copy</source>
-        <translation type="unfinished">Kopier</translation>
-    </message>
-</context>
-<context>
-    <name>Search::BtSearchSyntaxHelpDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
-        <source>Search Syntax Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
-        <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
-        <source>Which words to find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
-        <source>Grouping and order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
-        <source>Wildcards (partial words)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
-        <source>Text fields (different parts of text)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
-        <source>Other syntax features</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
-        <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
-        <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
-        <source>jesus AND god</source>
-        <comment>Do not translate &quot;AND&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
-        <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
-        <source>jesus OR god</source>
-        <comment>Do not translate &quot;OR&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
-        <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
-        <source>jesus NOT god</source>
-        <comment>Do not translate &quot;NOT&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
-        <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
-        <source>+jesus -god</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
-        <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
-        <source>(a AND b) OR c</source>
-        <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
-        <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
-        <source>&quot;says lord&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
-        <source>&quot;says the lord&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
-        <source>Finds all verses with &apos;says the LORD&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
-        <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
-        <source>a*</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
-        <source>All words beginning with &apos;a&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
-        <source>a*a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
-        <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
-        <source>a?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
-        <source>&apos;at&apos; and &apos;an&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
-        <source>a??a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
-        <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
-        <source>Available text fields:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
-        <source>Searches headings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
-        <source>Searches footnotes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
-        <source>Searches Strong&apos;s numbers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
-        <source>Searches morphology codes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
-        <source>Examples:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
-        <source>heading:Jesus</source>
-        <comment>Do not translate &quot;heading:&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
-        <source>Finds headings with &apos;Jesus&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
-        <source>footnote:Jesus AND footnote:said</source>
-        <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
-        <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
-        <source>strong:G846</source>
-        <comment>Do not translate &quot;strong:&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
-        <source>Finds verses with Strong&apos;s Greek number 846</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
-        <source>morph:&quot;N-NSF&quot;</source>
-        <comment>Do not translate &quot;morph:&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
-        <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
-        <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::CModuleResultView</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="50"/>
-        <source>Work</source>
-        <translation>Verk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="50"/>
-        <source>Hits</source>
-        <translation>
-            </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="64"/>
-        <source>Copy...</source>
-        <translation>Kopier...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="66"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="76"/>
-        <source>Reference only</source>
-        <translation>Berre referansar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="69"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="79"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="86"/>
-        <source>Reference with text</source>
-        <translation>Referanse med tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="74"/>
-        <source>Save...</source>
-        <translation>Lagre...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="84"/>
-        <source>Print...</source>
-        <translation>Skriv ut ...</translation>
-    </message>
-    <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Kopier søkjeresultata...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
-        <source>Copying search result</source>
-        <translation>Kopierer søkjeresultat</translation>
-    </message>
-    <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Lagra søkjeresultata</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
-        <source>Saving search result</source>
-        <translation>Lagrar søkjeresultat</translation>
-    </message>
-    <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Skriv ut søkjeresultata...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
-        <source>Printing search result</source>
-        <translation>Skriv ut søkjeresultat</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="49"/>
-        <source>Works chosen for the search and the number of the hits in each work</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::CRangeChooserDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="136"/>
-        <source>S&amp;earch range:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="137"/>
-        <source>Select a scope from the list to edit the searchranges</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="148"/>
-        <source>&amp;Name:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="151"/>
-        <source>Edi&amp;t current range:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="152"/>
-        <source>Change the search ranges of the selected searchscope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="157"/>
-        <source>Parsed search range:</source>
-        <translation>Tolka søkjeområde:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="171"/>
-        <source>New range</source>
-        <translation>Nytt søkjeområde</translation>
-    </message>
-    <message>
-        <source>&lt;invalid name of search range&gt;</source>
-        <translation type="obsolete">&lt;invalid name of search range&gt;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="140"/>
-        <source>&amp;Add new scope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="141"/>
-        <source>Add a new search scope. First enter an appropriate name, then edit the search ranges.</source>
-        <translation type="unfinished">Legg til nytt søkjeområdet. Først skriv du inn eit passande namn, så redigerer du utvalsområda.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="145"/>
-        <source>Delete current &amp;scope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="146"/>
-        <source>Delete the selected search scope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="149"/>
-        <source>Change the name of the selected search scope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="obsolete">Rediger søkjeutvalet for det valde søkjeområdet. Ta ein kikk på eit førehandsdefinert søkjeområde for å sjå korleis utval blir laga.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="158"/>
-        <source>The search ranges which will be used for the search, parsed to the canonical form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="134"/>
-        <source>Setup Search Scopes</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::CSearchDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
-        <source>Missing indices</source>
-        <translation>
-            </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
-        <source>Search</source>
-        <translation>Søk</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
-        <source>The following modules need to be indexed before they can be searched in:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
-        <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
-        <source>Drag any verse reference onto an open Bible window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
-        <source>&amp;Analyze results...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
-        <source>Show a graphical analysis of the search result</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::CSearchResultView</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="39"/>
-        <source>Results</source>
-        <translation>
-            </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="47"/>
-        <source>Copy...</source>
-        <translation>Kopier...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="50"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="64"/>
-        <source>Reference only</source>
-        <translation>Berre referansar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="54"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="68"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="76"/>
-        <source>Reference with text</source>
-        <translation>Referanse med tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="61"/>
-        <source>Save...</source>
-        <translation>Lagre...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="73"/>
-        <source>Print...</source>
-        <translation>Skriv ut ...</translation>
-    </message>
-    <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Skriv ut søkjeresultata...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
-        <source>Printing search result</source>
-        <translation>Skriv ut søkjeresultat</translation>
-    </message>
-    <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Lagra søkjeresultata</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
-        <source>Saving search result</source>
-        <translation>Lagrar søkjeresultat</translation>
-    </message>
-    <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Kopier søkjeresultata...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
-        <source>Copying search result</source>
-        <translation>Kopierer søkjeresultat</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="38"/>
-        <source>Search result of the selected work</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StandardWorksTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>Bibel:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>Kommentar:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>Andaktsbok:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="62"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>TextFiltersTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation type="unfinished">Ny line etter kvart vers</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">Vis versnummer</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation type="unfinished">Vis avsnittsoverskrifter</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">Vis bibelske kryssreferansar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">Vis greske aksentteikn</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Vis hebraiske vokalpunkt</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Vis hebraiske kantillasjonsteikn</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">Vis morfemoppdeling</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation type="unfinished">Bruk tekstvariantar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>findTextDialog</name>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation type="unfinished">Finn tekst</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/messages/bibletime_ui_pl.ts b/i18n/messages/bibletime_ui_pl.ts
index e507646..ea9bef0 100644
--- a/i18n/messages/bibletime_ui_pl.ts
+++ b/i18n/messages/bibletime_ui_pl.ts
@@ -6,7 +6,7 @@
     <message>
         <source></source>
         <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
 This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
@@ -16,679 +16,685 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/btaboutmoduledialog.cpp" line="45"/>
         <source>Information About %1</source>
-        <translation>Informacje o %1</translation>
+        <translation>Informacja o %1</translation>
     </message>
 </context>
 <context>
     <name>BibleTime</name>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
+        <location filename="../../src/bibletime_init.cpp" line="741"/>
         <source>&amp;File</source>
-        <translation>Plik</translation>
+        <translation>&amp;Plik</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&amp;View</source>
-        <translation>Widok</translation>
+        <translation>&amp;Widok</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&amp;Search</source>
-        <translation type="unfinished">&amp;Szukaj</translation>
+        <translation>&amp;Szukaj</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&amp;Window</source>
         <translation>&amp;Okno</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <source>Sw&amp;itch session</source>
+        <translation>&amp;Przełącz sesję</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&amp;ttings</source>
-        <translation>Us&amp;tawienia</translation>
+        <translation>&amp;Ustawienia</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&amp;Help</source>
-        <translation>Pomoc</translation>
+        <translation>Po&amp;moc</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&amp;Show toolbar</source>
-        <translation>Pokaż pa&amp;sek narzędzi</translation>
+        <translation>&amp;Pokaż pasek narzędzi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&amp;Fullscreen mode</source>
-        <translation>Pełny ekran</translation>
+        <translation>&amp;Tryb pełnoekranowy</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&amp;Quit</source>
-        <translation>Zakończ</translation>
+        <translation>&amp;Zakończ</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
+        <location filename="../../src/bibletime_init.cpp" line="251"/>
         <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
-        <translation type="unfinished"></translation>
+        <translation>Otwórz poradnik Jak studiować Biblię z BibleTime.&lt;br/&gt;To jest wprowadzenie do poradnika efektywnego studiowania Biblii.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
+        <location filename="../../src/bibletime_init.cpp" line="256"/>
         <source>Information about the BibleTime program</source>
-        <translation>Informacje o programie BibleTime</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation type="unfinished">&amp;Zapisz obecny profil</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>&amp;Otwórz profil</translation>
+        <translation>Informacja o programie BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&amp;Delete session</source>
-        <translation>Skasuj profil</translation>
+        <translation>&amp;Usuń sesję</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&amp;Arrangement mode</source>
-        <translation>Widok okien</translation>
+        <translation>&amp;Tryb układania okien</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&amp;Manual mode</source>
-        <translation>Ręcznie podziel</translation>
+        <translation>T&amp;ryb manualny</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &amp;vertically</source>
-        <translation>Podziel automatycznie pionowo</translation>
+        <translation>Autoukładanie p&amp;ionowo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &amp;horizontally</source>
-        <translation>Podziel automatycznie poziomo</translation>
+        <translation>Autoukładanie p&amp;oziomo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&amp;cascade</source>
-        <translation>&amp;Automatycznie &quot;jedno na drugim&quot;</translation>
+        <translation>Automatycznie - &amp;kaskadowo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&amp;Cascade</source>
-        <translation>&quot;&amp;Jedno na drugim&quot;</translation>
+        <translation>&amp;Kaskadowo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &amp;vertically</source>
-        <translation>Podziel pionowo</translation>
+        <translation>Kafelki p&amp;ionowo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &amp;horizontally</source>
-        <translation>Podziel poziomo</translation>
+        <translation>Kafelki p&amp;oziomo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&amp;ose all windows</source>
-        <translation>Zamknij wszystkie &amp;okna</translation>
+        <translation>&amp;Zamknij wszystkie okna</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
+        <location filename="../../src/bibletime_init.cpp" line="224"/>
         <source>Close all open windows inside BibleTime</source>
-        <translation>Zamknij wszystkie otwarte okna wewnÄ…trz programu</translation>
+        <translation>Zamknij wszystkie otwarte okna w BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
+        <location filename="../../src/bibletime_init.cpp" line="241"/>
         <source>&amp;Handbook</source>
         <translation>&amp;Podręcznik</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&amp;Bible Study Howto</source>
-        <translation>&amp;Howto studiowania Biblii</translation>
+        <translation>&amp;Jak studiować Biblię</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
+        <location filename="../../src/bibletime_slots.cpp" line="533"/>
         <source>Please enter a name for the new session.</source>
-        <translation>Podaj nazwÄ™ nowego profilu</translation>
+        <translation>Wprowadź nazwę dla nowej sesji.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
+        <location filename="../../src/bibletime_slots.cpp" line="541"/>
+        <source>Session already exists</source>
+        <translation>Sesja już istnieje</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_slots.cpp" line="542"/>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation>Sesja o nazwie &quot;%1&quot; już istnieje. Wprowadź inną nazwę.</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="107"/>
         <source>Quit BibleTime</source>
         <translation>Zakończ BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
+        <location filename="../../src/bibletime_init.cpp" line="114"/>
         <source>Toggle fullscreen mode of the main window</source>
-        <translation type="unfinished">Przełącz</translation>
+        <translation>Przełącz główne okno w tryb pełnego ekranu</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
+        <location filename="../../src/bibletime_init.cpp" line="123"/>
         <source>Search in &amp;open works...</source>
-        <translation>Szukaj w &amp;otwartych modułach...</translation>
+        <translation>Wyszukaj w &amp;otwartych dziełach...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &amp;Bible...</source>
-        <translation>Szukaj w standardowym tekście...</translation>
+        <translation>Wyszukaj w standardowej &amp;Biblii...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &amp;new session...</source>
-        <translation>Zapisz jako &amp;nowy profil...</translation>
+        <translation>Zapisz sesjÄ™ jako &amp;nowÄ…...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
+        <location filename="../../src/bibletime_init.cpp" line="140"/>
         <source>Create and save a new session</source>
-        <translation>Utwórz i zapisz nowy profil</translation>
+        <translation>Utwórz i zapisz nową sesję</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
+        <location filename="../../src/bibletime_init.cpp" line="147"/>
         <source>Manually arrange the open windows</source>
-        <translation>Ręcznie ustaw otwarte okna</translation>
+        <translation>Ręczne rozmieszczenie okien</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
+        <location filename="../../src/bibletime_init.cpp" line="154"/>
         <source>Automatically tile the open windows vertically (arrange side by side)</source>
-        <translation>Automatycznie ustaw otwarte okna pionowo jedno obok drugiego</translation>
+        <translation>Automatyczne kafelki pionowo z otwartych okien (obok siebie)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
+        <location filename="../../src/bibletime_init.cpp" line="161"/>
         <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
-        <translation>Automatycznie ustaw otwarte okna poziomo jedno obok drugiego</translation>
+        <translation>Automatyczne kafelki pionowo z otwartych okien poziomo (jedno na drugim)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
+        <location filename="../../src/bibletime_init.cpp" line="165"/>
         <source>Auto-&amp;tile</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatycznie k&amp;afelki</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
+        <location filename="../../src/bibletime_init.cpp" line="168"/>
         <source>Automatically tile the open windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatycznie kafelki z otwartych okien</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
+        <location filename="../../src/bibletime_init.cpp" line="172"/>
         <source>Ta&amp;bbed</source>
-        <translation type="unfinished"></translation>
+        <translation>Na &amp;kartach</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
+        <location filename="../../src/bibletime_init.cpp" line="175"/>
         <source>Automatically tab the open windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatycznie na kartach otwarte okna</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
+        <location filename="../../src/bibletime_init.cpp" line="182"/>
         <source>Automatically cascade the open windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatycznie kaskadowo otwarte okna</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
+        <location filename="../../src/bibletime_init.cpp" line="189"/>
         <source>Cascade the open windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Kaskadowo otwarte okna</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
+        <location filename="../../src/bibletime_init.cpp" line="193"/>
         <source>&amp;Tile</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kafelki</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
+        <location filename="../../src/bibletime_init.cpp" line="196"/>
         <source>Tile the open windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Kafelki z otwartych okien</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
+        <location filename="../../src/bibletime_init.cpp" line="203"/>
         <source>Vertically tile (arrange side by side) the open windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Kafelki pionowo (ułóż obok siebie) otwarte okna</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
+        <location filename="../../src/bibletime_init.cpp" line="210"/>
         <source>Horizontally tile (arrange on top of each other) the open windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Kafelki poziomo (ułóż jeden na drugim) otwarte okna</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
+        <location filename="../../src/bibletime_init.cpp" line="214"/>
         <source>Close &amp;window</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamknij &amp;okno</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
+        <location filename="../../src/bibletime_init.cpp" line="217"/>
         <source>Close the current open window</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamknij aktualnie otwarte okno</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
+        <location filename="../../src/bibletime_init.cpp" line="228"/>
         <source>&amp;Configure BibleTime...</source>
-        <translation>Ustawienia BibleTime...</translation>
+        <translation>&amp;Ustawienia BibleTime...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime&apos;s preferences</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustaw opcje BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
+        <location filename="../../src/bibletime_init.cpp" line="234"/>
         <source>Bookshelf &amp;Manager...</source>
-        <translation>&amp;Menedżer modułów...</translation>
+        <translation>&amp;Menedżer Biblioteki...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
+        <location filename="../../src/bibletime_init.cpp" line="237"/>
         <source>Configure your bookshelf and install/update/remove/index works</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfigacja biblioteki i instalacja/aktualizacja/usuwanie/indeksy dzieł</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
+        <location filename="../../src/bibletime_init.cpp" line="244"/>
         <source>Open BibleTime&apos;s handbook</source>
         <translation>Otwórz podręcznik BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&amp;Tip of the day...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Porada dnia...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
+        <location filename="../../src/bibletime_init.cpp" line="263"/>
         <source>Show tips about BibleTime</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż porady o BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
+        <location filename="../../src/bibletime_init.cpp" line="402"/>
         <source>Toggle visibility of the bookshelf window</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż/ukryj bibliotekę</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
+        <location filename="../../src/bibletime_init.cpp" line="406"/>
         <source>Toggle visibility of the bookmarks window</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż/ukryj okno zakładek</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
+        <location filename="../../src/bibletime_init.cpp" line="410"/>
         <source>Toggle visibility of the mag window</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż/ukryj okno przypisów</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
+        <location filename="../../src/bibletime_init.cpp" line="735"/>
         <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Pasek główny</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
+        <location filename="../../src/bibletime_init.cpp" line="736"/>
         <source>Navigation toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Pasek nawigacji</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
+        <location filename="../../src/bibletime_init.cpp" line="737"/>
         <source>Works toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Pasek sesji</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
+        <location filename="../../src/bibletime_init.cpp" line="738"/>
         <source>Tools toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Pasek narzędzi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
+        <location filename="../../src/bibletime_init.cpp" line="739"/>
         <source>Format toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Pasek formatowania</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
+        <location filename="../../src/bibletime_init.cpp" line="777"/>
         <source>Show main toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż główny pasek narzędzi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
+        <location filename="../../src/bibletime_init.cpp" line="780"/>
         <source>Show navigation bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż pasek nawigacji</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
+        <location filename="../../src/bibletime_init.cpp" line="783"/>
         <source>Show works toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż pasek sesji</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
+        <location filename="../../src/bibletime_init.cpp" line="786"/>
         <source>Show tools toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż pasek narzędzi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
+        <location filename="../../src/bibletime_init.cpp" line="789"/>
         <source>Show formatting toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż pasek formatowania</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
+        <location filename="../../src/bibletime_init.cpp" line="792"/>
         <source>Show bookshelf</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż bibliotekę</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
+        <location filename="../../src/bibletime_init.cpp" line="795"/>
         <source>Show bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż zakładki</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
+        <location filename="../../src/bibletime_init.cpp" line="798"/>
         <source>Show mag</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż okno przypisów</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
+        <location filename="../../src/bibletime_init.cpp" line="743"/>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation>Paski narzędzi</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <location filename="../../src/bibletime_init.cpp" line="774"/>
         <source>Show toolbars in text windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż paski narzędzi w oknach</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
+        <location filename="../../src/bibletime_init.cpp" line="801"/>
         <source>Show parallel text headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż menu wyboru dla otwartych dzieł</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
+        <location filename="../../src/bibletime_init.cpp" line="747"/>
         <source>O&amp;pen windows</source>
-        <translation type="unfinished"></translation>
+        <translation>O&amp;twarte okna</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show &quot;Whats this widget&quot; dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż okno dialogowe &quot;Co to za widżet&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
+        <location filename="../../src/bibletime_init.cpp" line="954"/>
         <source>Whats this widget?</source>
-        <translation type="unfinished"></translation>
+        <translation>Co to za widżet?</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
+        <location filename="../../src/bibletime_init.cpp" line="126"/>
         <source>Search in all works that are currently open</source>
-        <translation>Szukaj we wszystkich otwartych modułach</translation>
+        <translation>Wyszukaj we wszystkich dziełach aktualnie otwartych</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
+        <location filename="../../src/bibletime_init.cpp" line="133"/>
         <source>Search in the standard Bible</source>
-        <translation>Szukaj w standardowym tekście</translation>
+        <translation>Wyszukaj w standardowej Biblii</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
+        <location filename="../../src/bibletime_slots.cpp" line="532"/>
         <source>New Session</source>
-        <translation>Nowy profil</translation>
+        <translation>Nowa sesja</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
+        <location filename="../../src/bibletime.cpp" line="77"/>
         <source>Initializing the SWORD engine...</source>
-        <translation>Inicjalizacja silkika SWORD...</translation>
+        <translation>Inicjalizowanie silnika SWORD...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
+        <location filename="../../src/bibletime.cpp" line="85"/>
         <source>Creating BibleTime&apos;s user interface...</source>
         <translation>Tworzenie interfejsu BibleTime...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
+        <location filename="../../src/bibletime.cpp" line="92"/>
         <source>Initializing menu- and toolbars...</source>
-        <translation>Inicjalizacja menu i pasków narzędzi...</translation>
+        <translation>Inicjalizowanie menu i pasków narzędzi...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Unlock Work</source>
-        <translation type="unfinished">Odblokuj moduł</translation>
+        <translation>Odblokuj sesjÄ™</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Enter the unlock key for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wprowadź klucz odblokowujący dla %1.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
+        <location filename="../../src/bibletime.cpp" line="214"/>
         <source>Warning: Invalid unlock key!</source>
-        <translation type="unfinished"></translation>
+        <translation>Ostrzeżenie: Niewłaściwy klawisz blokady!</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
+        <location filename="../../src/bibletime.cpp" line="215"/>
         <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wprowadzony klucz jest nieprawidłowy. Spróbuj jeszcze raz.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
+        <location filename="../../src/bibletime_init.cpp" line="255"/>
         <source>&amp;About BibleTime</source>
-        <translation>O programie BibleTime</translation>
+        <translation>&amp;O BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
+        <location filename="../../src/bibletime_init.cpp" line="733"/>
         <source>Bookmarks</source>
         <translation>Zakładki</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
+        <location filename="../../src/bibletime_init.cpp" line="734"/>
         <source>Mag</source>
-        <translation type="unfinished"></translation>
+        <translation>Lupa</translation>
     </message>
 </context>
 <context>
     <name>BibleTimeApp</name>
     <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
+        <location filename="../../src/bibletimeapp.cpp" line="59"/>
+        <location filename="../../src/mobile/bibletimeapp.cpp" line="63"/>
         <source>Fatal error!</source>
-        <translation type="unfinished"></translation>
+        <translation>Krytyczny błąd!</translation>
     </message>
 </context>
 <context>
     <name>BtAboutDialog</name>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
         <source>BibleTime is an easy to use but powerful Bible study tool.</source>
-        <translation>BibleTime jest łatwym w urzyciu i potężnym narzędziem do studiowania Biblii.</translation>
+        <translation>BibleTime to proste w użyciu narzędzie do studiowania Biblii.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="271"/>
         <source>BibleTime is released under the GPL license. You can download and use the program for personal, private, public or commercial purposes without restrictions, but can give away or distribute the program only if you also distribute the corresponding source code.</source>
-        <translation type="unfinished"></translation>
+        <translation>BibleTime został wydany na zasadach licencji GPL. Możesz pobierać i używać program w celach prywatnych, publicznych lub komercyjnych bez ograniczeń. Możesz redystrybuować BibleTime tylko wtedy, jeśli udostępnisz także jego kod źródłowy.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="277"/>
         <source>The complete legally binding license is below.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kompletna, pełnoprawna licencja poniżej.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="109"/>
         <source>About BibleTime</source>
-        <translation type="unfinished"></translation>
+        <translation>O BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="121"/>
         <source>&amp;BibleTime</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="126"/>
         <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Szukamy programistów oraz osób do tłumaczeń. Jeśli chciałbyś dołączyć do naszego zespołu, wyślij e-mail na adres %1.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="130"/>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished">(c)1999-2014, The BibleTime Team</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="137"/>
         <source>&amp;Contributors</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Współtwórcy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="148"/>
         <source>The following people contributed to BibleTime:</source>
-        <translation type="unfinished"></translation>
+        <translation>Następujące osoby wsparły projekt BibleTime:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="150"/>
         <source>documentation and translation manager</source>
-        <translation type="unfinished"></translation>
+        <translation>dokumentacja i tłumaczenie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="172"/>
         <source>project manager</source>
-        <translation type="unfinished"></translation>
+        <translation>menedżer projektu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>tester</source>
-        <translation type="unfinished"></translation>
+        <translation>tester</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>usability expert</source>
-        <translation type="unfinished"></translation>
+        <translation>ekspert użyteczności</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="220"/>
         <source>Some names may be missing, please email %1 if you notice errors or omissions.</source>
-        <translation type="unfinished"></translation>
+        <translation>Niektóre nazwiska mogły zostać pominięte. Proszę wyślij e-mail na adres %1, jeśli znajdziesz błąd lub brakujące nazwisko.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="237"/>
         <source>BibleTime makes use of the SWORD Project. The SWORD Project is the CrossWire Bible Society&apos;s free Bible software project. Its purpose is to create cross-platform open-source tools &amp;mdash; covered by the GNU General Public License &amp;mdash; that allow programmers and Bible societies to write new Bible software more quickly and easily.</source>
-        <translation type="unfinished"></translation>
+        <translation>BibleTime używa biblioteki SWORD, która została stworzona przez CrossWire Bible Society&apos;s. Jej celem jest tworzenie wieloplatformowych narzędzi open source &amp;mdash; objętych licencją GNU General Public License &amp;mdash;, które pozwalają programistom i towarzystwom biblijnym szybko i łatwo pisać nowe oprogramowanie do studiowania Biblii.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="243"/>
         <source>The SWORD Project: </source>
-        <translation type="unfinished"></translation>
+        <translation>Projekt SWORD:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="251"/>
         <source>&amp;Qt</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Qt</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="254"/>
         <source>Qt toolkit version %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Wersja zestawu narzędzi Qt %1</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="260"/>
         <source>More info...</source>
-        <translation type="unfinished"></translation>
+        <translation>Więcej informacji...</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="265"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Licencja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
         <source>designer</source>
-        <translation type="unfinished"></translation>
+        <translation>projektant</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="139"/>
         <source>developer</source>
-        <translation type="unfinished"></translation>
+        <translation>programista</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
         <source>project founder</source>
-        <translation type="unfinished"></translation>
+        <translation>wsparcie projektu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="157"/>
         <source>packager</source>
-        <translation type="unfinished"></translation>
+        <translation>twórca paczek</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="158"/>
         <source>creator of The Sword Project</source>
-        <translation type="unfinished"></translation>
+        <translation>twórca The Sword Project</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
         <source>domain sponsor</source>
-        <translation type="unfinished"></translation>
+        <translation>sponsor domeny</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
         <source>howto</source>
-        <translation type="unfinished"></translation>
+        <translation>howto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="141"/>
         <source>artist</source>
-        <translation type="unfinished"></translation>
+        <translation>artysta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="173"/>
         <source>documentation</source>
-        <translation type="unfinished"></translation>
+        <translation>dokumentacja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="188"/>
         <source>The following people translated BibleTime into their language:</source>
-        <translation type="unfinished"></translation>
+        <translation>Następujące osoby przetłumaczyły BibleTime na ich ojczysty język:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="231"/>
         <source>&amp;SWORD</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;SWORD</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="235"/>
         <source>SWORD library version %1</source>
-        <translation type="unfinished"></translation>
+        <translation>wersja %1 biblioteki SWORD </translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="256"/>
         <source>This program uses Qt version %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ten program używa Qt w wersji %1.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="258"/>
         <source>Qt is a cross-platform application and UI framework, created with C++ language. It has been released under the LGPL license.</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt jest wieloplatformowym środowiskiem do tworzenia interfejsu użytkownika napisanym w języku C++. Został wydany na licencji LGPL.</translation>
     </message>
 </context>
 <context>
     <name>BtBibleKeyWidget</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="110"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="unfinished">Przeglądaj listę. Naciśnij przycisk myszki i poruszaj, aby przewinąć.</translation>
+        <translation>Przewijanie pozycji listy. Naciśnij lewy przycisk myszki i porusz myszką, aby zmniejszyć lub zwiększyć.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
         <source>Next book</source>
-        <translation type="unfinished">Następna księga</translation>
+        <translation>Następna księga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
         <source>Previous book</source>
-        <translation type="unfinished">Poprzednia księga</translation>
+        <translation>Poprzednia księga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="117"/>
         <source>Next chapter</source>
-        <translation type="unfinished">Następny rozdział</translation>
+        <translation>Następny rozdział</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
         <source>Previous chapter</source>
-        <translation type="unfinished">Poprzedni rozdział</translation>
+        <translation>Poprzedni rozdział</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="122"/>
         <source>Next verse</source>
-        <translation type="unfinished">Następny wers</translation>
+        <translation>Następny werset</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
         <source>Previous verse</source>
-        <translation type="unfinished">Poprzedni wers</translation>
+        <translation>Poprzedni werset</translation>
     </message>
 </context>
 <context>
@@ -704,237 +710,300 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="150"/>
         <source>Bookshelf</source>
-        <translation type="unfinished">Moduły</translation>
+        <translation>Biblioteka</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="152"/>
         <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Otwórz</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="153"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Edycja</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="154"/>
         <source>&amp;Plain text</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zwykły tekst</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="155"/>
         <source>&amp;HTML</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;HTML</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="156"/>
         <source>&amp;Unlock...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Odblokuj...</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="157"/>
         <source>&amp;About...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;O...</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="159"/>
         <source>There are currently no works installed. Please click the button below to install new works.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualnie nie ma zainstalowanych sesji. Kliknij przecisk poniżej, aby je zainstalować.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="161"/>
         <source>&amp;Install works...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Instaluj sesjÄ™...</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="173"/>
         <source>Warning: Module locked!</source>
-        <translation type="unfinished"></translation>
+        <translation>Ostrzeżenie: Moduł zablokowany!</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="174"/>
         <source>You are trying to access an encrypted module. Please provide an unlock key in the following dialog to open the module.</source>
-        <translation type="unfinished"></translation>
+        <translation>Próbujesz uzyskać dostęp do zaszyfrowanego modułu. Podaj klucz odblokowujący w celu otwarcia modułu.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="223"/>
         <source>&amp;Search in %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Wyszukaj w %1...</translation>
     </message>
 </context>
 <context>
     <name>BtBookshelfGroupingMenu</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
         <source>Category/Language</source>
-        <translation type="unfinished">Kategoria/Język</translation>
+        <translation>Kategoria/język</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
         <source>Category</source>
-        <translation type="unfinished">Kategoria</translation>
+        <translation>Kategoria</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
         <source>Language/Category</source>
-        <translation type="unfinished">Język/Kategoria</translation>
+        <translation>Język/kategoria</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="105"/>
         <source>Language</source>
-        <translation type="unfinished">Język</translation>
+        <translation>Język</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="108"/>
         <source>No grouping</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak grupowania</translation>
     </message>
 </context>
 <context>
     <name>BtBookshelfModel</name>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
+        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="78"/>
         <source>Module</source>
-        <translation type="unfinished"></translation>
+        <translation>Moduł</translation>
     </message>
 </context>
 <context>
     <name>BtBookshelfWidget</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="157"/>
         <source>Fi&amp;lter:</source>
-        <translation type="unfinished"></translation>
+        <translation>Fi&amp;ltr:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="158"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
         <source>Grouping</source>
-        <translation type="unfinished">Grupowanie</translation>
+        <translation>Grupowanie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="159"/>
         <source>Change the grouping of items in the bookshelf.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmień grupowanie.</translation>
     </message>
     <message>
-        <source>Category/Language</source>
-        <translation type="obsolete">Kategoria/Język</translation>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
+        <source>Show/hide works</source>
+        <translation>Pokaż/ukryj dzieła</translation>
     </message>
+</context>
+<context>
+    <name>BtChapterDropdownChooserButton</name>
     <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategoria</translation>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
+        <source>Select chapter</source>
+        <translation>Wybierz rozdział</translation>
     </message>
+</context>
+<context>
+    <name>BtConfig</name>
     <message>
-        <source>Language/Category</source>
-        <translation type="obsolete">Język/Kategoria</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="46"/>
+        <source>Old testament</source>
+        <translation>Stary testament</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation type="obsolete">Język</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="47"/>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation>Pięcioksiąg</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
-        <source>Show/hide works</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="48"/>
+        <source>History</source>
+        <translation>Historia</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="49"/>
+        <source>Prophets</source>
+        <translation>Prorocy</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="50"/>
+        <source>New testament</source>
+        <translation>Nowy testament</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="51"/>
+        <source>Gospels</source>
+        <translation>Psalmy</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="52"/>
+        <source>Letters/Epistles</source>
+        <translation>Listy apostolskie</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="53"/>
+        <source>Paul&apos;s Epistles</source>
+        <translation>Paweł apostoł</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="89"/>
+        <source>Error loading configuration!</source>
+        <translation>BÅ‚Ä…d Å‚adowania konfiguracji!</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="90"/>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation>Nie udało się załadować konfiguracji BibleTime, ponieważ istniejąca konfiguracja prawdopodobnie należy do nowszej wersji BibleTime. Taka sytuacja może się zdarzyć, jeśli została zainstalowana starsza wersja BibleTime. Załadowanie nowej konfiguracji może skutkować &lt;b&gt;utratą danych&lt;/b&gt;.&lt;br /&gt;&lt;br/&gt;Czy nadal chcesz spróbować załadować plik z nową konfiguracją? Naciśnij &quot;Nie&quot; jeśli chcesz natychmiast wyjść z BibleTime.</translation>
     </message>
 </context>
 <context>
-    <name>BtChapterDropdownChooserButton</name>
+    <name>BtConfigCore</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
-        <source>Select chapter</source>
-        <translation>Wybierz rozdział</translation>
+        <location filename="../../src/backend/config/btconfigcore.cpp" line="62"/>
+        <source>Default Session</source>
+        <translation>Domyślna sesja</translation>
     </message>
 </context>
 <context>
     <name>BtDisplaySettingsButton</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="103"/>
         <source>Use linebreaks after each verse</source>
-        <translation type="unfinished">Każdy werset w nowej linii</translation>
+        <translation>Każdy werset w nowej linii</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
         <source>Show verse numbers</source>
-        <translation type="unfinished">Pokaz numery wersetów</translation>
+        <translation>Pokaż numery wersetów</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
         <source>Show headings</source>
-        <translation type="unfinished">Pokaż nagłówki</translation>
+        <translation>Pokaż nagłówki</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
         <source>Highlight words of Jesus</source>
-        <translation type="unfinished">Wyróżniaj słowa Jezusa</translation>
+        <translation>Podświetl słowa Jezusa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
         <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Pokaż hebrajskie znaki samogłosek</translation>
+        <translation>Pokaż hebrajskie samogłoski</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
         <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Pokaz hebrajskie znaki kantylacji</translation>
+        <translation>Pokaż hebrajskie znaki toniczne</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
         <source>Show Greek accents</source>
-        <translation type="unfinished">Pokaz greckie akcenty</translation>
+        <translation>Pokaż greckie akcenty</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
         <source>Use alternative textual variant</source>
-        <translation type="unfinished">Używaj innych wariantów tekstu</translation>
+        <translation>Użycie alternatywnych odmian tekstowych</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
         <source>Show scripture cross-references</source>
-        <translation type="unfinished">Wyświetl odsyłacze</translation>
+        <translation>Pokaż odsyłacze do Pisma Świętego</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
         <source>Show footnotes</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż przypisy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
         <source>Show morph segmentation</source>
-        <translation type="unfinished">Pokaż podział głosek</translation>
+        <translation>Pokaż podział morfologiczny</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="120"/>
         <source>Display settings</source>
-        <translation type="unfinished">Wyświetl opcje</translation>
+        <translation>Ustawienia widoku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="123"/>
         <source>Display settings: No options available</source>
-        <translation type="unfinished">Wyświetl opcje: Brak dostępnych opcji.</translation>
+        <translation>Ustawienia widoku: brak dostępnych opcji</translation>
     </message>
 </context>
 <context>
     <name>BtEditBookmarkDialog</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="71"/>
         <source>Edit Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj zakładki</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokalizacja:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
         <source>Title:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tytuł:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>Opis:</translation>
+    </message>
+</context>
+<context>
+    <name>BtFindWidget</name>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="28"/>
+        <source>Previous</source>
+        <translation>Poprzedni</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="29"/>
+        <source>Next</source>
+        <translation>Następny</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="74"/>
+        <source>Match case</source>
+        <translation>Uwzględnij wielkość liter</translation>
     </message>
 </context>
 <context>
@@ -942,122 +1011,113 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
         <source>Font name:</source>
-        <translation type="unfinished">Nazwa:</translation>
+        <translation>Nazwa czcionki:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="98"/>
         <source>Font style:</source>
-        <translation type="unfinished">Styl:</translation>
+        <translation>Styl czcionki:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="99"/>
         <source>Size:</source>
-        <translation type="unfinished">Wielkość:</translation>
+        <translation>Wielkość:</translation>
     </message>
 </context>
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <source>You can specify a custom font for each language.</source>
-        <translation type="obsolete">Możesz wybrać czcionkę dla każdego języka.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="151"/>
         <source>&amp;Language:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Język:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
         <source>The font selection below will apply to all texts in this language</source>
-        <translation type="unfinished">Wybrana czcionka będzie użyta do wyświetlania wszystkich tekstów w tym języku</translation>
+        <translation>Poniżej wybrana czcionka będzie miała zastosowanie do wszystkich tekstów w tym języku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
         <source>Use custom font</source>
-        <translation type="unfinished">Użyj własnej czcionki</translation>
+        <translation>Użyj niestandardowej czcionki</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
         <source>Optionally specify a custom font for each language:</source>
-        <translation type="unfinished"></translation>
+        <translation>Opcjonalnie wybierz niestandardową czcionkę dla każdego języka:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="150"/>
         <source>Fonts</source>
-        <translation type="unfinished">Czcionki</translation>
+        <translation>Czcionki</translation>
     </message>
 </context>
 <context>
     <name>BtIndexPage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="124"/>
         <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
-        <translation type="unfinished"></translation>
+        <translation>Gdy zaznaczone, indeksy, które nie mają odpowiadających im dzieł zostaną usunięte przy starcie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
         <source>Automatically delete orphaned indexes when BibleTime starts</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatycznie usuń nieużywane indeksy podczas startu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="127"/>
         <source>Delete the selected indexes</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń zaznaczone indeksy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="130"/>
         <source>Create new indexes for the selected works</source>
-        <translation type="unfinished"></translation>
+        <translation>Utwórz nowe indeksy dla wybranych dzieł</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Work</source>
-        <translation type="unfinished">Moduł</translation>
+        <translation>Dzieło</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Index size</source>
-        <translation type="unfinished">Wielkość indeksu</translation>
+        <translation>Wielkość indeksu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="107"/>
         <source>%1 KiB</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="114"/>
         <source>0 KiB</source>
-        <translation type="unfinished"></translation>
+        <translation>0 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="122"/>
         <source>Search Indexes</source>
-        <translation type="unfinished"></translation>
+        <translation>Indeksy wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="91"/>
         <source>Indexed Works</source>
-        <translation type="unfinished"></translation>
+        <translation>Zindeksowane dzieła</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="96"/>
         <source>Unindexed Works</source>
-        <translation type="unfinished"></translation>
+        <translation>Niezindeksowane dzieła</translation>
     </message>
     <message>
-        <source>KiB</source>
-        <translation type="obsolete">
-            </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
         <source>Create...</source>
-        <translation type="unfinished"></translation>
+        <translation>Utwórz...</translation>
     </message>
 </context>
 <context>
@@ -1065,35 +1125,35 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="64"/>
         <source>Install/Update works?</source>
-        <translation type="unfinished">Instalować/uaktualnić moduły?</translation>
+        <translation>Zainstalować/zaktualizować dzieła?</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="67"/>
         <source>Do you really want to install these works?</source>
-        <translation type="unfinished">Czy chcesz zainstalować te moduły?</translation>
+        <translation>Czy na pewno chcesz zainstalować te dzieła?</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="68"/>
         <source>Only one version of a work can be installed at the same time. Select only one if there are items marked with red.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pamiętaj, że tylko jedna wersja danego dzieła może być zainstalowana w tym samym momencie. Jeśli jakieś elementy są zaznaczone na czerwono, wybierz tylko jeden z nich do instalacji.</translation>
     </message>
 </context>
 <context>
     <name>BtInstallModuleChooserDialogModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="88"/>
         <source>Work</source>
-        <translation type="unfinished">Moduł</translation>
+        <translation>Dzieło</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="89"/>
         <source>Installation source</source>
-        <translation type="unfinished"></translation>
+        <translation>Źródło instalacji</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="90"/>
         <source>Version</source>
-        <translation type="unfinished">Wersja</translation>
+        <translation>Wersja</translation>
     </message>
 </context>
 <context>
@@ -1101,124 +1161,120 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="263"/>
         <source>Install/Update</source>
-        <translation>Instaluj/Uaktualnij</translation>
+        <translation>Instaluj/Aktualizuj</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="265"/>
         <source>WARNING!!!</source>
-        <translation type="unfinished"></translation>
+        <translation>OSTRZEŻENIE!!!</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="266"/>
         <source>If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jeśli żyjesz w kraju prześladowań i nie chcesz ryzykować wykrycia, nie używaj zdalnych źródeł.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="269"/>
         <source>Select installation &amp;source:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz źródło &amp;instalacji:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="270"/>
         <source>&amp;Add...</source>
-        <translation type="unfinished">Dodaj...</translation>
+        <translation>&amp;Dodaj...</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="271"/>
         <source>Add new source</source>
-        <translation type="unfinished">Dodaj nowe źródło</translation>
+        <translation>Dodaj nowe źródło</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="272"/>
         <source>&amp;Delete...</source>
-        <translation type="unfinished">Usuń...</translation>
+        <translation>&amp;Usuń...</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="273"/>
         <source>Delete this source</source>
-        <translation type="unfinished">Usuń to źródło</translation>
+        <translation>Usuń to źródło</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="275"/>
         <source>Select &amp;works to install:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz &amp;dzieła do instalacji:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="277"/>
         <source>Install &amp;folder:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zainstaluj w &amp;folderze:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="278"/>
         <source>The folder where the new works will be installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Folder z nowymi dziełami do instalacji</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="279"/>
         <source>Configure folders where works are installed and found</source>
-        <translation type="unfinished"></translation>
+        <translation>Skonfiguruj foldery, w których zainstalowano dzieła</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="280"/>
         <source>&amp;Install...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Instaluj...</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="254"/>
         <source>Start installation of %1 works from %2 sources:</source>
-        <translation type="unfinished"></translation>
+        <translation>Start instalacji %1 dział z %2 źródeł:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="258"/>
         <source>Start installation:</source>
-        <translation type="unfinished"></translation>
+        <translation>Start instalacji:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="313"/>
         <source>Warning</source>
-        <translation type="unfinished">Uwaga</translation>
+        <translation>Ostrzeżenie</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="313"/>
         <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybrany folder docelowy nie jest zapisywalny albo nie istnieje. Instalacja nie powiedzie siÄ™.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="388"/>
         <source>Delete Source?</source>
-        <translation type="unfinished">Usunąć Źródło?</translation>
+        <translation>Czy chcesz usunąć źródło?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="389"/>
         <source>Do you really want to delete this source?</source>
-        <translation type="unfinished">Czy chcesz usunąć to źródło?</translation>
-    </message>
-    <message>
-        <source>Install...</source>
-        <translation type="obsolete">Instaluj...</translation>
+        <translation>Czy na pewno chcesz usunąć to źródło?</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="281"/>
         <source>Install or update selected works</source>
-        <translation>Instaluj/uaktualnij wybrane moduły</translation>
+        <translation>Zainstaluj lub zaktualizuj wybrane dzieła</translation>
     </message>
 </context>
 <context>
     <name>BtInstallPageModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="75"/>
         <source>Work</source>
-        <translation type="unfinished">Moduł</translation>
+        <translation>Dzieło</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="76"/>
         <source>Version</source>
-        <translation type="unfinished">Wersja</translation>
+        <translation>Wersja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="77"/>
         <source>Description</source>
-        <translation type="unfinished">Opis</translation>
+        <translation>Opis</translation>
     </message>
 </context>
 <context>
@@ -1226,182 +1282,168 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp" line="68"/>
         <source>Refresh the list of works from this source</source>
-        <translation type="unfinished">Odśwież listę modułów z tego źródła</translation>
+        <translation>Odśwież listę dzieł z tego źródła</translation>
     </message>
 </context>
 <context>
     <name>BtInstallPathDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="35"/>
         <source>Bookshelf Folders</source>
-        <translation type="unfinished"></translation>
+        <translation>Foldery biblioteki</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
         <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dzieła mogą być zainstalowane w jednym lub więcej folderach. Po ustawieniu folderów, możesz wybrać jeden z nich w oknie instalacji.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="45"/>
         <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
-        <translation type="unfinished"></translation>
+        <translation>BibleTime i biblioteka SWORD znajdują dzieła ze wszystkich poniższych folderów. Jeśli folder zostanie tutaj usunięty, nadal będzie istniał fizycznie w systemie wraz ze wszystkimi zainstalowanymi dziełami.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="48"/>
         <source>Configure bookshelf folders</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguruj foldery książek</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="53"/>
         <source>Configuration file for the folders is: </source>
-        <translation type="unfinished"></translation>
+        <translation>Plik konfiguracji dla folderów:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="61"/>
         <source>Folders where new works can be installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Foldery instalacji nowych dzieł</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
         <source>Read-only folders</source>
-        <translation type="unfinished"></translation>
+        <translation>Foldery tylko do odczytu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="66"/>
         <source>Nonexistent folders</source>
-        <translation type="unfinished"></translation>
+        <translation>NieistniejÄ…ce foldery</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="80"/>
         <source>&amp;Add...</source>
-        <translation type="unfinished">Dodaj...</translation>
+        <translation>&amp;Dodaj...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="81"/>
         <source>Add new folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj nowy folder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="86"/>
         <source>&amp;Edit...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Edytuj...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="87"/>
         <source>Edit the selected folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj zaznaczony folder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="92"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Usuń</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="93"/>
         <source>Remove the selected folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń zaznaczony folder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="167"/>
         <source>This default folder in your home directory can&apos;t be removed</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyślny folder w katalogu domowym nie może byc usunięty</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="194"/>
         <source>Choose Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz folder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>Use Folder?</source>
-        <translation type="unfinished"></translation>
+        <translation>Użyć folderu?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
-        <translation type="unfinished"></translation>
+        <translation>Ten folder jest niezapisywalny, dlatego dzieła nie mogą być w nim zainstalowane z programu BibleTime. Czy chcesz użyć tego folderu zamiast poprzedniej wartości?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
-        <translation type="unfinished"></translation>
+        <translation>Ten folder jest niezapisywalny, dlatego dzieła nie mogą być w nim zainstalowane z programu BibleTime. Czy nadal chcesz dodać go do listy folderów biblioteki?</translation>
     </message>
 </context>
 <context>
     <name>BtInstallProgressDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Work</source>
-        <translation type="unfinished">Moduł</translation>
+        <translation>Dzieło</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Progress</source>
-        <translation type="unfinished"></translation>
+        <translation>Postęp</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="60"/>
         <source>Stop All</source>
-        <translation type="unfinished"></translation>
+        <translation>Zatrzymaj wszystko</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Completed</source>
-        <translation type="unfinished"></translation>
+        <translation>Zakończono</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="55"/>
         <source>Waiting for turn...</source>
-        <translation type="unfinished"></translation>
+        <translation>Oczekiwanie...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="113"/>
         <source>Preparing install...</source>
-        <translation type="unfinished"></translation>
+        <translation>Przygotowanie instalacji...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="37"/>
         <source>Install Progress</source>
-        <translation type="unfinished"></translation>
+        <translation>Postęp instalacji</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie powiodło się</translation>
     </message>
 </context>
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <source>Select the language in which the Biblical book names are displayed.</source>
-        <translation type="obsolete">Wybierz język do wyświetlania nazw ksiąg Biblii.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
         <source>Language for names of Bible books:</source>
-        <translation type="unfinished">Język nazw ksiąg Biblii:</translation>
+        <translation>Język nazw ksiąg Biblii:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation type="unfinished">Język używany do wyświetlania nazw ksiąg Biblii</translation>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="136"/>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation>Języki, które mają być używane dla nazw ksiąg biblijnych. Tłumaczenia dostarczane przez bibliotekę Sword.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="133"/>
         <source>Languages</source>
-        <translation type="unfinished">Języki</translation>
+        <translation>Języki</translation>
     </message>
 </context>
 <context>
@@ -1409,18 +1451,18 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="76"/>
         <source>Select a work [%1]</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz dzieło [%1]</translation>
     </message>
     <message>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="79"/>
         <source>Select an additional work</source>
-        <translation type="unfinished">Wybierz dodatkowy moduł</translation>
+        <translation>Wybierz dodatkowe dzieło</translation>
     </message>
     <message>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="102"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="130"/>
         <source>NONE</source>
-        <translation type="unfinished">NIC</translation>
+        <translation>BRAK</translation>
     </message>
 </context>
 <context>
@@ -1428,51 +1470,51 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="33"/>
         <source>Preparing to index modules...</source>
-        <translation type="unfinished"></translation>
+        <translation>Przygotowanie do indeksowania modułów...</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="33"/>
         <source>Cancel</source>
-        <translation type="unfinished">Anuluj</translation>
+        <translation>Anuluj</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="37"/>
         <source>Creating indices</source>
-        <translation type="unfinished">Tworzenie indeksu</translation>
+        <translation>Tworzenie indeksów</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="67"/>
         <source>Creating index for work: %1</source>
-        <translation type="unfinished">Tworzenie indeksu modułu: %1</translation>
+        <translation>Tworzenie indeksu dla dzieła: %1</translation>
     </message>
 </context>
 <context>
     <name>BtModuleManagerDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="57"/>
         <source>Bookshelf Manager</source>
-        <translation>Menedżer modułów</translation>
+        <translation>Menedżer Biblioteki</translation>
     </message>
 </context>
 <context>
     <name>BtOpenWorkAction</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="103"/>
         <source>&amp;Open work</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Otwórz dzieło</translation>
     </message>
 </context>
 <context>
     <name>BtOpenWorkActionMenu</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="42"/>
         <source>&amp;Grouping order</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kolejność grupowania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="43"/>
         <source>Sets the grouping order for the items in this menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienie kolejności grupowania pozycji w menu.</translation>
     </message>
 </context>
 <context>
@@ -1480,75 +1522,75 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="15"/>
         <source>Refreshing source %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Odświeżanie źródła %1</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="16"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Anuluj</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="17"/>
         <source>Connecting...</source>
-        <translation type="unfinished">�ączenie...</translation>
+        <translation>�ączenie...</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="47"/>
         <source>Warning</source>
-        <translation type="unfinished">Uwaga</translation>
+        <translation>Ostrzeżenie</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="48"/>
         <source>Failed to refresh source %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie udało się odświeżyć źródła %1</translation>
     </message>
 </context>
 <context>
     <name>BtRemovePage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="100"/>
         <source>Select &amp;works to uninstall:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz &amp;dzieła do odinstalowania:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&amp;Remove...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Usuń...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="98"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="111"/>
         <source>Start removal of %1 works:</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuwanie %1 dzieł:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="114"/>
         <source>Start removal:</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuwanie:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="145"/>
         <source>You selected the following work(s): </source>
-        <translation type="unfinished"></translation>
+        <translation>Wybrałeś następujące dzieło(a):</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="149"/>
         <source>Do you really want to remove them from your system?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy na pewno chcesz usunąć je z systemu?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
         <source>Remove the selected works</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń wybrane dzieła</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="151"/>
         <source>Remove Works?</source>
-        <translation type="unfinished"></translation>
+        <translation>Usunąć dzieła?</translation>
     </message>
 </context>
 <context>
@@ -1556,25 +1598,25 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp" line="52"/>
         <source>Work</source>
-        <translation type="unfinished">Moduł</translation>
+        <translation>Dzieło</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp" line="55"/>
         <source>Install path</source>
-        <translation type="unfinished"></translation>
+        <translation>Ścieżka instalacji</translation>
     </message>
 </context>
 <context>
     <name>BtSearchModuleChooserDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="47"/>
         <source>Works to Search in</source>
-        <translation type="unfinished">Moduły do przeszukania</translation>
+        <translation>Dzieła do przeszukiwania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="49"/>
         <source>Select the works which should be searched.</source>
-        <translation type="unfinished">Wybierz moduły, które mają być przeszukane.</translation>
+        <translation>Wybierz dzieła do wyszukania.</translation>
     </message>
 </context>
 <context>
@@ -1582,22 +1624,22 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="26"/>
         <source>Configure shortcuts</source>
-        <translation>Konfiguruj skróty</translation>
+        <translation>Ustawienia skrótów klawiszowych</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="35"/>
         <source>Select first or second shortcut and type the shortcut with keyboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz podstawowy lub dodatkowy skrót klawiszowy i wciśnij go na klawiaturze</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="37"/>
         <source>First shortcut</source>
-        <translation>Pierwszy skrót</translation>
+        <translation>Skrót klawiszowy</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="42"/>
         <source>Second shortcut</source>
-        <translation>Drugi skrót</translation>
+        <translation>Alternatywny skrót klawiszowy</translation>
     </message>
 </context>
 <context>
@@ -1606,301 +1648,305 @@ This file is distributed under the same license as the Bibetime package.</transl
         <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="180"/>
         <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="187"/>
         <source>Select to change key</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz do zmiany klawisza</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
         <source>Action
 name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa
+akcji</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
         <source>First
 shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrót
+klawiszowy</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
         <source>Second
 shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Alternatywny
+skrót klawiszowy</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="253"/>
         <source>Shortcut for selected action name</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrót do wybranej akcji</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="259"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="264"/>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyślny</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="269"/>
         <source>Custom</source>
-        <translation type="unfinished"></translation>
+        <translation>Niestandardowy</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="284"/>
         <source>Default key:</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyślny skrót klawiszowy:</translation>
     </message>
 </context>
 <context>
-    <name>BtSourceArea</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">Moduł</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="obsolete">Opis</translation>
-    </message>
-    <message>
-        <source>&amp;Add...</source>
-        <translation type="obsolete">Dodaj...</translation>
-    </message>
-    <message>
-        <source>Refresh...</source>
-        <translation type="obsolete">Odswież...</translation>
-    </message>
+    <name>BtStandardWorksTab</name>
     <message>
-        <source>Refresh the list of works from this source</source>
-        <translation type="obsolete">Odśwież listę modułów z tego źródła</translation>
-    </message>
-    <message>
-        <source>&amp;Delete...</source>
-        <translation type="obsolete">Usuń...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="169"/>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation>Standardowe dzieła są używane, gdy nie określono dzieła, np. gdy zostanie kliknięte hiperłącze do Biblii lub słownika.</translation>
     </message>
     <message>
-        <source>Delete this source</source>
-        <translation type="obsolete">Usuń to źródło</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
+        <translation>Biblia:</translation>
     </message>
     <message>
-        <source>Add new source</source>
-        <translation type="obsolete">Dodaj nowe źródło</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="174"/>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation>Standardowa Biblia jest używana, gdy zostanie kliknięty odnośnik do Biblii</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceAreaModel</name>
     <message>
-        <source>Work</source>
-        <translation type="obsolete">Moduł</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</source>
+        <translation>Komentarz:</translation>
     </message>
     <message>
-        <source>Version</source>
-        <translation type="obsolete">Wersja</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="178"/>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation>Standardowy komentarz jest używany, gdy zostanie kliknięty odnośnik do komentarza</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Opis</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
+        <translation>SÅ‚ownik:</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceWidget</name>
     <message>
-        <source>Delete Source?</source>
-        <translation type="obsolete">Usunąć Źródło?</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="182"/>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation>Standardowy słownik jest używany, gdy zostanie kliknięty odnośnik do słownika</translation>
     </message>
     <message>
-        <source>Do you really want to delete this source?</source>
-        <translation type="obsolete">Czy chcesz usunąć to źródło?</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</source>
+        <translation>Modlitwa codzienna:</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Anuluj</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="186"/>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation>Standardowe modlitwy są używane do wyświetlania krótkiej modlitwy na starcie</translation>
     </message>
     <message>
-        <source>Refreshing source</source>
-        <translation type="obsolete">Odświeżanie Źródła</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation>Hebrajski słownik Stronga:</translation>
     </message>
     <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">�ączenie...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="190"/>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation>Standardowy słownik hebrajski jest używany, gdy zostanie kliknięty odnośnik do słownika hebrajskiego</translation>
     </message>
     <message>
-        <source>Refreshing...</source>
-        <translation type="obsolete">Odświeżanie...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation>Grecki słownik Stronga:</translation>
     </message>
     <message>
-        <source>Remote:</source>
-        <translation type="obsolete">Zdalne:</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="194"/>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation>Standardowy słownik grecki jest używany, gdy zostanie kliknięty odnośnik do słownika greckiego</translation>
     </message>
     <message>
-        <source>Local:</source>
-        <translation type="obsolete">Lokalne:</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</source>
+        <translation>Hebrajski słownik morfologiczny:</translation>
     </message>
     <message>
-        <source>Not a directory!</source>
-        <translation type="obsolete">To nie katalog!</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="198"/>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation>Standardowy hebrajski słownik morfologiczny dla tekstów hebrajskich jest używany do otwierania linków z tekstów hebrajskich</translation>
     </message>
     <message>
-        <source>Not readable!</source>
-        <translation type="obsolete">Nie można odczytać!</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</source>
+        <translation>Grecki słownik morfologiczny:</translation>
     </message>
     <message>
-        <source>Warning</source>
-        <translation type="obsolete">Uwaga</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="202"/>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation>Standardowy grecki słownik morfologiczny dla tekstów greckich jest używany do otwierania linków z tekstów greckich</translation>
     </message>
 </context>
 <context>
     <name>BtTextFiltersTab</name>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="74"/>
         <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="obsolete">Konfiguruj wyświetlanie tekstu. Możesz zmienić te ustawienia w każdym oknie z modułem.</translation>
+        <translation>Filtry kontrolują wygląd tekstu. Tutaj możesz określić domyślne ustawienia dla wszystkich filtrów. Możesz zastąpić te ustawienia w każdym oknie.</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="78"/>
         <source>Insert line break after each verse</source>
-        <translation type="obsolete">Każdy werset w nowej linii</translation>
+        <translation>Każdy werset w nowej linii</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
         <source>Show verse numbers</source>
-        <translation type="obsolete">Pokaz numery wersetów</translation>
+        <translation>Pokaż numery wersetów</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
         <source>Show section headings</source>
-        <translation type="obsolete">Pokaż nagłówki</translation>
+        <translation>Pokaż nagłówki sekcji</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
         <source>Show scripture cross-references</source>
-        <translation type="obsolete">Wyświetl odsyłacze</translation>
+        <translation>Pokaż odsyłacze do Pisma Świętego</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="82"/>
         <source>Show Greek accents</source>
-        <translation type="obsolete">Pokaz greckie akcenty</translation>
+        <translation>Pokaż greckie akcenty</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="83"/>
         <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">Pokaż hebrajskie znaki samogłosek</translation>
+        <translation>Pokaż hebrajskie samogłoski</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="84"/>
         <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">Pokaz hebrajskie znaki kantylacji</translation>
+        <translation>Pokaż hebrajskie znaki toniczne</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="85"/>
         <source>Show morph segmentation</source>
-        <translation type="obsolete">Pokaż podział głosek</translation>
+        <translation>Pokaż podział morfologiczny</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="86"/>
         <source>Use textual variants</source>
-        <translation type="obsolete">Używaj wariantów tekstu</translation>
+        <translation>Używanie odmian tekstu</translation>
     </message>
 </context>
 <context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
         <source>Add/remove/replace</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj/usuń/zamień</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
         <source>Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamień</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj</translation>
     </message>
 </context>
 <context>
     <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="69"/>
         <source>Tip Of The Day</source>
-        <translation type="unfinished"></translation>
+        <translation>Porada dnia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="83"/>
         <source>Show tips at startup</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż porady przy starcie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="94"/>
         <source>Next Tip</source>
-        <translation type="unfinished"></translation>
+        <translation>Następna porada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
         <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aby dodać równolegle wiele dzieł Biblii w aktywnym oknie, wybierz tą ikonę i wybierz inną wersję Biblii.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
         <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aby dodać równolegle wiele komentarzy w aktywnym oknie, wybierz tą ikonę i wybierz inną wersję komentarza.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="134"/>
         <source>To learn more about the BibleTime project please go to our web site.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aby dowiedzieć się więcej o projekcie BibleTime, przejdź do naszej strony internetowej.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="137"/>
         <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aby zsynchronizować okno komentarza z aktywnym oknem Biblii, przejdź do okna komentarza i wybierz tą ikonę.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
         <source>Select the icon again to stop the synchronization.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij ikonę ponownie, aby zatrzymać synchronizację.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="142"/>
         <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aby utworzyć zakładkę, przeciągnij werset z Biblii lub komentarza do okna zakładek. Strzałka wskazuje pozycję nowej zakładki po zwolnieniu przycisku. Inne dzieła posiadają odnośnik w lewym górnym rogu okna.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="147"/>
         <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aby zmienić tytuł zakładki lub jej opis, kliknij prawym przyciskiem myszy na zakładce i wybierz z menu zakładki Edytuj. Po zakończeniu edycji opisu można go odczytać, po najechaniu na zakładkę myszką.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="151"/>
         <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aby załadować wielu źródeł instalacji dzieł, przejdź do Menedżera Biblioteki, wybierz przycisk Dodaj, a następnie przycisk Pobierz listę.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="154"/>
         <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aby znaleźć więcej informacji o dziele, wejdź do okna biblioteki, kliknij na dzieło prawym przyciskiem myszy i wybierz z menu &quot;O...&quot;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="157"/>
         <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Okna Menedżera Biblioteki, Zakładek oraz Lupy mogą być przeniesione poprzez przeciągnięcie tytułu u góry każdego okna. Mogą być umieszczone po lewej, po prawej, powyżej lub poniżej okna z dziełami. Mogą być umieszczone na kartach. Ich rozmiary mogą zostać zmienione poprzez chwycenie krawędzi i jej przesunięcie.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="163"/>
         <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
-        <translation type="unfinished"></translation>
+        <translation>Można wyszukiwać numery Stronga w dziełach. Mając otwarte dzieło z dostępnymi numerami Stronga, przesuń kursor myszki nad słowo. Następnie kliknij prawym przyciskiem myszki i kliknij Wyszukaj numer Stronga. Pojawi się okno wyszukiwania, które pozwoli zobaczyć inne fragmenty aktualnego dzieła, które zawierają to samo słowo.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="178"/>
         <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>Możesz zapisać otwarte okna w sesji. Sesja może być później w prosty sposób odtworzona. Możesz zapisać tyle sesji ile chcesz. Funkcja sesji jest dostępna z menu Okno.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="168"/>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>Możesz zapisywać prywatne notatki odnoszące się do wersetów Pisma Świętego. Musisz zainstalować Prywatny komentarz. W tym celu otwórz Menedżer Biblioteki, jako źródło wybierz Crosswire. Następnie wybierz Komentarze w języku Angielskim oraz Personal. Po instalacji otwórz Menedżer Biblioteki, Komentarze i kliknij prawy przyciskiem myszki na Personal, a następnie wybierz Edytuj zwykły tekst lub HTML.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
         <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Możesz zobaczyć informację o numerach Stronga w oknie Lupa poprzez zatrzymanie na wybranym słowie przycisku myszki. Musisz mieć zainstalowane słowniki Stronga grecki i hebrajski.</translation>
     </message>
 </context>
 <context>
@@ -1914,152 +1960,145 @@ shortcut</source>
 <context>
     <name>CAcceleratorSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="128"/>
         <source>Choose action group:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz aktywnÄ… grupÄ™:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="130"/>
         <source>Main Window</source>
-        <translation type="unfinished"></translation>
+        <translation>Okno główne</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
         <source>All text windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Wszystkie okna tekstowe</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="132"/>
         <source>Bible windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Okna Biblii</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
         <source>Commentary windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Okna komentarzy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="134"/>
         <source>Lexicon windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Okna słowników</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
         <source>Book windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Okna ksiÄ…g</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
         <source>
    &quot;%1&quot; in the &quot;%2&quot; group</source>
-        <translation type="unfinished"></translation>
+        <translation>
+   &quot;%1&quot; w &quot;%2&quot; grupach</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
         <source>Shortcuts</source>
-        <translation type="unfinished"></translation>
+        <translation>Skróty klawiszowe</translation>
     </message>
 </context>
 <context>
     <name>CBibleReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="64"/>
         <source>Next book</source>
         <translation>Następna księga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="68"/>
         <source>Previous book</source>
         <translation>Poprzednia księga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="72"/>
         <source>Next chapter</source>
         <translation>Następny rozdział</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="76"/>
         <source>Previous chapter</source>
         <translation>Poprzedni rozdział</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="80"/>
         <source>Next verse</source>
-        <translation>Następny wers</translation>
+        <translation>Następny werset</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="84"/>
         <source>Previous verse</source>
-        <translation>Poprzedni wers</translation>
+        <translation>Poprzedni werset</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="89"/>
         <source>Copy chapter</source>
         <translation>Kopiuj rozdział</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="92"/>
         <source>Save chapter as plain text</source>
         <translation>Zapisz rozdział jako zwykły tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="95"/>
         <source>Save chapter as HTML</source>
-        <translation>Zapisz rozdział jako HTML </translation>
+        <translation>Zapisz rozdział jako HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="98"/>
         <source>Print chapter</source>
         <translation>Drukuj rozdział</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="110"/>
         <source>Text of reference</source>
-        <translation>Tekst odniesienia</translation>
+        <translation>Odwołanie w tekście</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
         <source>Reference with text</source>
-        <translation>Odniesienie z tekstem</translation>
+        <translation>Odwołanie do tekstu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="253"/>
         <source>Bible window</source>
         <translation>Okno Biblii</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="263"/>
         <source>Copy...</source>
         <translation>Kopiuj...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="274"/>
         <source>Save...</source>
         <translation>Zapisz...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="287"/>
         <source>Print...</source>
-        <translation>DrukujÄ™...</translation>
-    </message>
-    <message>
-        <source>Copy chapter to clipboard ...</source>
-        <translation type="obsolete">Skopiuj rozdział do schowka...</translation>
+        <translation>Drukuj...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="371"/>
         <source>Copying</source>
         <translation>Kopiowanie</translation>
     </message>
     <message>
-        <source>Saving chapter ...</source>
-        <translation type="obsolete">Zapisywanie rozdziału...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="390"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="408"/>
         <source>Saving</source>
         <translation>Zapisywanie</translation>
     </message>
@@ -2067,152 +2106,152 @@ shortcut</source>
 <context>
     <name>CBookReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
+        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="70"/>
         <source>Toggle tree view</source>
-        <translation>Przełącz widok drzewa</translation>
+        <translation>Przełącz widok trzewa</translation>
     </message>
 </context>
 <context>
     <name>CBookmarkIndex</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
         <source>Bookmarks</source>
-        <translation></translation>
+        <translation>Zakładki</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="92"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="583"/>
         <source>New folder</source>
-        <translation>Nowy katalog</translation>
+        <translation>Nowy folder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
         <source>Rename folder</source>
-        <translation></translation>
+        <translation>Zmień nazwę folderu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
         <source>Delete Items</source>
-        <translation>Skasuj elementy</translation>
+        <translation>Usuń elementy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="704"/>
         <source>Do you really want to delete the selected items and child-items?</source>
-        <translation>Czy napewno chcesz usunąć zaznaczone elementy i ich pochodne?</translation>
+        <translation>Czy na pewno chcesz usunąć zaznaczone elementy i ich elementy podrzędne?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="814"/>
         <source>The work to which the bookmark points to is not installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dzieło, do którego odwołuje się zakładka nie jest zainstalowane.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
         <source>Print bookmarks...</source>
-        <translation type="unfinished"></translation>
+        <translation>Drukuj zakładki...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="103"/>
         <source>Remove selected items...</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń wybrane elementy...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
         <source>Import to folder...</source>
-        <translation type="unfinished"></translation>
+        <translation>Importuj do folderu...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
         <source>Edit bookmark...</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj zakładkę...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
         <source>Sort folder bookmarks...</source>
-        <translation type="unfinished"></translation>
+        <translation>Sortuj folder zakładek...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
         <source>Sort all bookmarks...</source>
-        <translation type="unfinished"></translation>
+        <translation>Sortuj wszystkie zakładki...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="100"/>
         <source>Export from folder...</source>
-        <translation type="unfinished"></translation>
+        <translation>Eksportuj do folderu...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="393"/>
         <source>Can drop only bookmarks or one folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Można upuścić tylko zakładki albo pojedynczy folder</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="398"/>
         <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można upuścić folderu do niego samego albo do folderu podrzędnego</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="406"/>
         <source>Move</source>
         <translation>PrzenieÅ›</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="467"/>
         <source>Drag references from text views to this view</source>
-        <translation type="unfinished"></translation>
+        <translation>PrzeciÄ…gnij odniesienie z tekstu nad ten widok</translation>
     </message>
 </context>
 <context>
     <name>CCommentaryReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="31"/>
         <source>Next book</source>
         <translation>Następna księga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="35"/>
         <source>Previous book</source>
         <translation>Poprzednia księga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="39"/>
         <source>Next chapter</source>
         <translation>Następny rozdział</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="43"/>
         <source>Previous chapter</source>
         <translation>Poprzedni rozdział</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="47"/>
         <source>Next verse</source>
-        <translation>Następny wers</translation>
+        <translation>Następny werset</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="51"/>
         <source>Previous verse</source>
-        <translation>Poprzedni wers</translation>
+        <translation>Poprzedni werset</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="56"/>
         <source>Synchronize</source>
         <translation>Synchronizuj</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="59"/>
         <source>Synchronize the displayed entry of this work with the active Bible window</source>
-        <translation>Synchronizuj wyświetlany tekst tego modułu z aktywnym tekstem Biblii</translation>
+        <translation>Zsynchronizuj wyświetlony wpis tego dzieła z aktywnym oknem Biblii</translation>
     </message>
 </context>
 <context>
     <name>CConfigurationDialog</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="41"/>
         <source>Configure BibleTime</source>
         <translation>Konfiguruj BibleTime</translation>
     </message>
@@ -2220,898 +2259,796 @@ shortcut</source>
 <context>
     <name>CDisplaySettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
         <source>Display templates</source>
-        <translation>Szablony wyświetlania</translation>
+        <translation>Wyświetl szablony</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
         <source>Available display styles:</source>
-        <translation>Dostępne szablony wyświetlania:</translation>
+        <translation>Dostępne style wyświetlania:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="113"/>
         <source>Style preview</source>
-        <translation>PodglÄ…d</translation>
+        <translation>PodglÄ…d stylu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="131"/>
         <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
-        <translation>Bóg tak umiłował świat, że Syna swego jedynego nam dał, aby każdy, kto w Niego wierzył, nie zginął, ale miał życie wieczne.</translation>
+        <translation>Tak bowiem Bóg umiłował świat, że Syna swego Jednorodzonego dał, aby każdy, kto w Niego wierzy, nie zginął, ale miał życie wieczne.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="138"/>
         <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
-        <translation>Bóg nie zesłał swego Syna, aby świat osądził, ale aby świat zbawił.</translation>
+        <translation>Albowiem Bóg nie posłał swego Syna na świat po to, aby świat potępił, ale po to, by świat został przez Niego zbawiony.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="145"/>
         <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
         <translation>Kto wierzy w Niego, nie podlega potępieniu; a kto nie wierzy, już został potępiony, bo nie uwierzył w imię Jednorodzonego Syna Bożego.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="155"/>
         <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
         <translation>Każdy bowiem, kto się dopuszcza nieprawości, nienawidzi światła i nie zbliża się do światła, aby nie potępiono jego uczynków.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="160"/>
         <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
         <translation>Kto spełnia wymagania prawdy, zbliża się do światła, aby się okazało, że jego uczynki są dokonane w Bogu.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="106"/>
         <source>Display templates define how text is displayed.</source>
-        <translation>Szablony wyświetlania definiują jak ma być wyświetlany tekst.</translation>
+        <translation>Wyświetl szablony definiujące sposób wyświetlania tekstu.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="110"/>
         <source>Show the BibleTime logo on startup</source>
-        <translation>Pokaż logo BibleTime podczas uruchamiania</translation>
+        <translation>Pokaż logo BibleTime podczas startu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
         <source>Show startup logo</source>
-        <translation>Pokaż logo podczas uruchamiania</translation>
+        <translation>Pokaż logo podczas startu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="150"/>
         <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
-        <translation type="unfinished"></translation>
+        <translation>A sąd polega na tym, że światło przyszło na świat, lecz ludzie bardziej umiłowali ciemność aniżeli światło: bo złe były ich uczynki.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="101"/>
         <source>Display</source>
-        <translation type="unfinished">Widok</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="193"/>
-        <source></source>
-        <translation></translation>
+        <translation>Wyświetl</translation>
     </message>
 </context>
 <context>
     <name>CDisplayWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="215"/>
         <source>Back in history</source>
-        <translation>Wstecz</translation>
+        <translation>Poprzedni</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="223"/>
         <source>Forward in history</source>
-        <translation>Naprzód</translation>
-    </message>
-    <message>
-        <source>Zoom in</source>
-        <translation type="obsolete">Powiększ</translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation type="obsolete">Pomniejsz</translation>
+        <translation>Następny</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="192"/>
         <source>Select all</source>
         <translation>Zaznacz wszystko</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="196"/>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="200"/>
         <source>Find...</source>
-        <translation>Znajdz...</translation>
+        <translation>Wyszukaj...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="204"/>
         <source>Change location</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmień lokalizację w tekście</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="209"/>
         <source>Search with works of this window</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyszukaj w sesji z tego okna</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="393"/>
         <source>Work chooser buttons</source>
-        <translation type="unfinished"></translation>
+        <translation>Przyciski wyboru sesji</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="403"/>
         <source>Text area header</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż menu wyboru otwartego dzieła</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="453"/>
         <source>Navigation</source>
-        <translation type="unfinished"></translation>
+        <translation>Nawigacja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="459"/>
         <source>Tool</source>
-        <translation type="unfinished"></translation>
+        <translation>Narzędzie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="465"/>
         <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CFontChooser</name>
-    <message>
-        <source>Size:</source>
-        <translation type="obsolete">Wielkość:</translation>
-    </message>
-    <message>
-        <source>Font name:</source>
-        <translation type="obsolete">Nazwa:</translation>
-    </message>
-    <message>
-        <source>Font style:</source>
-        <translation type="obsolete">Styl:</translation>
+        <translation>Format</translation>
     </message>
 </context>
 <context>
     <name>CHTMLWriteDisplay</name>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
         <source>Bold</source>
-        <translation>Pogrubiona</translation>
+        <translation>Pogrubiony</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="60"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="67"/>
         <source>Italic</source>
         <translation>Kursywa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="79"/>
         <source>Underline</source>
-        <translation>Podkreślona</translation>
+        <translation>Podkreślenie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="84"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Lewo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="94"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="99"/>
         <source>Center</source>
-        <translation type="unfinished"></translation>
+        <translation>Centruj</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="104"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Prawo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="231"/>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="243"/>
         <source>Font size</source>
         <translation>Wielkość czcionki</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="255"/>
         <source>Font color</source>
         <translation>Kolor czcionki</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="89"/>
         <source>Align left</source>
-        <translation>Wyrównaj do lewej</translation>
+        <translation>PrzyciÄ…gnij do lewej</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="109"/>
         <source>Align right</source>
-        <translation>Wyrównaj do prawej</translation>
+        <translation>PrzyciÄ…gnij do prawej</translation>
     </message>
 </context>
 <context>
     <name>CHTMLWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="122"/>
         <source>Module not writable</source>
-        <translation>Nie możesz zapisać w module. </translation>
+        <translation>Moduł niezapisywalny</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="124"/>
         <source>Module is not writable.</source>
-        <translation>Nie możesz zapisać w module. </translation>
+        <translation>Moduł jest niezapisywalny.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="125"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
-        <translation>Moduł nie może być edytowany, albo nie masz uprawnień do zapisu.</translation>
-    </message>
-</context>
-<context>
-    <name>CInputDialog</name>
-    <message>
-        <source>Clear</source>
-        <translation type="obsolete">Wyczyść</translation>
-    </message>
-</context>
-<context>
-    <name>CKeyReferenceWidget</name>
-    <message>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="obsolete">Przeglądaj listę. Naciśnij przycisk myszki i poruszaj, aby przewinąć.</translation>
-    </message>
-    <message>
-        <source>Next book</source>
-        <translation type="obsolete">Następna księga</translation>
-    </message>
-    <message>
-        <source>Previous book</source>
-        <translation type="obsolete">Poprzednia księga</translation>
-    </message>
-    <message>
-        <source>Next chapter</source>
-        <translation type="obsolete">Następny rozdział</translation>
-    </message>
-    <message>
-        <source>Previous chapter</source>
-        <translation type="obsolete">Poprzedni rozdział</translation>
-    </message>
-    <message>
-        <source>Next verse</source>
-        <translation type="obsolete">Następny wers</translation>
-    </message>
-    <message>
-        <source>Previous verse</source>
-        <translation type="obsolete">Poprzedni wers</translation>
-    </message>
-</context>
-<context>
-    <name>CLanguageSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/clanguagesettings.cpp" line="297"/>
-        <source></source>
-        <translation></translation>
+        <translation>Ten moduł nie może być edytowany lub nie masz do niego dostępu.</translation>
     </message>
 </context>
 <context>
     <name>CLexiconKeyChooser</name>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="unfinished">Przeglądaj listę. Naciśnij przycisk myszki i poruszaj, aby przewinąć.</translation>
+        <translation>Przewijanie pozycji listy. Naciśnij lewy przycisk myszki i porusz myszką, aby zmniejszyć lub zwiększyć.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
         <source>Entries of the current work</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisy w aktywnym dziele</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
         <source>Next entry</source>
-        <translation type="unfinished">Następny element</translation>
+        <translation>Następna pozycja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="49"/>
         <source>Previous entry</source>
-        <translation type="unfinished">Poprzedni element</translation>
+        <translation>Poprzednia pozycja</translation>
     </message>
 </context>
 <context>
     <name>CLexiconReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="47"/>
         <source>Next entry</source>
-        <translation>Następny element</translation>
+        <translation>Następna pozycja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="51"/>
         <source>Previous entry</source>
-        <translation>Poprzedni element</translation>
+        <translation>Poprzednia pozycja</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="55"/>
         <source>Copy reference only</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj tylko odniesienie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
         <source>Save entry as HTML</source>
-        <translation>Zapisz jako HTML</translation>
+        <translation>Zapisz wpis jako HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
         <source>Print reference only</source>
-        <translation type="unfinished"></translation>
+        <translation>Drukuj tylko odniesienie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
         <source>Strong&apos;s Search</source>
-        <translation>Przeszukuj rdzenie</translation>
+        <translation>Wyszukaj numer Stronga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
         <source>Entry with text</source>
-        <translation>Wpis z tekstem</translation>
+        <translation>Wpis jako tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="134"/>
         <source>Entry as plain text</source>
         <translation>Wpis jako zwykły tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="265"/>
         <source>Lexicon window</source>
         <translation>Okno słownika</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="272"/>
         <source>Copy...</source>
         <translation>Kopiuj...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="281"/>
         <source>Save...</source>
         <translation>Zapisz...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="297"/>
         <source>Print...</source>
-        <translation>DrukujÄ™...</translation>
+        <translation>Drukuj...</translation>
     </message>
     <message>
-        <source>Saving entry ...</source>
-        <translation type="obsolete">Zapisz wpis...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="340"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="364"/>
         <source>Saving</source>
         <translation>Zapisywanie</translation>
     </message>
 </context>
 <context>
-    <name>CModuleIndexDialog</name>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Anuluj</translation>
-    </message>
-    <message>
-        <source>Creating indices</source>
-        <translation type="obsolete">Tworzenie indeksu</translation>
-    </message>
-    <message>
-        <source>Creating index for work: %1</source>
-        <translation type="obsolete">Tworzenie indeksu modułu: %1</translation>
-    </message>
-    <message>
-        <source>Indexing Is Cancelled</source>
-        <translation type="obsolete">Anulowano indeksowanie</translation>
-    </message>
-    <message>
-        <source>Indexing is cancelled because modules are removed.</source>
-        <translation type="obsolete">Anulowano indeksowanie, ponieważ usunięto moduły.</translation>
-    </message>
-</context>
-<context>
     <name>CPlainWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="235"/>
         <source>Sync with active Bible</source>
-        <translation>Synch. z aktywnÄ… BibliÄ…</translation>
+        <translation>Zsynchronizuj z aktywnÄ… BibliÄ…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="245"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="249"/>
         <source>Save text</source>
         <translation>Zapisz tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="254"/>
         <source>Delete current entry</source>
-        <translation>Skasuj ten komentarz</translation>
+        <translation>Usuń aktualny wpis</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="263"/>
         <source>Restore original text</source>
-        <translation>Przywróć oryginał</translation>
+        <translation>Przywróć oryginalny tekst</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="163"/>
         <source>Module not writable</source>
-        <translation>Nie możesz zapisać w module. </translation>
+        <translation>Moduł niezapisywalny</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="165"/>
         <source>Module is not writable.</source>
-        <translation>Nie możesz zapisać w module. </translation>
+        <translation>Moduł jest niezapisywalny.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="166"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
-        <translation>Moduł nie może być edytowany, albo nie masz uprawnień do zapisu.</translation>
+        <translation>Ten moduł nie może być edytowany lub nie masz do niego dostępu.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="240"/>
         <source>Synchronize (show the same verse) with the active Bible window</source>
-        <translation type="unfinished"></translation>
+        <translation>Zsynchronizuj (wyświetl ten sam werset) z aktywnym oknem Biblii</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="258"/>
         <source>Delete current entry (no undo)</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń aktualny wpis (bez możliwości cofnięcia)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="267"/>
         <source>Restore original text, new text will be lost</source>
-        <translation type="unfinished"></translation>
+        <translation>Przywróć oryginalny tekst, nowy tekst zostanie utracony</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save Text?</source>
+        <translation>Zapisać tekst?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <source>Save text before closing?</source>
+        <translation>Zapisać tekst przed wyjściem?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save changed text?</source>
+        <translation>Zapisać zmieniony tekst?</translation>
     </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="232"/>
         <source>Save Search Analysis</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz analizÄ™ wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="243"/>
+        <source>BibleTime Search Analysis</source>
+        <translation>Analiza wyników BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
-        <source>BibleTime Search Analysis</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="234"/>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
+        <translation>Pliki XHTML (*.html *.HTML *.htm *.HTM);;Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="259"/>
+        <source>Search text:</source>
+        <translation>Wyszukaj teskt:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="263"/>
+        <source>Results by work and book</source>
+        <translation>Wyniki wyszukiwania wg dzieł i ksiąg</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="265"/>
         <source>Book</source>
-        <translation type="unfinished"></translation>
+        <translation>Księga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="293"/>
         <source>Total hits</source>
-        <translation type="unfinished"></translation>
+        <translation>Razem trafień</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="303"/>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Utworzone przy pomocy &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</translation>
     </message>
 </context>
 <context>
     <name>CSwordModuleInfo</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="763"/>
         <source>Version</source>
         <translation>Wersja</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="766"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="774"/>
         <source>unknown</source>
-        <translation>Nieznane</translation>
+        <translation>nieznany</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="771"/>
         <source>Markup</source>
-        <translation type="unfinished"></translation>
+        <translation>Znacznik</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
         <source>Location</source>
-        <translation>Miejsce</translation>
+        <translation>Lokalizacja</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="782"/>
         <source>Language</source>
         <translation>Język</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="787"/>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="792"/>
         <source>LCSH</source>
-        <translation type="unfinished"></translation>
+        <translation>LCSH</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="796"/>
         <source>Writable</source>
-        <translation>Możliwość zapisu</translation>
+        <translation>Zapisywalne</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>yes</source>
         <translation>tak</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>no</source>
         <translation>nie</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="801"/>
         <source>Unlock key</source>
-        <translation>Klucz do odblokowania</translation>
+        <translation>Klucz odblokowujÄ…cy</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="822"/>
         <source>Features</source>
         <translation>Funkcje</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="830"/>
         <source>Take care, this work contains cult / questionable material!</source>
-        <translation>Uwaga, ten moduł zawiera wątpliwe materiały!</translation>
+        <translation>Uwaga, to dzieło zawiera niezatwierdzony materiał!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="834"/>
         <source>About</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="856"/>
         <source>Distribution license</source>
-        <translation>licencja</translation>
+        <translation>Licencja</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="857"/>
         <source>Distribution source</source>
-        <translation type="unfinished"></translation>
+        <translation>Źródło</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="858"/>
         <source>Distribution notes</source>
-        <translation type="unfinished">O dystrybucji</translation>
+        <translation>Notatki dystrybutora</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="859"/>
         <source>Text source</source>
-        <translation>źródła tekstu</translation>
+        <translation>Tekst źródłowy</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="860"/>
         <source>Copyright notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Uwagi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
         <source>Copyright holder</source>
-        <translation type="unfinished"></translation>
+        <translation>Posiadacz</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
         <source>Copyright date</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
         <source>Copyright contact name</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontakt</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
         <source>Copyright contact address</source>
-        <translation type="unfinished"></translation>
+        <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
         <source>Copyright contact email</source>
-        <translation type="unfinished"></translation>
+        <translation>E-mail</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="956"/>
         <source>Bibles</source>
-        <translation type="unfinished">Biblie</translation>
+        <translation>Biblie</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="958"/>
         <source>Commentaries</source>
-        <translation type="unfinished">Komentarze</translation>
+        <translation>Komentarze</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="960"/>
         <source>Books</source>
-        <translation type="unfinished">Księgi</translation>
+        <translation>Księgi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="962"/>
         <source>Cults/Unorthodox</source>
-        <translation type="unfinished">Apokryfy</translation>
+        <translation>Nie zatwierdzone</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="964"/>
         <source>Maps and Images</source>
-        <translation type="unfinished">Mapy i obrazki</translation>
+        <translation>Mapy i obrazy</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="966"/>
         <source>Daily Devotionals</source>
-        <translation type="unfinished">Rozważania codzienne</translation>
+        <translation>Modlitwy codzienne</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="968"/>
         <source>Lexicons and Dictionaries</source>
-        <translation type="unfinished">Leksykony i SÅ‚owniki</translation>
+        <translation>Leksykony i słowniki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="970"/>
         <source>Glossaries</source>
-        <translation type="unfinished">SÅ‚owniki biblijne</translation>
+        <translation>SÅ‚owniki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="972"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieznany</translation>
     </message>
 </context>
 <context>
     <name>CSwordSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="43"/>
         <source>Standard works</source>
-        <translation>Domyślne moduły</translation>
+        <translation>Standardowe dzieła</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="44"/>
         <source>Text filters</source>
-        <translation>WyglÄ…d tekstu</translation>
+        <translation>Filtrowanie tekstu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="41"/>
         <source>Desk</source>
-        <translation>Obszar roboczy</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="359"/>
-        <source></source>
-        <translation></translation>
+        <translation>Biurko</translation>
     </message>
 </context>
 <context>
     <name>CSwordSetupInstallSourcesDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="47"/>
         <source>Caption</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
         <source>Server</source>
         <translation>Serwer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="68"/>
         <source>Path</source>
         <translation>Ścieżka</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="91"/>
         <source>Get list...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pobierz listÄ™...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
-        <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
-
-Do you want to continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
-        <source>Get source list from remote server?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
-        <source>Cancel</source>
-        <translation type="unfinished">Anuluj</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
-        <source>Downloading List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
-        <source>Connecting...</source>
-        <translation type="unfinished">�ączenie...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
-        <source>Refreshing...</source>
-        <translation type="unfinished">Odświeżanie...</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="92"/>
+        <source>Download a list of sources from CrossWire server and add sources</source>
+        <translation>Pobierz listę źródeł z serwera CrossWire i dodaj źródła</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>BÅ‚Ä…d</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
-        <source>Download a list of sources from CrossWire server and add sources</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
         <source>Please provide a caption.</source>
         <translation>Podaj nazwÄ™.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
         <source>A source with this caption already exists. Please provide a different caption.</source>
-        <translation type="unfinished"></translation>
+        <translation>Źródło o takiej nazwie już istnieje. Podaj inną nazwę.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
         <source>Please provide a server name.</source>
         <translation>Podaj nazwÄ™ serwera.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
         <source>Please provide a valid, readable path.</source>
-        <translation>Podaj właściwą ścieżkę do zapisu.</translation>
+        <translation>Podaj prawidłową ścieżkę.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Please provide a path.</source>
         <translation>Podaj ścieżkę.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
-        <source>New  Installation Source</source>
-        <translation>Nowe źródło instalacji</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="160"/>
+        <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
+
+Do you want to continue?</source>
+        <translation>Lista źródeł zostanie pobrana z zewnętrznego serwera. Źródła zostaną dodane do aktualnej listy. Nowe źródła zastąpią już istniejące o takiej samej nazwie. Możesz później usunąć wybrane źródła.
+
+Czy chcesz kontynuować?</translation>
     </message>
-</context>
-<context>
-    <name>CWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>Zapisać tekst przed zamknięciem?</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
+        <source>Get source list from remote server?</source>
+        <translation>Pobrać listę źródeł ze zdalnego serwera?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>Zapisać zmiany w tekście?</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="167"/>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>Zapisać tekst?</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="168"/>
+        <source>Downloading List</source>
+        <translation>Pobieranie listy</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="178"/>
+        <source>Connecting...</source>
+        <translation>�ączenie...</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="197"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="198"/>
+        <source>Refreshing...</source>
+        <translation>Odświeżanie...</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="39"/>
+        <source>New  Installation Source</source>
+        <translation>Nowe źródło instalacji</translation>
     </message>
 </context>
 <context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="178"/>
         <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Wersja: %3&lt;/p&gt;&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="194"/>
         <source>Abbreviation</source>
         <translation>Skrót</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="203"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="290"/>
         <source>Cross references</source>
-        <translation>Odnośnik</translation>
+        <translation>Odsyłacze</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="343"/>
         <source>Footnote</source>
         <translation>Przypis</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="374"/>
         <source>Strongs</source>
-        <translation>Rdzenie</translation>
+        <translation>Strong</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="451"/>
         <source>Morphology</source>
-        <translation>Znaczniki morfologiczne</translation>
+        <translation>Morfologia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="472"/>
         <source>Word lookup</source>
         <translation>Szukaj słowa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="60"/>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
         <source>Select all</source>
-        <translation type="unfinished">Zaznacz wszystko</translation>
+        <translation>Zaznacz wszystko</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="80"/>
         <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;small&gt;To jest obszar lupy. Przemieść wskaźnik myszy nad link lub inny element (np. przypis), a jego treść po krótkiej chwili pojawi się w tym miejscu. Aby zablokować zawartość lupy, przesuń szybko mysz nad to pole lub naciśnij i przytrzymaj klawisz Shift podczas ruchu myszką.&lt;/small&gt;</translation>
     </message>
 </context>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="412"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="422"/>
         <source>Indexing aborted</source>
-        <translation type="unfinished"></translation>
+        <translation>Indeksowanie anulowane</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="413"/>
         <source>An internal error occurred while building the index: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Wystąpił błąd wewnętrzny w czasie tworzenia indeksu: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="423"/>
         <source>An internal error occurred while building the index.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wystąpił błąd wewnętrzny w czasie tworzenia indeksu.</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="522"/>
         <source>Search aborted</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyszukiwanie anulowane</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="523"/>
         <source>An internal error occurred while executing your search.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wystąpił błąd wewnętrzny w czasie wyszukiwania.</translation>
     </message>
 </context>
 <context>
@@ -3126,31 +3063,31 @@ Do you want to continue?</source>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="127"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="246"/>
         <source>Cults/Unorthodox</source>
-        <translation>Apokryfy</translation>
+        <translation>Nie zatwierdzone</translation>
     </message>
     <message>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="128"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="245"/>
         <source>Maps and Images</source>
-        <translation>Mapy i obrazki</translation>
+        <translation>Mapy i obrazy</translation>
     </message>
     <message>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="129"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="244"/>
         <source>Daily Devotionals</source>
-        <translation>Rozważania codzienne</translation>
+        <translation>Modlitwy codzienne</translation>
     </message>
     <message>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="130"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="242"/>
         <source>Lexicons and Dictionaries</source>
-        <translation>Leksykony i SÅ‚owniki</translation>
+        <translation>Leksykony i słowniki</translation>
     </message>
     <message>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="122"/>
         <source>Bibles</source>
         <translation>Biblie</translation>
     </message>
@@ -3158,7 +3095,7 @@ Do you want to continue?</source>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="132"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="243"/>
         <source>Glossaries</source>
-        <translation>SÅ‚owniki biblijne</translation>
+        <translation>SÅ‚owniki</translation>
     </message>
     <message>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="133"/>
@@ -3167,741 +3104,740 @@ Do you want to continue?</source>
         <translation>Księgi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="390"/>
         <source>Added text</source>
-        <translation>Tekst dodany</translation>
+        <translation>Dodany tekst</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="143"/>
         <source>Names of languages</source>
         <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
         <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Nazwy języków</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="148"/>
         <source>Afrikaans</source>
         <extracomment>Language name af</extracomment>
-        <translation>Afrykanerski</translation>
+        <translation>Afrykański</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="151"/>
         <source>Amuzgo, Guerrero</source>
         <extracomment>Language name amu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="153"/>
         <source>English, Old (ca.450-1100)</source>
         <extracomment>Language name ang</extracomment>
-        <translation>Angielski, Old (ca.450-1100)</translation>
+        <translation>Angielski, stary (około 450-1100)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="155"/>
         <source>Arabic</source>
         <extracomment>Language name ar</extracomment>
         <translation>Arabski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="158"/>
         <source>Azerbaijani</source>
         <extracomment>Language name az</extracomment>
-        <translation>Azerbejdżański</translation>
+        <translation>Azerski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="160"/>
         <source>Azerbaijani, South</source>
         <extracomment>Language name azb</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Azerski południowy</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="165"/>
         <source>Belarusian</source>
         <extracomment>Language name be</extracomment>
         <translation>Białoruski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="167"/>
         <source>Bulgarian</source>
         <extracomment>Language name bg</extracomment>
         <translation>Bułgarski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="173"/>
         <source>Breton</source>
         <extracomment>Language name br</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="175"/>
         <source>Bosnian</source>
         <extracomment>Language name bs</extracomment>
         <translation>Bośniacki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="177"/>
         <source>Catalan</source>
         <extracomment>Language name ca</extracomment>
         <translation>Kataloński</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="180"/>
         <source>Chinantec, Comaltepec</source>
         <extracomment>Language name cco</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="182"/>
         <source>Cebuano</source>
         <extracomment>Language name ceb</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
         <source>Chamorro</source>
         <extracomment>Language name ch</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
         <source>Chontal, Highland Oaxaca</source>
         <extracomment>Language name chd</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
         <source>Chinantec, Quiotepec</source>
         <extracomment>Language name chq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="190"/>
         <source>Chinantec, Ozumacu00edn</source>
         <extracomment>Language name chz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="193"/>
         <source>Cakchiquel, Western</source>
         <extracomment>Language name ckw</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="195"/>
         <source>Chinantec, Lalana</source>
         <extracomment>Language name cnl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="197"/>
         <source>Chinantec, Tepetotutla</source>
         <extracomment>Language name cnt</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="199"/>
         <source>Coptic</source>
         <extracomment>Language name cop</extracomment>
         <translation>Koptyjski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
         <source>Czech</source>
         <extracomment>Language name cs</extracomment>
         <translation>Czeski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
         <source>Chinantec, Sochiapan</source>
         <extracomment>Language name cso</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
         <source>Chol, Tila</source>
         <extracomment>Language name cti</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
         <source>Chatino, Western Highland</source>
         <extracomment>Language name ctp</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
         <source>Church Slavic</source>
         <extracomment>Language name cu</extracomment>
-        <translation>SÅ‚owacki</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="212"/>
         <source>Welsh</source>
         <extracomment>Language name cy</extracomment>
         <translation>Walijski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
         <source>Danish</source>
         <extracomment>Language name da</extracomment>
         <translation>Duński</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
         <source>German</source>
         <extracomment>Language name de</extracomment>
         <translation>Niemiecki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
         <source>Duruma</source>
         <extracomment>Language name dug</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="221"/>
         <source>Greek, Modern (1453-)</source>
         <extracomment>Language name el</extracomment>
-        <translation type="unfinished">Grecki, Modern (1453-)</translation>
+        <translation>Grecki, nowoczesny (1453-)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
         <source>English</source>
         <extracomment>Language name en</extracomment>
         <translation>Angielski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="225"/>
         <source>American English</source>
         <extracomment>Language name en_US</extracomment>
-        <translation>Angielski amerkański</translation>
+        <translation>Amerykański</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="227"/>
         <source>English, Middle (1100-1500)</source>
         <extracomment>Language name enm</extracomment>
-        <translation>Angielski, pomiędzy (1100-1500)</translation>
+        <translation>Angielski, średniowieczny (1100-1500)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="229"/>
         <source>Esperanto</source>
         <extracomment>Language name eo</extracomment>
         <translation>Esperanto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="231"/>
         <source>Spanish</source>
         <extracomment>Language name es</extracomment>
         <translation>Hiszpański</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
         <source>Estonian</source>
         <extracomment>Language name et</extracomment>
         <translation>Estoński</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
         <source>Basque</source>
         <extracomment>Language name eu</extracomment>
         <translation>Baskijski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
         <source>Persian</source>
         <extracomment>Language name fa</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Perski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
         <source>Finnish</source>
         <extracomment>Language name fi</extracomment>
         <translation>Fiński</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="243"/>
         <source>French</source>
         <extracomment>Language name fr</extracomment>
         <translation>Francuski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="245"/>
         <source>Frisian</source>
         <extracomment>Language name fy</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Fryzyjski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="247"/>
         <source>Irish</source>
         <extracomment>Language name ga</extracomment>
         <translation>Irlandzki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="249"/>
         <source>Gaelic (Scots)</source>
         <extracomment>Language name gd</extracomment>
-        <translation>Szkocki</translation>
+        <translation>Irlandzki (Szkocki)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="251"/>
         <source>Geez</source>
         <extracomment>Language name gez</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
         <source>Gothic</source>
         <extracomment>Language name got</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Gotycki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
         <source>Manx</source>
         <extracomment>Language name gv</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
         <source>Greek, Ancient (to 1453)</source>
         <extracomment>Language name grc</extracomment>
-        <translation>Grecki (do 1453)</translation>
+        <translation>Grecki starożytny (do 1453)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="262"/>
         <source>Hebrew</source>
         <extracomment>Language name he</extracomment>
         <translation>Hebrajski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
         <source>Hausa</source>
         <extracomment>Language name hau</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
         <source>Hawaiian</source>
         <extracomment>Language name haw</extracomment>
         <translation>Hawajski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
         <source>Hindi</source>
         <extracomment>Language name hi</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="271"/>
         <source>Croatian</source>
         <extracomment>Language name hr</extracomment>
         <translation>Chorwacki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="275"/>
         <source>Hungarian</source>
         <extracomment>Language name hu</extracomment>
-        <translation>Wegierski</translation>
+        <translation>Węgierski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
         <source>Huave, San Mateo Del Mar</source>
         <extracomment>Language name huv</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
         <source>Armenian</source>
         <extracomment>Language name hy</extracomment>
         <translation>Armeński</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
         <source>Indonesian</source>
         <extracomment>Language name id</extracomment>
         <translation>Indonezyjski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
         <source>Icelandic</source>
         <extracomment>Language name is</extracomment>
         <translation>Islandzki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
         <source>Italian</source>
         <extracomment>Language name it</extracomment>
         <translation>WÅ‚oski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="291"/>
         <source>Itzu00e1</source>
         <extracomment>Language name itz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="293"/>
         <source>Ixil, San Juan Cotzal</source>
         <extracomment>Language name ixl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
         <source>Japanese</source>
         <extracomment>Language name ja</extracomment>
         <translation>Japoński</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
         <source>Jacalteco, Eastern</source>
         <extracomment>Language name jac</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
         <source>Javanese, Caribbean</source>
         <extracomment>Language name jvn</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Jawajski, Karaibski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="302"/>
         <source>Georgian</source>
         <extracomment>Language name ka</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Gruziński</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
         <source>Korean</source>
         <extracomment>Language name ko</extracomment>
-        <translation>Koreańskie</translation>
+        <translation>Koreański</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="315"/>
         <source>Kurdish</source>
         <extracomment>Language name ku</extracomment>
         <translation>Kurdyjski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
         <source>Kirghiz</source>
         <extracomment>Language name ky</extracomment>
-        <translation>Kirgizki</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
         <source>Latin</source>
         <extracomment>Language name la</extracomment>
         <translation>�aciński</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
         <source>Lacandon</source>
         <extracomment>Language name lac</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
         <source>Lithuanian</source>
         <extracomment>Language name lt</extracomment>
         <translation>Litewski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="332"/>
         <source>Latvian</source>
         <extracomment>Language name lv</extracomment>
         <translation>�otewski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="334"/>
         <source>Malagasy</source>
         <extracomment>Language name mg</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Madagaskar</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="337"/>
         <source>Maori</source>
         <extracomment>Language name mi</extracomment>
-        <translation>Maorytański</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="339"/>
         <source>Mixe, Isthmus</source>
         <extracomment>Language name mir</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="341"/>
         <source>Mixtec, Coatzospan</source>
         <extracomment>Language name miz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="343"/>
         <source>Macedonian</source>
         <extracomment>Language name mk</extracomment>
         <translation>Macedoński</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="345"/>
         <source>Mixtec, Silacayoapan</source>
         <extracomment>Language name mks</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="350"/>
         <source>More</source>
         <extracomment>Language name mos</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
         <source>Malay</source>
         <extracomment>Language name ms</extracomment>
         <translation>Malajski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
         <source>Maltese</source>
         <extracomment>Language name mt</extracomment>
         <translation>Maltański</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="375"/>
         <source>Low German; Low Saxon</source>
         <extracomment>Language name nds</extracomment>
-        <translation>Niemiecki DolnoSaksoński</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="377"/>
         <source>Nepali</source>
         <extracomment>Language name ne</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Nepalski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="379"/>
         <source>Nahuatl, Guerrero</source>
         <extracomment>Language name ngu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
         <source>Nahuatl, Northern Oaxaca</source>
         <extracomment>Language name nhy</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
         <source>Dutch</source>
         <extracomment>Language name nl</extracomment>
-        <translation>Holenderski</translation>
+        <translation>Duński</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
         <source>Norwegian Nynorsk</source>
         <extracomment>Language name nn</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
         <source>Norwegian</source>
         <extracomment>Language name no</extracomment>
         <translation>Norweski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="397"/>
         <source>Otomi, Queru00e9taro</source>
         <extracomment>Language name otq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
         <source>Papiamento</source>
         <extracomment>Language name pap</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
         <source>Polish</source>
         <extracomment>Language name pl</extracomment>
         <translation>Polski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="411"/>
         <source>Persian (Dari)</source>
         <extracomment>Language name prs</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Perski (Dari)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="415"/>
         <source>Portuguese</source>
         <extracomment>Language name pt</extracomment>
         <translation>Portugalski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
         <source>Brasilian Portuguese</source>
         <extracomment>Language name pt_BR</extracomment>
-        <translation>Portugalski</translation>
+        <translation>Brazylijski Portugalski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
         <source>Quichu00e9, West Central</source>
         <extracomment>Language name qut</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
         <source>Romanian</source>
         <extracomment>Language name ro</extracomment>
         <translation>Rumuński</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
         <source>Russian</source>
         <extracomment>Language name ru</extracomment>
         <translation>Rosyjski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="431"/>
         <source>Scots</source>
         <extracomment>Language name sco</extracomment>
         <translation>Szkocki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="437"/>
         <source>Slovak</source>
         <extracomment>Language name sk</extracomment>
         <translation>SÅ‚owacki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="439"/>
         <source>Slovenian</source>
         <extracomment>Language name sl</extracomment>
         <translation>Słoweński</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="443"/>
         <source>Somali</source>
         <extracomment>Language name so</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Somalijski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
         <source>Albanian</source>
         <extracomment>Language name sq</extracomment>
         <translation>Albański</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="453"/>
         <source>Swedish</source>
         <extracomment>Language name sv</extracomment>
-        <translation>Szwedzki</translation>
+        <translation>Szwecki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="455"/>
         <source>Swahili</source>
         <extracomment>Language name sw</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="457"/>
         <source>Syriac</source>
         <extracomment>Language name syr</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Syryjski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="459"/>
         <source>Tamil</source>
         <extracomment>Language name ta</extracomment>
-        <translation>Tamilski</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="463"/>
         <source>Thai</source>
         <extracomment>Language name th</extracomment>
         <translation>Tajski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
         <source>Tagalog</source>
         <extracomment>Language name tl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="470"/>
         <source>Tswana</source>
         <extracomment>Language name tn</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="472"/>
         <source>Turkish</source>
         <extracomment>Language name tr</extracomment>
         <translation>Turecki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
         <source>Tektiteko</source>
         <extracomment>Language name ttc</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="479"/>
         <source>Tahitian</source>
         <extracomment>Language name ty</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="481"/>
         <source>Tzotzil, Zinacantu00e1n</source>
         <extracomment>Language name tzz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
         <source>Ukrainian</source>
         <extracomment>Language name uk</extracomment>
         <translation>Ukraiński</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
         <source>Orya</source>
         <extracomment>Language name ury</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
         <source>Uspanteco</source>
         <extracomment>Language name usp</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="492"/>
         <source>Vietnamese</source>
         <extracomment>Language name vi</extracomment>
         <translation>Wietnamski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="496"/>
         <source>Xhosa</source>
         <extracomment>Language name xh</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="163"/>
         <source>Bavarian</source>
         <extracomment>Language name bar</extracomment>
         <translation>Bawarski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="326"/>
         <source>Lombard</source>
         <extracomment>Language name lmo</extracomment>
-        <translation>
-            </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="403"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
         <source>Uma</source>
         <extracomment>Language name ppk
 ----------
@@ -3909,600 +3845,568 @@ Language name ppk</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="448"/>
         <source>Sranan</source>
         <extracomment>Language name srn</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
         <source>Yiddish</source>
         <extracomment>Language name yi</extracomment>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
         <source>Zapotec, San Juan Guelavu00eda</source>
         <extracomment>Language name zab</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="507"/>
         <source>Zapotec, Mitla</source>
         <extracomment>Language name zaw</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="509"/>
         <source>Chinese</source>
         <extracomment>Language name zh</extracomment>
         <translation>Chiński</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="511"/>
         <source>Zapotec, Amatlu00e1n</source>
         <extracomment>Language name zpo</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
         <source>Zapotec, Zoogocho</source>
         <extracomment>Language name zpq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="515"/>
         <source>Zapotec, Yalu00e1lag</source>
         <extracomment>Language name zpu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
         <source>Zapotec, Chichicapan</source>
         <extracomment>Language name zpv</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
         <source>Zapotec, Southern Rincon</source>
         <extracomment>Language name zsr</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
         <source>Zapotec, Quioquitani-Quieru00ed</source>
         <extracomment>Language name ztq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
         <source>Zapotec, Yatee</source>
         <extracomment>Language name zty</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="525"/>
         <source>Zulu</source>
         <extracomment>Language name zu</extracomment>
-        <translation>Zulu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="314"/>
         <source>Footnotes</source>
         <translation>Przypisy</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="316"/>
         <source>Strong&apos;s numbers</source>
-        <translation>Numery rdzeni</translation>
+        <translation>Numery Stronga</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="318"/>
         <source>Headings</source>
         <translation>Nagłówki</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="320"/>
         <source>Morphological tags</source>
-        <translation>Znaczniki morfologiczne</translation>
+        <translation>Znaki mofrologiczne</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="322"/>
         <source>Lemmas</source>
-        <translation type="unfinished"></translation>
+        <translation>Lemat</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="324"/>
         <source>Hebrew vowel points</source>
-        <translation>Hebrajskie znaki samogłosek</translation>
+        <translation>Hebrajskie samogłoski</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="326"/>
         <source>Hebrew cantillation marks</source>
-        <translation type="unfinished">hebrajskie znaki kantylacji</translation>
+        <translation>Hebrajskie znaki toniczne</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="328"/>
         <source>Greek accents</source>
         <translation>Greckie akcenty</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="330"/>
         <source>Red letter words</source>
-        <translation type="unfinished"></translation>
+        <translation>Czerwone litery</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="332"/>
         <source>Textual variants</source>
-        <translation>Warianty tekstu</translation>
+        <translation>Odmana tekstowa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="334"/>
         <source>Scripture cross-references</source>
-        <translation type="unfinished">Odsyłacze</translation>
+        <translation>Odsyłacze do Pisma Świętego</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="336"/>
         <source>Morph segmentation</source>
         <translation>Podział morfologiczny</translation>
     </message>
     <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation>Eksportuj</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
         <source>Local</source>
-        <translation>Lokalne</translation>
+        <translation>Lokalny</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>Zdalne</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Stary Testament</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Tora/Pięcioksiąg</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>Księgi historyczne</translation>
+        <source>Remote FTP</source>
+        <translation>Zdalny FTP</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Księgi prorockie</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="32"/>
+        <source>Remote SFTP</source>
+        <translation>Zdalny SFTP</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>Nowy Testament</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="33"/>
+        <source>Remote HTTP</source>
+        <translation>Zdalne HTTP</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Ewangelie</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="34"/>
+        <source>Remote HTTPS</source>
+        <translation>Zdalne HTTPS</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>Listy/Epistoły</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Listy św. Pawła</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
         <source>HTML files</source>
         <translation>Pliki HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="438"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>All files</source>
         <translation>Wszystkie pliki</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>Text files</source>
         <translation>Pliki tekstowe</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="444"/>
         <source>Save file</source>
         <translation>Zapisz plik</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="130"/>
         <source>Save document ...</source>
-        <translation>Zapisz dokument ...</translation>
+        <translation>Zapisz dokument...</translation>
     </message>
     <message>
-        <source>Print keys</source>
-        <translation type="obsolete">Klucz drukowania</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
         <source>BibleTime bookmark files</source>
-        <translation type="unfinished"></translation>
+        <translation>Pliki zakładek BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="127"/>
         <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
         <source>unknown</source>
-        <translation>Nieznane</translation>
+        <translation>nieznany</translation>
     </message>
     <message>
-        <source>Change description ...</source>
-        <translation type="obsolete">Zmień opis ...</translation>
-    </message>
-    <message>
-        <source>Enter a new description for the chosen bookmark.</source>
-        <translation type="obsolete">Wprowadź opis dla wybranej zakładki.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="60"/>
         <source>New folder</source>
-        <translation>Nowy katalog</translation>
+        <translation>Nowy folder</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
+        <location filename="../../src/util/tool.cpp" line="48"/>
         <source>The file already exists.</source>
-        <translation>Plik juz istnieje.</translation>
+        <translation>Plik już istnieje.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
+        <location filename="../../src/util/tool.cpp" line="49"/>
         <source>Do you want to overwrite it?</source>
-        <translation>Chcesz go zastąpić?</translation>
+        <translation>Czy chcesz go nadpisać?</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
+        <location filename="../../src/util/tool.cpp" line="69"/>
+        <location filename="../../src/util/tool.cpp" line="75"/>
         <source>Error</source>
         <translation>BÅ‚Ä…d</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>Plik nie może być zapisany.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
+        <location filename="../../src/util/tool.cpp" line="78"/>
         <source>Please check permissions etc.</source>
-        <translation>Sprawdź proszę prawa dostępu, itp.</translation>
+        <translation>Sprawdź uprawnienia.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
+        <location filename="../../src/util/tool.cpp" line="197"/>
         <source>Take care, this work contains cult / questionable material!</source>
-        <translation>Uwaga, ten moduł zawiera wątpliwe materiały!</translation>
+        <translation>Uwaga, to dzieło zawiera niezatwierdzony materiał!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
+        <location filename="../../src/util/tool.cpp" line="218"/>
         <source>Version</source>
         <translation>Wersja</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
+        <location filename="../../src/util/tool.cpp" line="207"/>
         <source>Encrypted - needs unlock key</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaszyfrowane - potrzebny klucz odbezpieczajÄ…cy</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="71"/>
+        <source>Error while writing to file.</source>
+        <translation>Wystąpił błąd przy zapisywaniu do pliku.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
+        <location filename="../../src/util/tool.cpp" line="72"/>
+        <source>Please check that enough disk space is available.</source>
+        <translation>Sprawdź czy jest wystarczająca ilość miejsca na dysku.</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="77"/>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation>Ten plik nie może zostać otworzony do zapisu.</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="231"/>
         <source>Double click for more information</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij dwukrotnie w celu uzyskania informacji</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
+        <location filename="../../src/util/tool.cpp" line="213"/>
         <source>Updated version available!</source>
-        <translation>Nowa wersja dostępna!</translation>
+        <translation>Dostępna jest nowa wersja!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
+        <location filename="../../src/util/tool.cpp" line="226"/>
         <source>Installed version</source>
         <translation>Zainstalowana wersja</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="273"/>
         <source>Haitian Creole</source>
         <extracomment>Language name ht</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Haitański</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
         <source>Kekchu00ed</source>
         <comment>kek</comment>
         <extracomment>Language name kek</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="357"/>
         <source>(Multiple languages)</source>
         <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>(Wiele języków)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="359"/>
         <source>Mam, Central</source>
         <extracomment>Language name mvc</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
         <source>Mam, Todos Santos Cuchumatu00e1n</source>
         <extracomment>Language name mvj</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="363"/>
         <source>Mixe, Juquila</source>
         <extracomment>Language name mxq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="365"/>
         <source>Mixtec, Jamiltepec</source>
         <extracomment>Language name mxt</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="367"/>
         <source>Burmese</source>
         <extracomment>Language name my</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="370"/>
         <source>Norwegian Bokmu00e5l</source>
         <extracomment>Language name nb</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="372"/>
         <source>Nahuatl, Michoacu00e1n</source>
         <extracomment>Language name ncl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
         <source>Potawatomi</source>
         <extracomment>Language name pot</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="468"/>
         <source>Klingon</source>
         <extracomment>Language name tlh</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Klingoński</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="498"/>
         <source>Mixtec, Diuxi-Tilantongo</source>
         <extracomment>Language name xtd</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
         <source>Yoryba</source>
         <extracomment>Language name yo</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="407"/>
         <source>Verb tense changed</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmieniony rodzaj rzeczownika</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>Can&apos;t write file</source>
         <translation>Nie można zapisać pliku</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>The Sword config file can&apos;t be written!</source>
-        <translation>Plik konfiguracyjny Sworda nie może być zapisany!</translation>
+        <translation>Plik konfiguracji Sword nie mógł być zapisany!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="39"/>
         <source>Export Bookmarks</source>
         <translation>Eksportuj zakładki</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="50"/>
         <source>Import bookmarks</source>
         <translation>Importuj zakładki</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
+        <location filename="../../src/util/tool.cpp" line="46"/>
         <source>Overwrite File?</source>
-        <translation>Zastąpić plik?</translation>
+        <translation>Zastąpić plik? </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="276"/>
         <source>Parsing Strong&apos;s Numbers</source>
-        <translation type="unfinished"></translation>
+        <translation>Parsowanie numerów Stronga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="154"/>
         <source>This shortcut conflicts with the shortcut for the following actions:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ten skrót klawiszowy jest już zarezerwowany dla poniższej akcji:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
         <source>Do you want to clear the conflicting shortcuts and continue?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy chcesz wyczyścić skróty klawiszowe, które interferują?</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="23"/>
         <source>Indexed works</source>
-        <translation type="unfinished"></translation>
+        <translation>Zindeksowane dzieła</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="24"/>
         <source>Unindexed works</source>
-        <translation type="unfinished"></translation>
+        <translation>Niezindeksowane dzieła</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="44"/>
         <source>Show this help message and exit</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż ten tekst pomocy i wyjdź</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="47"/>
         <source>Output BibleTime version and exit</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż wersję BibleTime i wyjdź</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="50"/>
         <source>Open a clean session</source>
-        <translation type="unfinished"></translation>
+        <translation>Otwórz pustą sesję</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="53"/>
         <source>Open the default Bible with the reference &lt;ref&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Otwórz domyślną Biblię z odnośnikiem &lt;ref&gt;</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="56"/>
         <source>For command-line arguments parsed by the Qt toolkit, see %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aby zobaczyć listę parametrów linii poleceń dostępnych w Qt, zobacz %1.</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="103"/>
         <source>Error: %1 expects an argument.</source>
-        <translation type="unfinished"></translation>
+        <translation>BÅ‚Ä…d: %1 oczekiwano parametru.</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="106"/>
         <source>See --help for details.</source>
-        <translation type="unfinished"></translation>
+        <translation>Szczegóły - zobacz w --help.</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="111"/>
         <source>Error: Invalid command-line argument: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Błąd: Niewłaściwy parametr linii poleceń: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="57"/>
         <source>CSS base template not found!</source>
-        <translation type="unfinished"></translation>
+        <translation>Szablon na bazie CSS nie znaleziony!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="74"/>
         <source>Default template &quot;%1&quot; not found!</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyślny szablon &quot;%1&quot; nie znaleziony!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="113"/>
         <source>Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamień</translation>
     </message>
 </context>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="58"/>
         <source>OK</source>
         <comment>Dialog Button</comment>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="59"/>
         <source>Open</source>
         <comment>Dialog Button</comment>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="60"/>
         <source>Save</source>
         <comment>Dialog Button</comment>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="61"/>
         <source>Cancel</source>
         <comment>Dialog Button</comment>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="62"/>
         <source>Close</source>
         <comment>Dialog Button</comment>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="63"/>
         <source>Discard</source>
         <comment>Dialog Button</comment>
-        <translation>Anuluj</translation>
+        <translation>Odrzuć</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="64"/>
         <source>Apply</source>
         <comment>Dialog Button</comment>
         <translation>Zastosuj</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="65"/>
         <source>Reset</source>
         <comment>Dialog Button</comment>
-        <translation>Resetuj</translation>
+        <translation>Zresetuj</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="66"/>
         <source>Restore defaults</source>
         <comment>Dialog Button</comment>
-        <translation>Przywróć ust. domyślne</translation>
+        <translation>Przywróć domyślne</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="67"/>
         <source>Help</source>
         <comment>Dialog Button</comment>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="68"/>
         <source>Save All</source>
         <comment>Dialog Button</comment>
         <translation>Zapisz wszystko</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="69"/>
         <source>Yes</source>
         <comment>Dialog Button</comment>
         <translation>Tak</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="70"/>
         <source>Yes to all</source>
         <comment>Dialog Button</comment>
         <translation>Tak na wszystkie</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="71"/>
         <source>No</source>
         <comment>Dialog Button</comment>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="72"/>
         <source>No to all</source>
         <comment>Dialog Button</comment>
         <translation>Nie na wszystkie</translation>
@@ -4511,365 +4415,365 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchOptionsArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="97"/>
         <source>Search for:</source>
-        <translation>Szukaj:</translation>
+        <translation>Wyszukaj:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="104"/>
         <source>&amp;Search</source>
-        <translation>&amp;Szukaj</translation>
+        <translation>&amp;Wyszukaj</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="106"/>
         <source>Start to search the text in the chosen works</source>
-        <translation>Rozpocznij wyszukiwanie tekstu w wybranych modułach</translation>
+        <translation>Wyszukaj teskt w wybranych dziełach</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="109"/>
         <source>Ch&amp;oose...</source>
-        <translation>Wybierz...</translation>
+        <translation>&amp;Wybierz...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="111"/>
         <source>Choose works for the search</source>
-        <translation>Wybierz moduły do przeszukania</translation>
+        <translation>Wybierz dzieła do przeszukania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="114"/>
         <source>S&amp;etup...</source>
-        <translation>Ustawienia...</translation>
+        <translation>&amp;Ustawienia...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="133"/>
         <source>All of the words (AND is added between the words)</source>
-        <translation>Wszystkie słowa (&quot;i&quot; dodane pomiędzy słowami)</translation>
+        <translation>Wszystkie słowa (AND jest dodawane między słowami)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="137"/>
         <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
         <translation> (&lt;a href=&apos;syntax_help&apos;&gt;pełna składnia&lt;/a&gt;)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="148"/>
         <source>Scope:</source>
-        <translation>Zasięg:</translation>
+        <translation>Zakres:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="169"/>
         <source>The text you want to search for</source>
-        <translation>Szukany tekst</translation>
+        <translation>Tekst do wyszukania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="173"/>
         <source>Works:</source>
-        <translation>Moduły:</translation>
+        <translation>Sesje:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="346"/>
         <source>No search scope</source>
-        <translation>Bez obszaru wyszukiwania</translation>
+        <translation>Brak zakresu wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="128"/>
         <source>All words</source>
         <translation>Wszystkie słowa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="116"/>
         <source>Configure predefined scopes for search</source>
-        <translation>Konfiguruj predefiniowane obszary szukania</translation>
+        <translation>Zdefiniuj zakresy wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="130"/>
         <source>Some words</source>
-        <translation>Niektóre słowa</translation>
+        <translation>Dowolne słowa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
         <source>Free</source>
-        <translation>Dowolnie</translation>
+        <translation>Dowolne</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
         <source>Some of the words (OR is added between the words)</source>
-        <translation>Jedno ze słów (&quot;lub&quot; dodane pomiędzy słowami)</translation>
+        <translation>Dowolne słowa (OR dodawane jest pomiędzy słowami)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
         <source>Full lucene syntax</source>
-        <translation>Pełna składnia silnika Lucene</translation>
+        <translation>Pełna składnia lucene</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
         <source>Click the link to get help for search syntax</source>
-        <translation>Kliknij, aby uzyskać pomoc w składni</translation>
+        <translation>Kliknij link, aby otrzymać pomoc dotyczącą składni wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="159"/>
         <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
-        <translation>Wybierz zasieg (księgi, rozdziały, wersy) przeszukiwania. &lt;br /&gt;Dotyczy Biblii i komentarzy.</translation>
+        <translation>Wybierz zakres (księgi/rozdziały/wersety wyszukiwania).&lt;br /&gt;Zastosowanie do Biblii i komentarzy.</translation>
     </message>
 </context>
 <context>
     <name>Search::BtSearchResultArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="85"/>
         <source>Text of the selected search result item</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekst z zaznaczonych elementów wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="88"/>
         <source>Select all</source>
-        <translation type="unfinished">Zaznacz wszystko</translation>
+        <translation>Zaznacz wszystko</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="92"/>
         <source>Copy</source>
-        <translation type="unfinished">Kopiuj</translation>
+        <translation>Kopiuj</translation>
     </message>
 </context>
 <context>
     <name>Search::BtSearchSyntaxHelpDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="47"/>
         <source>Search Syntax Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Pomoc składni wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="94"/>
         <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pomoc dla opcji &quot;Pełnej składni&quot;. &quot;wszystkie słowa&quot; i &quot;dowolne słowa&quot; mają ograniczoną składnię; wspierane są &lt;a href=&apos;#wildcards&apos;&gt;wieloznacznik&lt;/a&gt; i &lt;a href=&apos;#fields&apos;&gt;pola tekstowe&lt;/a&gt;. Niektóre inne funkcje składni mogą dawać nieoczekiwane lub złe wyniki.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
         <source>Which words to find</source>
-        <translation type="unfinished"></translation>
+        <translation>Które słowa wyszukać</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="101"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
         <source>Grouping and order</source>
-        <translation type="unfinished"></translation>
+        <translation>Kolejność i grupowanie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="103"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
         <source>Wildcards (partial words)</source>
-        <translation type="unfinished"></translation>
+        <translation>Wieloznacznik (część słów)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
         <source>Text fields (different parts of text)</source>
-        <translation type="unfinished"></translation>
+        <translation>Pola tekstowe (różne części tekstu)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="208"/>
         <source>Other syntax features</source>
-        <translation type="unfinished"></translation>
+        <translation>Inne funkcje wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
         <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
         <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>Wyszukiwane hasła są separowane spacjami. &lt;strong&gt;AND&lt;/strong&gt; (wszystkie słowa), &lt;strong&gt;OR&lt;/strong&gt; (dowolne słowa) i &lt;strong&gt;NOT&lt;/strong&gt; (wykluczone słowa) mogą być dodane pomiędzy słowami. Jeśli nic nie zostanie dodane, automatycznie zostanie użyte OR. &apos;&lt;strong&gt;+&lt;/strong&gt; słowo&apos; oznacza, że słowo musi istnieć w wynikach wyszukiwania.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="119"/>
         <source>jesus AND god</source>
         <comment>Do not translate &quot;AND&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>Jezus AND Bóg</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="121"/>
         <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Znajdź wersety jednocześnie zawierające &quot;Jezus&quot; i &quot;Bóg&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="123"/>
         <source>jesus OR god</source>
         <comment>Do not translate &quot;OR&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>Jezus OR Bóg</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="125"/>
         <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
-        <translation type="unfinished"></translation>
+        <translation>Znajdź wersety z &quot;Jezus&quot;, &quot;Bóg&quot; lub oba jednocześnie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="127"/>
         <source>jesus NOT god</source>
         <comment>Do not translate &quot;NOT&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>Jezus NOT Bóg</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="133"/>
         <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Znajdź wersety z &quot;Jezus&quot;, ale nie z &quot;Bóg&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="131"/>
         <source>+jesus -god</source>
-        <translation type="unfinished"></translation>
+        <translation>+Jezus -Bóg</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
         <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Słowa mogą być grupowane w &lt;strong&gt; nawiasy &lt;/strong&gt;. Dokładne wyszukiwanie może być zdefiniowane za pomocą &lt;strong&gt;cudzysłowu&lt;/strong&gt;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
         <source>(a AND b) OR c</source>
         <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>(a AND b) OR c</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
         <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Znajdź wersety jednocześnie zawierające &quot;a&quot; i &quot;b&quot; oraz wersety zwierające &quot;c&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="145"/>
         <source>&quot;says lord&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;Pan mówi&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="149"/>
         <source>&quot;says the lord&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;Pan mówi&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="151"/>
         <source>Finds all verses with &apos;says the LORD&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Znajdź wszystkie wersety zawierające &quot;Pan mówi&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
         <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; dopasowuje jakąkolwiek sekwencję znaków (0 lub więcej), podczas gdy &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; dopasowuje jeden pojedynczy znak. Wieloznacznik (*) nie może być użyty na początku słowa.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="160"/>
         <source>a*</source>
-        <translation type="unfinished"></translation>
+        <translation>a*</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="162"/>
         <source>All words beginning with &apos;a&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Wszystkie słowa zaczynające się na &quot;a&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="164"/>
         <source>a*a</source>
-        <translation type="unfinished"></translation>
+        <translation>a*a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="166"/>
         <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos;, itd.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="168"/>
         <source>a?</source>
-        <translation type="unfinished"></translation>
+        <translation>a?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="170"/>
         <source>&apos;at&apos; and &apos;an&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;at&quot; i &quot;an&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="172"/>
         <source>a??a</source>
-        <translation type="unfinished"></translation>
+        <translation>a??a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="174"/>
         <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos;, itd.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
         <source>Available text fields:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dostępne pola tekstowe:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="181"/>
         <source>Searches headings</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyszukiwanie w nagłówkach</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="183"/>
         <source>Searches footnotes</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyszukiwanie w przypisach </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="185"/>
         <source>Searches Strong&apos;s numbers</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyszukiwanie w numerach Stronga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="187"/>
         <source>Searches morphology codes</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyszukaj kody morfologiczne</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="189"/>
         <source>Examples:</source>
-        <translation type="unfinished"></translation>
+        <translation>Przykłady:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="191"/>
         <source>heading:Jesus</source>
         <comment>Do not translate &quot;heading:&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>heading:Jezus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="193"/>
         <source>Finds headings with &apos;Jesus&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Znajdź nagłówki z &quot;Jezus&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="195"/>
         <source>footnote:Jesus AND footnote:said</source>
         <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>footnote:Jezus AND footnote:powiedział</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
         <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Znajdź przypisy z &quot;Jezus&quot; i &quot;powiedział&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
         <source>strong:G846</source>
         <comment>Do not translate &quot;strong:&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>strong:G846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="202"/>
         <source>Finds verses with Strong&apos;s Greek number 846</source>
-        <translation type="unfinished"></translation>
+        <translation>Znajduje wersety z 846 greckim numerem Stronga</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="204"/>
         <source>morph:&quot;N-NSF&quot;</source>
         <comment>Do not translate &quot;morph:&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>morph:&quot;N-NSF&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="206"/>
         <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Znajduje wersety z morfologiÄ… &quot;N-NSF&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="210"/>
         <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
-        <translation type="unfinished"></translation>
+        <translation>BibleTime używa do wyszukiwania silnika CLucene. Możesz przeczytać więcej na &lt;a href=&apos;%1&apos;&gt;stronie internetowej składni lucene&lt;/a&gt; (w zewnętrznej przeglądarce).</translation>
     </message>
 </context>
 <context>
@@ -4877,12 +4781,12 @@ Language name ppk</extracomment>
     <message>
         <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="50"/>
         <source>Work</source>
-        <translation>Moduł</translation>
+        <translation>Dzieło</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="50"/>
         <source>Hits</source>
-        <translation>Znaleziono</translation>
+        <translation>Trafienia</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="64"/>
@@ -4893,14 +4797,14 @@ Language name ppk</extracomment>
         <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="66"/>
         <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="76"/>
         <source>Reference only</source>
-        <translation>Odniesienie</translation>
+        <translation>Tylko odniesienie</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="69"/>
         <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="79"/>
         <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="86"/>
         <source>Reference with text</source>
-        <translation>Wers z tekstem</translation>
+        <translation>Odniesienie z tekstem</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="74"/>
@@ -4910,41 +4814,29 @@ Language name ppk</extracomment>
     <message>
         <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="84"/>
         <source>Print...</source>
-        <translation>DrukujÄ™...</translation>
-    </message>
-    <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Kopiuj rezultat wyszukiwań...</translation>
+        <translation>Drukuj...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="231"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="241"/>
         <source>Copying search result</source>
-        <translation>Kopiuj rezultat poszukiwań</translation>
+        <translation>Kopiuj wyniki wyszukiwania</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Zapisz rezultat wyszukiwań ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="250"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="259"/>
         <source>Saving search result</source>
-        <translation>Zapisywanie rezultatów poszukiwań</translation>
+        <translation>Zapisz wyniki wyszukiwania</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Drukuj rezultaty poszukiwań...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="268"/>
         <source>Printing search result</source>
-        <translation>Drukuje rezultaty poszukiwań</translation>
+        <translation>Wydrukuj wyniki wyszukiwania</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="49"/>
         <source>Works chosen for the search and the number of the hits in each work</source>
-        <translation type="unfinished"></translation>
+        <translation>Dzieła wybrane do wyszukiwania i liczba trafień w każdym dziele</translation>
     </message>
 </context>
 <context>
@@ -4952,12 +4844,12 @@ Language name ppk</extracomment>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="136"/>
         <source>S&amp;earch range:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zakres wyszukiwania:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="137"/>
         <source>Select a scope from the list to edit the searchranges</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaznacz zakres z listy, aby edytować zakres wyszukiwania</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="148"/>
@@ -4967,108 +4859,100 @@ Language name ppk</extracomment>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="151"/>
         <source>Edi&amp;t current range:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Edytuj bieżący zakres:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="152"/>
         <source>Change the search ranges of the selected searchscope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmień zakresy wyszukiwania zaznaczonego elementu. Spójrz na wstępnie zdefiniowane zakresy, aby zobaczyć, jak budować zakresy wyszukiwania.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="157"/>
         <source>Parsed search range:</source>
-        <translation type="unfinished"></translation>
+        <translation>Analizowany zakres wyszukiwania:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="171"/>
         <source>New range</source>
-        <translation>Nowy obszar</translation>
-    </message>
-    <message>
-        <source>&lt;invalid name of search range&gt;</source>
-        <translation type="obsolete">&lt;niepoprawna nazwa obszaru wyszukiwania&gt;</translation>
+        <translation>Nowy zakres</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="140"/>
         <source>&amp;Add new scope</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dodaj nowy zakres</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="141"/>
         <source>Add a new search scope. First enter an appropriate name, then edit the search ranges.</source>
-        <translation>Dodaje nowy zakres wyszukiwania. Najpierw podaj nazwÄ™, potem edytuj obszar szukania.</translation>
+        <translation>Dodaj nowy zakres wyszukiwania. Najpierw wprowadź właściwą nazwę, a następnie wprowadź zakres wyszukiwania.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="145"/>
         <source>Delete current &amp;scope</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń bieżący &amp;zakres</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="146"/>
         <source>Delete the selected search scope</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń zaznaczony zakres wyszukiwania</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="149"/>
         <source>Change the name of the selected search scope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="obsolete">Zmienia zasięg szukania zaznaczonego obszaru. Zobacz predefiniowane zasięgi, aby zobaczyć jak wygląda zasięg szukania.</translation>
+        <translation>Zmień nazwę zaznaczonego zakresu wyszukiwania</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="158"/>
         <source>The search ranges which will be used for the search, parsed to the canonical form</source>
-        <translation type="unfinished"></translation>
+        <translation>Zakresy wyszukiwania, które będą używane do wyszukiwania, przetworzone do postaci kanonicznej</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="134"/>
         <source>Setup Search Scopes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia zakresów wyszukiwania</translation>
     </message>
 </context>
 <context>
     <name>Search::CSearchDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="130"/>
         <source>Missing indices</source>
-        <translation>Brak indeksów</translation>
+        <translation>BrakujÄ…ce indeksy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="87"/>
         <source>Search</source>
-        <translation>Szukaj</translation>
+        <translation>Wyszukaj</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="131"/>
         <source>The following modules need to be indexed before they can be searched in:</source>
-        <translation type="unfinished"></translation>
+        <translation>Poniższe moduły muszą być zindeksowane przed wyszukiwaniem:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="132"/>
         <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
-        <translation type="unfinished"></translation>
+        <translation>Indeksowanie zajmie chwilę czasu. Kliknij &quot;Tak&quot;, aby rozpocząć indeksowanie lub &quot;Nie&quot;, aby anulować.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="236"/>
         <source>Drag any verse reference onto an open Bible window</source>
-        <translation type="unfinished"></translation>
+        <translation>PrzeciÄ…gnij odniesienie do wersetu do otwartego okna Biblii</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="241"/>
         <source>&amp;Analyze results...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Analizuj wyniki...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="242"/>
         <source>Show a graphical analysis of the search result</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż graficzną analizę rezultatów wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="248"/>
         <source>&amp;Close</source>
-        <translation>Zamknij</translation>
+        <translation>&amp;Zamknij</translation>
     </message>
 </context>
 <context>
@@ -5087,14 +4971,14 @@ Language name ppk</extracomment>
         <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="50"/>
         <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="64"/>
         <source>Reference only</source>
-        <translation>Odniesienie</translation>
+        <translation>Tylko odniesienie</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="54"/>
         <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="68"/>
         <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="76"/>
         <source>Reference with text</source>
-        <translation>Wers z tekstem</translation>
+        <translation>Odwołanie do tekstu</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="61"/>
@@ -5104,245 +4988,117 @@ Language name ppk</extracomment>
     <message>
         <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="73"/>
         <source>Print...</source>
-        <translation>DrukujÄ™...</translation>
-    </message>
-    <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Drukuj rezultaty poszukiwań...</translation>
+        <translation>Drukuj...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="164"/>
         <source>Printing search result</source>
-        <translation>Drukuje rezultaty poszukiwań</translation>
-    </message>
-    <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Zapisz rezultat wyszukiwań ...</translation>
+        <translation>Drukuj wyniki wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="192"/>
         <source>Saving search result</source>
-        <translation>Zapisywanie rezultatów poszukiwań</translation>
-    </message>
-    <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Kopiuj rezultat wyszukiwań...</translation>
+        <translation>Zapisz wyniki wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="210"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="228"/>
         <source>Copying search result</source>
-        <translation>Kopiuj rezultat poszukiwań</translation>
+        <translation>Kopiuj wyniki wyszukiwania</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="38"/>
         <source>Search result of the selected work</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyniki wyszukiwania dla wybranego dzieła</translation>
     </message>
 </context>
 <context>
-    <name>StandardWorksTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation type="unfinished">Biblia:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>Komentarz:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation type="unfinished">Leksykon:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>Rozważania codzienne:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>btm::InstallProgress</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="81"/>
+        <source>Failed</source>
+        <translation>Nie powiodło się</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="84"/>
+        <source>Completed</source>
+        <translation>Zakończono</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="62"/>
-        <source></source>
-        <translation></translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="90"/>
+        <source>Cancelled</source>
+        <translation>Anulowano</translation>
     </message>
 </context>
 <context>
-    <name>TextFiltersTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation type="unfinished">Każdy werset w nowej linii</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">Pokaz numery wersetów</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation type="unfinished">Pokaż nagłówki</translation>
-    </message>
+    <name>btm::InstallSources</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">Wyświetl odsyłacze</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">Pokaz greckie akcenty</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Pokaż hebrajskie znaki samogłosek</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Pokaz hebrajskie znaki kantylacji</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">Pokaż podział głosek</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation type="unfinished">Używaj wariantów tekstu</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="unfinished">Konfiguruj wyświetlanie tekstu. Możesz zmienić te ustawienia w każdym oknie z modułem.</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installsources.cpp" line="63"/>
+        <source>Failed to refresh source %1</source>
+        <translation>Odswieżanie źródła %1 nie powiodło się</translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source></source>
-        <translation></translation>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="59"/>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="62"/>
+        <source>The text you want to search for</source>
+        <translation>Tekst, który chcesz wyszukać</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/mobile/qml/main.qml" line="135"/>
+        <source>New Window</source>
+        <translation>Nowe okno</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation type="unfinished">Szukany tekst</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="136"/>
+        <source>View Window</source>
+        <translation>Pokaż okno</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/mobile/qml/main.qml" line="137"/>
+        <source>Text Font Size</source>
+        <translation>Rozmiar czcionki tekstu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/mobile/qml/main.qml" line="138"/>
+        <source>User Interface Font Size</source>
+        <translation>Rozmiar czcionki interfejsu użytkownika</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/mobile/qml/main.qml" line="141"/>
+        <source>Bookshelf Manager</source>
+        <translation>Menedżer Biblioteki</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/mobile/qml/main.qml" line="187"/>
+        <source>Single</source>
+        <translation>Pojedynczy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/mobile/qml/main.qml" line="188"/>
+        <source>Tabbed</source>
+        <translation>Na zakładkach</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/mobile/qml/main.qml" line="189"/>
+        <source>Auto-tile</source>
+        <translation>Auto-kafelki</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/mobile/qml/main.qml" line="190"/>
+        <source>Auto-tile horizontally</source>
+        <translation>Auto-kafelki poziomo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation type="unfinished">Zamknij</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="191"/>
+        <source>Auto-tile vertically</source>
+        <translation>Auto-kafelki pionowo</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/messages/bibletime_ui_pt.ts b/i18n/messages/bibletime_ui_pt.ts
index 069e9b2..c36ee67 100644
--- a/i18n/messages/bibletime_ui_pt.ts
+++ b/i18n/messages/bibletime_ui_pt.ts
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pt_BR" sourcelanguage="en_US">
+<TS version="2.0" language="pt_PT" sourcelanguage="en_US">
 <context>
     <name></name>
     <message>
         <source></source>
         <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
 This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
@@ -22,452 +22,457 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTime</name>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
+        <location filename="../../src/bibletime_init.cpp" line="741"/>
         <source>&amp;File</source>
         <translation>&amp;Ficheiro</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&amp;Search</source>
         <translation>&amp;Procurar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&amp;Window</source>
         <translation>&amp;Janela</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&amp;ttings</source>
         <translation>&amp;Configurações</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&amp;Help</source>
         <translation>Aju&amp;da</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&amp;Show toolbar</source>
         <translation>&amp;Ver barra de ferramentas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&amp;Fullscreen mode</source>
         <translation>&amp;Modo de ecrã inteiro</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&amp;Quit</source>
         <translation>&amp;Sair</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
+        <location filename="../../src/bibletime_init.cpp" line="251"/>
         <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
         <translation>Abra o estudo bíblico &quot;Como Fazer&quot; incluído no BibleTime. &lt;br/&gt; Este &quot;Como Fazer&quot; é uma introdução sobre como efectuar um estudo bíblico de maneira eficiente.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
+        <location filename="../../src/bibletime_init.cpp" line="256"/>
         <source>Information about the BibleTime program</source>
         <translation>Informações sobre o programa BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation>&amp;Guardar sessão</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>&amp;Carregar sessão</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&amp;Delete session</source>
         <translation>&amp;Apagar sessão</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&amp;Arrangement mode</source>
         <translation>Mod&amp;o de arranjo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&amp;Manual mode</source>
         <translation>&amp;Modo manual</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &amp;vertically</source>
         <translation>Organização &amp;vertical automática</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &amp;horizontally</source>
         <translation>Organização &amp;horizontal automática</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&amp;cascade</source>
         <translation>&amp;Cascata automática</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&amp;Cascade</source>
         <translation>&amp;Cascata</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &amp;vertically</source>
         <translation>Organizar &amp;verticalmente</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &amp;horizontally</source>
         <translation>Organizar &amp;horizontalmente</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&amp;ose all windows</source>
         <translation>Fechar t&amp;odas as janelas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
+        <location filename="../../src/bibletime_init.cpp" line="224"/>
         <source>Close all open windows inside BibleTime</source>
         <translation>Fechar todas as janelas abertas no BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
+        <location filename="../../src/bibletime_init.cpp" line="241"/>
         <source>&amp;Handbook</source>
         <translation>&amp;Manual</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&amp;Bible Study Howto</source>
         <translation>Estudo &amp;Bíblico Como Fazer</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
+        <location filename="../../src/bibletime_slots.cpp" line="533"/>
         <source>Please enter a name for the new session.</source>
         <translation>Por favor digite um nome para a nova sessão.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
+        <location filename="../../src/bibletime_slots.cpp" line="541"/>
+        <source>Session already exists</source>
+        <translation>A sessão já existe</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_slots.cpp" line="542"/>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation>A sessão com o nome &quot;%1&quot; Já existe. Por favor escolha outro nome.</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="107"/>
         <source>Quit BibleTime</source>
         <translation>Sair do BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
+        <location filename="../../src/bibletime_init.cpp" line="114"/>
         <source>Toggle fullscreen mode of the main window</source>
         <translation>Alternar o modo de ecrã completo da janela principal</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
+        <location filename="../../src/bibletime_init.cpp" line="123"/>
         <source>Search in &amp;open works...</source>
         <translation>Procurar nas &amp;obras abertas...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &amp;Bible...</source>
         <translation>Procurar na &amp;Bíblia padrão...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &amp;new session...</source>
         <translation>Guardar como &amp;nova sessão...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
+        <location filename="../../src/bibletime_init.cpp" line="140"/>
         <source>Create and save a new session</source>
         <translation>Criar e guardar uma nova sessão</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
+        <location filename="../../src/bibletime_init.cpp" line="147"/>
         <source>Manually arrange the open windows</source>
         <translation>Organizar manualmente as janelas abertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
+        <location filename="../../src/bibletime_init.cpp" line="154"/>
         <source>Automatically tile the open windows vertically (arrange side by side)</source>
         <translation>Organizar automaticamente as janelas abertas verticalmente (arranjar lado a lado)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
+        <location filename="../../src/bibletime_init.cpp" line="161"/>
         <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
         <translation>Organizar automaticamente as janelas abertas horizontalmente (arranjo uma em cima da outra)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
+        <location filename="../../src/bibletime_init.cpp" line="165"/>
         <source>Auto-&amp;tile</source>
         <translation>Au&amp;to-organizar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
+        <location filename="../../src/bibletime_init.cpp" line="168"/>
         <source>Automatically tile the open windows</source>
         <translation>Organizar automaticamente as janelas abertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
+        <location filename="../../src/bibletime_init.cpp" line="172"/>
         <source>Ta&amp;bbed</source>
         <translation>Separa&amp;dores&amp;</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
+        <location filename="../../src/bibletime_init.cpp" line="175"/>
         <source>Automatically tab the open windows</source>
         <translation>Organizar automaticamente as janelas abertas em separadores</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
+        <location filename="../../src/bibletime_init.cpp" line="182"/>
         <source>Automatically cascade the open windows</source>
         <translation>Organizar automaticamente as janelas abertas em cascata</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
+        <location filename="../../src/bibletime_init.cpp" line="189"/>
         <source>Cascade the open windows</source>
         <translation>Colocar as janelas abertas em cascata</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
+        <location filename="../../src/bibletime_init.cpp" line="193"/>
         <source>&amp;Tile</source>
         <translation>Organi&amp;zar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
+        <location filename="../../src/bibletime_init.cpp" line="196"/>
         <source>Tile the open windows</source>
         <translation>Organizar as janelas abertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
+        <location filename="../../src/bibletime_init.cpp" line="203"/>
         <source>Vertically tile (arrange side by side) the open windows</source>
         <translation>Organizar verticalmente (lado a lado) as janelas abertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
+        <location filename="../../src/bibletime_init.cpp" line="210"/>
         <source>Horizontally tile (arrange on top of each other) the open windows</source>
         <translation>Organizar horizontalmente (uma em cima da outra) as janelas abertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
+        <location filename="../../src/bibletime_init.cpp" line="214"/>
         <source>Close &amp;window</source>
         <translation>Fechar &amp;Janela</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
+        <location filename="../../src/bibletime_init.cpp" line="217"/>
         <source>Close the current open window</source>
         <translation>Fechar a janela actual</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
+        <location filename="../../src/bibletime_init.cpp" line="228"/>
         <source>&amp;Configure BibleTime...</source>
         <translation>&amp;Configurar o BibleTime...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime&apos;s preferences</source>
         <translation>Preferências do BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
+        <location filename="../../src/bibletime_init.cpp" line="234"/>
         <source>Bookshelf &amp;Manager...</source>
         <translation>Ge&amp;stor de Estante...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
+        <location filename="../../src/bibletime_init.cpp" line="237"/>
         <source>Configure your bookshelf and install/update/remove/index works</source>
         <translation>Configurar a sua estante e instalar/actualizar/remover/indexar obras</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
+        <location filename="../../src/bibletime_init.cpp" line="244"/>
         <source>Open BibleTime&apos;s handbook</source>
         <translation>Abrir o Manual do BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&amp;Tip of the day...</source>
         <translation>&amp;Dica do dia...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
+        <location filename="../../src/bibletime_init.cpp" line="263"/>
         <source>Show tips about BibleTime</source>
         <translation>Mostrar dicas do BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
+        <location filename="../../src/bibletime_init.cpp" line="402"/>
         <source>Toggle visibility of the bookshelf window</source>
         <translation>Mudar a visibilidade da estante</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
+        <location filename="../../src/bibletime_init.cpp" line="406"/>
         <source>Toggle visibility of the bookmarks window</source>
         <translation>Mudar a visibilidade da janela de marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
+        <location filename="../../src/bibletime_init.cpp" line="410"/>
         <source>Toggle visibility of the mag window</source>
         <translation>Mudar a visibilidade da janela da lupa</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
+        <location filename="../../src/bibletime_init.cpp" line="735"/>
         <source>Main toolbar</source>
         <translation>Barra de ferramentas principal</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
+        <location filename="../../src/bibletime_init.cpp" line="736"/>
         <source>Navigation toolbar</source>
         <translation>Barra de ferramentas de navegação</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
+        <location filename="../../src/bibletime_init.cpp" line="737"/>
         <source>Works toolbar</source>
         <translation>Barra de ferramentas das obras</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
+        <location filename="../../src/bibletime_init.cpp" line="738"/>
         <source>Tools toolbar</source>
         <translation>Barra de ferramentas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
+        <location filename="../../src/bibletime_init.cpp" line="739"/>
         <source>Format toolbar</source>
         <translation>Barra de ferramentas de formatação</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
+        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <source>Sw&amp;itch session</source>
+        <translation>&amp;Mudar de sessão</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="777"/>
         <source>Show main toolbar</source>
         <translation>Mostrar a barra de ferramentas principal</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
+        <location filename="../../src/bibletime_init.cpp" line="780"/>
         <source>Show navigation bar</source>
         <translation>Mostrar a barra de navegação</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
+        <location filename="../../src/bibletime_init.cpp" line="783"/>
         <source>Show works toolbar</source>
         <translation>Mostrar a barra de ferramentas das obras</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
+        <location filename="../../src/bibletime_init.cpp" line="786"/>
         <source>Show tools toolbar</source>
         <translation>Mostrar a barra de ferramentas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
+        <location filename="../../src/bibletime_init.cpp" line="789"/>
         <source>Show formatting toolbar</source>
         <translation>Mostrar a barra de ferramentas de formatação</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
+        <location filename="../../src/bibletime_init.cpp" line="792"/>
         <source>Show bookshelf</source>
         <translation>Mostrar Estante</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
+        <location filename="../../src/bibletime_init.cpp" line="795"/>
         <source>Show bookmarks</source>
         <translation>Mostrar marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
+        <location filename="../../src/bibletime_init.cpp" line="798"/>
         <source>Show mag</source>
         <translation>Mostrar Lupa</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
+        <location filename="../../src/bibletime_init.cpp" line="743"/>
         <source>Toolbars</source>
         <translation>Barras de ferramentas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <location filename="../../src/bibletime_init.cpp" line="774"/>
         <source>Show toolbars in text windows</source>
         <translation>Mostrar barras de ferramentas nas janelas de texto</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
+        <location filename="../../src/bibletime_init.cpp" line="801"/>
         <source>Show parallel text headers</source>
         <translation>Mostrar cabeçalhos de texto paralelos</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
+        <location filename="../../src/bibletime_init.cpp" line="747"/>
         <source>O&amp;pen windows</source>
         <translation>A&amp;brir janelas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show &quot;Whats this widget&quot; dialog</source>
         <translation>Mostrar diálogo &quot;Que widget é este&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
+        <location filename="../../src/bibletime_init.cpp" line="954"/>
         <source>Whats this widget?</source>
         <translation>Que widget é este?</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
+        <location filename="../../src/bibletime_init.cpp" line="126"/>
         <source>Search in all works that are currently open</source>
         <translation>Procurar em todas as obras actualmente abertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
+        <location filename="../../src/bibletime_init.cpp" line="133"/>
         <source>Search in the standard Bible</source>
         <translation>Procurar na Bíblia padrão</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
+        <location filename="../../src/bibletime_slots.cpp" line="532"/>
         <source>New Session</source>
         <translation>Nova sessão</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
+        <location filename="../../src/bibletime.cpp" line="77"/>
         <source>Initializing the SWORD engine...</source>
-        <translation>Inicializando o motor SWORD...</translation>
+        <translation>A iniciar o motor SWORD...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
+        <location filename="../../src/bibletime.cpp" line="85"/>
         <source>Creating BibleTime&apos;s user interface...</source>
         <translation>A criar o interface do utilizador do BibleTime...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
+        <location filename="../../src/bibletime.cpp" line="92"/>
         <source>Initializing menu- and toolbars...</source>
         <translation>A iniciar o menu e barras de ferramentas...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Unlock Work</source>
         <translation>Desbloquear Obra</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Enter the unlock key for %1.</source>
         <translation>Entre com a chave para %1.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
+        <location filename="../../src/bibletime.cpp" line="214"/>
         <source>Warning: Invalid unlock key!</source>
         <translation>Atenção: Chave inválida!</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
+        <location filename="../../src/bibletime.cpp" line="215"/>
         <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
         <translation>A chave fornecida não desbloqueou este módulo correctamente. Por favor, tente novamente.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
+        <location filename="../../src/bibletime_init.cpp" line="255"/>
         <source>&amp;About BibleTime</source>
         <translation>&amp;Sobre o BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
+        <location filename="../../src/bibletime_init.cpp" line="733"/>
         <source>Bookmarks</source>
         <translation>Marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
+        <location filename="../../src/bibletime_init.cpp" line="734"/>
         <source>Mag</source>
         <translation>Lupa</translation>
     </message>
@@ -475,7 +480,8 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTimeApp</name>
     <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
+        <location filename="../../src/bibletimeapp.cpp" line="59"/>
+        <location filename="../../src/mobile/bibletimeapp.cpp" line="63"/>
         <source>Fatal error!</source>
         <translation>Erro fatal!</translation>
     </message>
@@ -483,7 +489,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtAboutDialog</name>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
         <source>BibleTime is an easy to use but powerful Bible study tool.</source>
         <translation>BibleTime é uma poderosa ferramenta de estudo Bíblico e fácil de usar.</translation>
     </message>
@@ -498,52 +504,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Abaixo está a licença completa vinculada juridicamente.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="109"/>
         <source>About BibleTime</source>
         <translation>Sobre o BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="121"/>
         <source>&amp;BibleTime</source>
         <translation>&amp;BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="126"/>
         <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
         <translation>Estamos à procura desenvolvedores e tradutores. Se gostaria de se juntar à nossa equipa, por favor, envie um e-mail para %1.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation>(c)1999-2013, A equipa do BibleTime</translation>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="130"/>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished">(c)1999-2014, A equipa do BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="137"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Colaboradores</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="148"/>
         <source>The following people contributed to BibleTime:</source>
         <translation>As seguintes pessoas contribuíram para o BibleTime:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="150"/>
         <source>documentation and translation manager</source>
         <translation>Gestor de documentação e traduções</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="172"/>
         <source>project manager</source>
         <translation>administrador do projeto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>tester</source>
         <translation>testador</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>usability expert</source>
         <translation>especialista em usabilidade</translation>
     </message>
@@ -583,53 +589,53 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>&amp;Licença</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
         <source>designer</source>
         <translation>designer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="139"/>
         <source>developer</source>
         <translation>programador</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
         <source>project founder</source>
         <translation>fundador do projeto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="157"/>
         <source>packager</source>
         <translation>criador dos pacotes</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="158"/>
         <source>creator of The Sword Project</source>
         <translation>criador do projecto Sword</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
         <source>domain sponsor</source>
         <translation>patrocinador do domínio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
         <source>howto</source>
         <translatorcomment>Já foi consagrado o uso</translatorcomment>
         <translation>Como fazer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="141"/>
         <source>artist</source>
         <translation>artista</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="173"/>
         <source>documentation</source>
         <translation>documentação</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="188"/>
         <source>The following people translated BibleTime into their language:</source>
         <translation>As seguintes pessoas traduziram o BibleTime para as suas línguas:</translation>
     </message>
@@ -657,37 +663,37 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBibleKeyWidget</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="110"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Rolar através das entradas da lista. Pressione o botão e mova o rato para incrementar ou decrementar o item.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
         <source>Next book</source>
         <translation>Próximo livro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
         <source>Previous book</source>
         <translation>Livro Anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="117"/>
         <source>Next chapter</source>
         <translation>Próximo capítulo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
         <source>Previous chapter</source>
         <translation>Capítulo anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="122"/>
         <source>Next verse</source>
         <translation>Próximo versículo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
         <source>Previous verse</source>
         <translation>Versículo anterior</translation>
     </message>
@@ -766,27 +772,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfGroupingMenu</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
         <source>Category/Language</source>
         <translation>Categoria/Idioma</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
         <source>Language/Category</source>
         <translation>Idioma/Categoria</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="105"/>
         <source>Language</source>
         <translation>Idioma</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="108"/>
         <source>No grouping</source>
         <translation>Sem agrupamento</translation>
     </message>
@@ -794,7 +800,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfModel</name>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
+        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="78"/>
         <source>Module</source>
         <translation>Módulo</translation>
     </message>
@@ -802,23 +808,23 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfWidget</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="157"/>
         <source>Fi&amp;lter:</source>
         <translation>Fi&amp;ltro:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="158"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
         <source>Grouping</source>
         <translation>A agrupar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="159"/>
         <source>Change the grouping of items in the bookshelf.</source>
         <translation>Alterar o agrupamento de itens na estante.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
         <source>Show/hide works</source>
         <translation>Mostrar/ocultar obras</translation>
     </message>
@@ -832,69 +838,130 @@ This file is distributed under the same license as the Bibetime package.</transl
     </message>
 </context>
 <context>
+    <name>BtConfig</name>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="46"/>
+        <source>Old testament</source>
+        <translation>Antigo testamento</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="47"/>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation>Moisés/Pentateuco/Torá</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="48"/>
+        <source>History</source>
+        <translation>História</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="49"/>
+        <source>Prophets</source>
+        <translation>Profetas</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="50"/>
+        <source>New testament</source>
+        <translation>Novo testamento</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="51"/>
+        <source>Gospels</source>
+        <translation>Evangelhos</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="52"/>
+        <source>Letters/Epistles</source>
+        <translation>Cartas/Epístolas</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="53"/>
+        <source>Paul&apos;s Epistles</source>
+        <translation>Epístolas de Paulo</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="89"/>
+        <source>Error loading configuration!</source>
+        <translation>Erro ao carregar configuração!</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="90"/>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation>Erro ao carregar a configuração do BibleTime, porque aparentemente o ficheiro de configuração pertence a uma versão mais recente do programa. Isto provavelmente foi causado por uma desactualização do BibleTime. Carregar o novo ficheiro de configuração poderá resultar em &lt;b&gt;perca de dados&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Pretende mesmo assim tentar carregar o novo ficheiro de configuração? Escolha &quot;Não&quot; para sair imediatamente do BibleTime.</translation>
+    </message>
+</context>
+<context>
+    <name>BtConfigCore</name>
+    <message>
+        <location filename="../../src/backend/config/btconfigcore.cpp" line="62"/>
+        <source>Default Session</source>
+        <translation>Sessão Padrão</translation>
+    </message>
+</context>
+<context>
     <name>BtDisplaySettingsButton</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="103"/>
         <source>Use linebreaks after each verse</source>
         <translation>Usar quebras de linha após cada versículo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
         <source>Show verse numbers</source>
         <translation>Mostrar número dos versículos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
         <source>Show headings</source>
         <translation>Mostar títulos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
         <source>Highlight words of Jesus</source>
         <translation>Realçar palavras de Jesus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
         <source>Show Hebrew vowel points</source>
         <translation>Mostrar pontos da vogal hebraica</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
         <source>Show Hebrew cantillation marks</source>
         <translation>Mostrar sinais da cantilena hebraica</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
         <source>Show Greek accents</source>
         <translation>Mostrar acentos gregos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
         <source>Use alternative textual variant</source>
         <translation>Usar variação textual alternativa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
         <source>Show scripture cross-references</source>
         <translation>Mostrar referências-cruzadas das escrituras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
         <source>Show footnotes</source>
         <translation>Mostrar notas de rodapé</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
         <source>Show morph segmentation</source>
         <translation>Mostrar a segmentação dos morfemas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="120"/>
         <source>Display settings</source>
         <translation>Preferências de exibição</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="123"/>
         <source>Display settings: No options available</source>
         <translation>Configurações de exibição: Nenhuma opção disponível</translation>
     </message>
@@ -902,27 +969,45 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtEditBookmarkDialog</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="71"/>
         <source>Edit Bookmark</source>
         <translation>Editar marcador</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
         <source>Title:</source>
         <translation>Título:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
         <source>Description:</source>
         <translation>Descrição:</translation>
     </message>
 </context>
 <context>
+    <name>BtFindWidget</name>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="28"/>
+        <source>Previous</source>
+        <translation>Anterior</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="29"/>
+        <source>Next</source>
+        <translation>Seguinte</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="74"/>
+        <source>Match case</source>
+        <translation>Diferenciar Maiúsculas de Minúsculas</translation>
+    </message>
+</context>
+<context>
     <name>BtFontChooserWidget</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
@@ -943,27 +1028,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="151"/>
         <source>&amp;Language:</source>
         <translation>&amp;Idioma:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
         <source>The font selection below will apply to all texts in this language</source>
         <translation>A selecção do tipo de letra abaixo será aplicada a todos os textos neste idioma</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
         <source>Use custom font</source>
         <translation>Usar tipo de letra personalizado</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
         <source>Optionally specify a custom font for each language:</source>
         <translation>Especificar opcionalmente um tipo de letra personalizado para cada idioma:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="150"/>
         <source>Fonts</source>
         <translation>Tipos de letra</translation>
     </message>
@@ -971,67 +1056,67 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtIndexPage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="107"/>
         <source>%1 KiB</source>
         <translation>%1 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="114"/>
         <source>0 KiB</source>
         <translation>0 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="124"/>
         <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
         <translation>Se selecionados, os índices que não tenham correspondência a obras serão apagados quando o BibleTime iniciar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
         <source>Automatically delete orphaned indexes when BibleTime starts</source>
         <translation>Apagar automaticamente índices órfãos quando o BibleTime Iniciar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="127"/>
         <source>Delete the selected indexes</source>
         <translation>Apagar os índices seleccionados</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="130"/>
         <source>Create new indexes for the selected works</source>
         <translation>Criar novos índices para as obras seleccionadas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Work</source>
         <translation>Obra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Index size</source>
         <translation>Tamanho do índice</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="122"/>
         <source>Search Indexes</source>
         <translation>Procurar índices</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="91"/>
         <source>Indexed Works</source>
         <translation>Obras Indexadas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="96"/>
         <source>Unindexed Works</source>
         <translation>Obras não indexadas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
         <source>Create...</source>
         <translation>Criar...</translation>
     </message>
@@ -1057,17 +1142,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallModuleChooserDialogModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="88"/>
         <source>Work</source>
         <translation>Obra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="89"/>
         <source>Installation source</source>
         <translation>Fonte de instalação</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="90"/>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
@@ -1160,12 +1245,12 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>O diretório de destino não é gravável ou não existe. A instalação vai falhar se isto não for corrigido primeiro.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="388"/>
         <source>Delete Source?</source>
         <translation>Apagar Fonte?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="389"/>
         <source>Do you really want to delete this source?</source>
         <translation>Você deseja realmente apagar esta fonte?</translation>
     </message>
@@ -1178,17 +1263,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPageModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="75"/>
         <source>Work</source>
         <translation>Obra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="76"/>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="77"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
@@ -1204,99 +1289,99 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPathDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="35"/>
         <source>Bookshelf Folders</source>
         <translation>Pastas da estante</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
         <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
         <translation>As obras podem ser instaladas em uma ou mais pastas. Depois de configurá-las aqui, você pode escolher uma delas na página de instalação.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="45"/>
         <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
         <translation>O BibleTime e a biblioteca SWORD encontram as obras de todas estas pastas. Se uma pasta é removida aqui, ela continua a existir no sistema com todas as obras nela.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="48"/>
         <source>Configure bookshelf folders</source>
         <translation>Configurar pastas da Estante</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="53"/>
         <source>Configuration file for the folders is: </source>
         <translation>O ficheiro de configuração para as pastas é:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="61"/>
         <source>Folders where new works can be installed</source>
         <translation>Pastas onde novas obras podem ser instaladas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
         <source>Read-only folders</source>
         <translation>Pastas somente de leitura</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="66"/>
         <source>Nonexistent folders</source>
         <translation>Pastas não-existentes</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="80"/>
         <source>&amp;Add...</source>
         <translation>&amp;Adicionar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="81"/>
         <source>Add new folder</source>
         <translation>Adicionar nova pasta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="86"/>
         <source>&amp;Edit...</source>
         <translation>&amp;Editar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="87"/>
         <source>Edit the selected folder</source>
         <translation>Editar a pasta seleccionada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="92"/>
         <source>&amp;Remove</source>
         <translation>&amp;Remover</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="93"/>
         <source>Remove the selected folder</source>
         <translation>Remover a pasta seleccionada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="167"/>
         <source>This default folder in your home directory can&apos;t be removed</source>
         <translation>Esta pasta padrão no seu diretório pessoal não pode ser removida</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="194"/>
         <source>Choose Folder</source>
         <translation>Escolher pasta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>Use Folder?</source>
         <translation>Usar pasta?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
         <translation>Esta pasta não pode ser escrita, logo, obras não podem ser instaladas aqui utilizando o BibleTime. Quer utilizar esta pasta em vez da anterior?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
         <translation>Esta pasta não pode ser escrita, logo, obras não podem ser instaladas aqui utilizando o BibleTime. Ainda assim quer adicioná-la à lista das pastas da Estante?</translation>
     </message>
@@ -1304,52 +1389,42 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallProgressDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Work</source>
         <translation>Obra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Progress</source>
         <translation>Progresso</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>Parar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="60"/>
         <source>Stop All</source>
         <translation>Parar Tudo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Completed</source>
         <translation>Completado</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>Cancelado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="55"/>
         <source>Waiting for turn...</source>
         <translation>Esperando pela vez...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="113"/>
         <source>Preparing install...</source>
         <translation>A preparar a Instalação...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="37"/>
         <source>Install Progress</source>
         <translation>Progresso da Instalação</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Failed</source>
         <translation>Falhou</translation>
     </message>
@@ -1357,17 +1432,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
         <source>Language for names of Bible books:</source>
         <translation>Idioma para os nomes dos livros bíblicos:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation>Os idiomas que podem ser usados para os nomes dos livros da bíblia</translation>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="136"/>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation>A liguagens  que podem ser usadas para os nomes dos Livros Biblicos. As traduções são fornecidas pela biblioteca Sword.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="133"/>
         <source>Languages</source>
         <translation>Idiomas</translation>
     </message>
@@ -1417,7 +1492,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtModuleManagerDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="57"/>
         <source>Bookshelf Manager</source>
         <translation>Gestor de Estante</translation>
     </message>
@@ -1425,7 +1500,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkAction</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="103"/>
         <source>&amp;Open work</source>
         <translation>&amp;Abrir obra</translation>
     </message>
@@ -1433,12 +1508,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkActionMenu</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="42"/>
         <source>&amp;Grouping order</source>
         <translation>Ordem de a&amp;grupamento</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="43"/>
         <source>Sets the grouping order for the items in this menu.</source>
         <translation>Define a ordem de agrupamento para os itens neste menu.</translation>
     </message>
@@ -1474,47 +1549,47 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtRemovePage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="100"/>
         <source>Select &amp;works to uninstall:</source>
         <translation>Seleccione &amp;obras para desinstalar:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&amp;Remove...</source>
         <translation>&amp;Remover...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="98"/>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="111"/>
         <source>Start removal of %1 works:</source>
         <translation>Iniciar remoção de %1 obras:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="114"/>
         <source>Start removal:</source>
         <translation>Iniciar remoção:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="145"/>
         <source>You selected the following work(s): </source>
         <translation>Você seleccionou a(s) seguinte(s) obra(s):</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="149"/>
         <source>Do you really want to remove them from your system?</source>
         <translation>Quer realmente removê-las do seu sistema?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
         <source>Remove the selected works</source>
         <translation>Remover as obras seleccionadas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="151"/>
         <source>Remove Works?</source>
         <translation>Remover Obras?</translation>
     </message>
@@ -1535,12 +1610,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtSearchModuleChooserDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="47"/>
         <source>Works to Search in</source>
         <translation>Obras para Procurar em</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="49"/>
         <source>Select the works which should be searched.</source>
         <translation>Seleccione as obras que devem ser procuradas.</translation>
     </message>
@@ -1624,24 +1699,165 @@ atalho</translation>
     </message>
 </context>
 <context>
+    <name>BtStandardWorksTab</name>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="169"/>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation>Obras padrão são usadas quando nenhuma obra é especificada, por exemplo, quando uma hiperligação de uma Bíblia ou de um Léxico foi clicado.</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
+        <translation>Bíblia:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="174"/>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation>A Bíblia Padrão é usada quando um hiperligação para dentro da Bíblia é clicado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</source>
+        <translation>Comentário:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="178"/>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation>O comentário padrão é usado quando uma hiperligação de um comentário é clicado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
+        <translation>Léxico:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="182"/>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation>O léxico normal é usado quando uma hiperligação em um léxico é clicado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</source>
+        <translation>Devocional diário:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="186"/>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation>O devocional padrão será usado para mostrar uma curta inicialização do devocional </translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation>Léxico Hebraico Strong:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="190"/>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation>O léxico hebraico padrão é usado quando uma hiperligação em um léxico Hebraico é clicado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation>Léxico Grego Strong:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="194"/>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation>O léxico grego padrão é usado quando uma hiperligação em um léxico grego é clicado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</source>
+        <translation>Léxico hebraico morfológico:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="198"/>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation>O léxico padrão morfológico dos textos hebraicos, é usado quando uma hiperligação de uma tag morfológica de um texto hebraico é clicada</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</source>
+        <translation>Léxico morfológico Grego:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="202"/>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation>O léxico padrão morfológico para os textos gregos é usado quando uma hiperligação de uma tag morfológica de um texto grego é clicada</translation>
+    </message>
+</context>
+<context>
+    <name>BtTextFiltersTab</name>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="74"/>
+        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
+        <translation>Filtros de controle da aparência do texto. Aqui você pode especificar configurações padrão para todos os filtros. Você pode substituir essas configurações em cada janela de visualização.</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="78"/>
+        <source>Insert line break after each verse</source>
+        <translation>Inserir quebra de linha após cada versículo</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
+        <source>Show verse numbers</source>
+        <translation>Mostrar numero dos versículos</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
+        <source>Show section headings</source>
+        <translation>Mostrar titulos de secção</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
+        <source>Show scripture cross-references</source>
+        <translation>Mostrar referências-cruzadas das escrituras</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="82"/>
+        <source>Show Greek accents</source>
+        <translation>Mostrar acentos gregos</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="83"/>
+        <source>Show Hebrew vowel points</source>
+        <translation>Mostrar pontos vogais Hebraicos</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="84"/>
+        <source>Show Hebrew cantillation marks</source>
+        <translation>Mostrar sinais da cantilena hebraica</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="85"/>
+        <source>Show morph segmentation</source>
+        <translation>Mostrar a segmentação dos morfemas</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="86"/>
+        <source>Use textual variants</source>
+        <translation>Usar variações textuais</translation>
+    </message>
+</context>
+<context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
         <source>Add/remove/replace</source>
         <translation>Adicionar/remover/substituir</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
         <source>Replace</source>
         <translation>Substituir</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
@@ -1649,87 +1865,87 @@ atalho</translation>
 <context>
     <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="69"/>
         <source>Tip Of The Day</source>
         <translation>Dica do dia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="83"/>
         <source>Show tips at startup</source>
         <translation>Mostrar dicas ao iniciar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="94"/>
         <source>Next Tip</source>
         <translation>Próxima dica</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
         <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
         <translation>Para adicionar várias bíblias em paralelo na sua janela activa da Bíblia, seleccione este ícone e escolha outra Bíblia.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
         <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
         <translation>Para adicionar vários comentários bíblicos em paralelo na sua janela activa da Bíblia, seleccione este ícone e escolha outro comentário bíblico.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="134"/>
         <source>To learn more about the BibleTime project please go to our web site.</source>
         <translation>Para saber mais sobre o projecto BibleTime, por favor, visite nosso site.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="137"/>
         <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
         <translation>Para sincronizar uma janela de comentário com a janela da Bíblia activa, active a janela do comentário e seleccione este ícone.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
         <source>Select the icon again to stop the synchronization.</source>
         <translation>Seleccione o ícone novamente para parar a sincronização.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="142"/>
         <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
         <translation>Para criar um marcador, arraste qualquer versículo ou referễncia de uma Bíblia ou comentário para a janela de marcadores. Uma seta indicará a posição do marcador quando você largar o cursor. Outras obras terão uma referência no canto superior esquerdo que podem ser usadas para criar um marcador.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="147"/>
         <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
         <translation>Para mudar um título de marcador ou descrição, clique com o botão direito no marcador e selecione o menu Editar Marcador. Depois de terminar a edição, a descrição pode ser vista ao passar com o cursor sobre o marcador.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="151"/>
         <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
         <translation>Para carregar várias fontes de instalação de obras, vá ao Gestor de Estantes, seleccione o botão adicionar, e depois o botão Obter Lista.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="154"/>
         <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
         <translation>Para encontrar mais informação sobre uma obra, vá à janela da Estante, clique com o botão direito na obra, e seleccione o menu Sobre.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="157"/>
         <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
         <translation>A Estante, os Marcadores e a janela da Lupa podem ser movidas para novos locais arrastado-as pelo título, no topo de cada janela. Elas podem ser colocadas à direita, esquerda, acima ou abaixo das janelas das obras.Elas podem ser colocados em cima, umas das outras e os seus separadores aparecerão de forma que cada janela possa ser seleccionada. Elas podem ser redimensionadas arrastando as bordas entre as janelas.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="163"/>
         <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
         <translation>Você pode procurar por números em negrito numa obra. Inicie com uma obra que possui números a negrito e passe o cursor por cima de uma palavra. Clique com o botão direito sobre a palavra e utilize o menu Procurar Negritos. Um diálogo de pesquisa aparecerá e permitirá que você use o mesmo número em negrito em outros lugares da obra.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="178"/>
         <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
         <translation>Vocẽ pode guardar suas janelas abertas actualmente como uma sessão. Assim, a sessão pode ser facilmente restaurada depois. Você pode guardar quantas sessões desejar. Este recurso pode ser acedido por baixo do menu Janelas.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="168"/>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
         <translation>Você pode guardar notas pessoais para referências específicas de versículos. Você precisa instalar o comentário Personal. Abra o Gestor de Livros, escolha Crosswire como fonte e procure em Commentários e Inglês. Uma vez instalado. use a janela da Estante e clique com o botão direito no comentário Personal. Use tanto o menu Editar Texto Puro quanto o Editar HTML para abrir a obra em modo escrita.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
         <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
         <translation>Você pode visualizar a informação do número Strong na janela Lupa passando o cursor sobre uma palavra na Bíblia que possui os números Strong. Você deve ter os léxicos StrongsGreek e StrongsHebrew de Crosswire instalados.</translation>
     </message>
@@ -1745,49 +1961,49 @@ atalho</translation>
 <context>
     <name>CAcceleratorSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="128"/>
         <source>Choose action group:</source>
         <translation>Escolha um grupo de acções:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="130"/>
         <source>Main Window</source>
         <translation>Janela Principal</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
         <source>All text windows</source>
         <translation>Todas as janelas de texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="132"/>
         <source>Bible windows</source>
         <translation>Janelas de Bíblias</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
         <source>Commentary windows</source>
         <translation>Janelas de comentários</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="134"/>
         <source>Lexicon windows</source>
         <translation>Janelas do léxico</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
         <source>Book windows</source>
         <translation>Janelas de Livros</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
         <source>
    &quot;%1&quot; in the &quot;%2&quot; group</source>
         <translation>
    &quot;%1&quot; no &quot;%2&quot; grupo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
         <source>Shortcuts</source>
         <translation>Atalhos</translation>
     </message>
@@ -1795,95 +2011,95 @@ atalho</translation>
 <context>
     <name>CBibleReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="64"/>
         <source>Next book</source>
         <translation>Próximo livro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="68"/>
         <source>Previous book</source>
         <translation>Livro Anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="72"/>
         <source>Next chapter</source>
         <translation>Próximo capítulo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="76"/>
         <source>Previous chapter</source>
         <translation>Capítulo anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="80"/>
         <source>Next verse</source>
         <translation>Próximo versículo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="84"/>
         <source>Previous verse</source>
         <translation>Versículo anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="89"/>
         <source>Copy chapter</source>
         <translation>Copiar capítulo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="92"/>
         <source>Save chapter as plain text</source>
         <translation>Guardar capítulo como texto puro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="95"/>
         <source>Save chapter as HTML</source>
         <translation>Guardar capítulo como HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="98"/>
         <source>Print chapter</source>
         <translation>Imprimir capítulo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="110"/>
         <source>Text of reference</source>
         <translation>Texto da referência</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
         <source>Reference with text</source>
         <translation>Referência com texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="253"/>
         <source>Bible window</source>
         <translation>Janela da Bíblia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="263"/>
         <source>Copy...</source>
         <translation>Copiar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="274"/>
         <source>Save...</source>
         <translation>Guardar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="287"/>
         <source>Print...</source>
         <translation>Imprimir...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="371"/>
         <source>Copying</source>
         <translation>A copiar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="390"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="408"/>
         <source>Saving</source>
         <translation>A Guardar</translation>
     </message>
@@ -1891,7 +2107,7 @@ atalho</translation>
 <context>
     <name>CBookReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
+        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="70"/>
         <source>Toggle tree view</source>
         <translation>Alternar visualização de árvore</translation>
     </message>
@@ -1899,93 +2115,93 @@ atalho</translation>
 <context>
     <name>CBookmarkIndex</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
         <source>Bookmarks</source>
         <translation>Marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="92"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="583"/>
         <source>New folder</source>
         <translation>Nova pasta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
         <source>Rename folder</source>
         <translation>Renomear pasta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
         <source>Delete Items</source>
         <translation>Apagar Itens</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="704"/>
         <source>Do you really want to delete the selected items and child-items?</source>
         <translation>Quer realmente apagar o item seleccionado e todos os sub-itens?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="814"/>
         <source>The work to which the bookmark points to is not installed.</source>
         <translation>A obra para a qual o marcador aponta não está instalado.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
         <source>Print bookmarks...</source>
         <translation>Imprimir marcadores...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="103"/>
         <source>Remove selected items...</source>
         <translation>Remover itens seleccionados...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
         <source>Import to folder...</source>
         <translation>Importar para pasta...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
         <source>Edit bookmark...</source>
         <translation>Editar marcador...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
         <source>Sort folder bookmarks...</source>
         <translation>Ordenar marcadores da pasta...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
         <source>Sort all bookmarks...</source>
         <translation>Ordenar todos os marcadores...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="100"/>
         <source>Export from folder...</source>
         <translation>Exportar da pasta...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="393"/>
         <source>Can drop only bookmarks or one folder</source>
         <translation>Pode arrastar e largar somente marcadores ou uma pasta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="398"/>
         <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
         <translation>Não pode arrastar e largar uma pasta nela mesma ou numa subpasta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="406"/>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="467"/>
         <source>Drag references from text views to this view</source>
         <translation>Arrastar referências das visualizações de texto para esta visualização</translation>
     </message>
@@ -1993,42 +2209,42 @@ atalho</translation>
 <context>
     <name>CCommentaryReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="31"/>
         <source>Next book</source>
         <translation>Próximo livro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="35"/>
         <source>Previous book</source>
         <translation>Livro Anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="39"/>
         <source>Next chapter</source>
         <translation>Próximo capítulo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="43"/>
         <source>Previous chapter</source>
         <translation>Capítulo anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="47"/>
         <source>Next verse</source>
         <translation>Próximo versículo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="51"/>
         <source>Previous verse</source>
         <translation>Versículo anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="56"/>
         <source>Synchronize</source>
         <translation>Sincronizar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="59"/>
         <source>Synchronize the displayed entry of this work with the active Bible window</source>
         <translation>Sincronizar a entrada mostrada nesta obra com a janela activa da Bíblia</translation>
     </message>
@@ -2036,7 +2252,7 @@ atalho</translation>
 <context>
     <name>CConfigurationDialog</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="41"/>
         <source>Configure BibleTime</source>
         <translation>Configurar o BibleTime</translation>
     </message>
@@ -2044,67 +2260,67 @@ atalho</translation>
 <context>
     <name>CDisplaySettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
         <source>Display templates</source>
         <translation>Mostrar modelos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
         <source>Available display styles:</source>
         <translation>Estilos de exposição disponíveis:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="113"/>
         <source>Style preview</source>
         <translation>Pré-visualização do estilo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="131"/>
         <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
         <translation>Porque Deus amou o mundo de tal maneira que deu o seu unico Filho unigênito, para que todo aquele que nele crê não pereça, mas tenha a vida eterna.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="138"/>
         <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
         <translation>Porque Deus enviou o seu Filho ao mundo, não para que condenasse o mundo, mas para que o mundo fosse salvo através ele.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="145"/>
         <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
         <translation>Quem crê nele não é julgado; mas quem não crê já está condenado, porque  não crê no nome do Filho unigênito de Deus.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="155"/>
         <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
         <translation>Porque todo aquele que faz o mal odeia a luz, e não vem para a luz, para que as suas obras não sejam reprovadas.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="160"/>
         <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
         <translation>Mas quem pratica a verdade vem para a luz, a fim de que as suas obras sejam manifestas, porque são feitas em Deus.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="106"/>
         <source>Display templates define how text is displayed.</source>
         <translation>Mostrar modelos define como o texto é exibido.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="110"/>
         <source>Show the BibleTime logo on startup</source>
         <translation>Mostrar o logo do BibleTime na inicialização</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
         <source>Show startup logo</source>
         <translation>Mostrar logo na inicialização</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="150"/>
         <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
         <translation>E a condenaçäo é esta: Que a luz veio ao mundo, e os homens amaram mais as trevas do que a luz, porque as suas obras eram más. </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="101"/>
         <source>Display</source>
         <translation>Opções de Exibição</translation>
     </message>
@@ -2117,62 +2333,62 @@ atalho</translation>
 <context>
     <name>CDisplayWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="215"/>
         <source>Back in history</source>
         <translation>Voltar no histórico</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="223"/>
         <source>Forward in history</source>
         <translation>Para a frente no histórico</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="192"/>
         <source>Select all</source>
         <translation>Seleccionar tudo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="196"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="200"/>
         <source>Find...</source>
         <translation>Procurar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="204"/>
         <source>Change location</source>
         <translation>Mudar local</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="209"/>
         <source>Search with works of this window</source>
         <translation>Procurar em obras desta janela</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="393"/>
         <source>Work chooser buttons</source>
         <translation>Botões seleccionadores de obras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="403"/>
         <source>Text area header</source>
         <translation>Cabeçalho da área de texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="453"/>
         <source>Navigation</source>
         <translation>Navegação</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="459"/>
         <source>Tool</source>
         <translation>Ferramenta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="465"/>
         <source>Format</source>
         <translation>Formatar</translation>
     </message>
@@ -2180,61 +2396,61 @@ atalho</translation>
 <context>
     <name>CHTMLWriteDisplay</name>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
         <source>Bold</source>
         <translation>Negrito</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="60"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="67"/>
         <source>Italic</source>
         <translation>Itálico</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="79"/>
         <source>Underline</source>
         <translation>Sublinhado</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="84"/>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="94"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="99"/>
         <source>Center</source>
         <translation>Centro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="104"/>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="231"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="243"/>
         <source>Font size</source>
         <translation>Tamanho da Fonte</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="255"/>
         <source>Font color</source>
         <translation>Cor da Fonte</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="89"/>
         <source>Align left</source>
         <translation>Alinhar à esquerda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="109"/>
         <source>Align right</source>
         <translation>Alinhar à direita</translation>
     </message>
@@ -2242,17 +2458,17 @@ atalho</translation>
 <context>
     <name>CHTMLWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="122"/>
         <source>Module not writable</source>
         <translation>Não é permitido escrever neste módulo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="124"/>
         <source>Module is not writable.</source>
         <translation>Não é permitido escrever neste módulo.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="125"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Ou o módulo não pode ser editado, ou você não tem  permissão para escrever.</translation>
     </message>
@@ -2268,22 +2484,22 @@ atalho</translation>
 <context>
     <name>CLexiconKeyChooser</name>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Rolar através das entradas da lista. Prima o botão e mova o rato para aumentar ou diminuir o item.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
         <source>Entries of the current work</source>
         <translation>Entradas da obra actual</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Próxima entrada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="49"/>
         <source>Previous entry</source>
         <translation>Entrada anterior</translation>
     </message>
@@ -2291,70 +2507,70 @@ atalho</translation>
 <context>
     <name>CLexiconReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Próxima entrada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="51"/>
         <source>Previous entry</source>
         <translation>Entrada anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="55"/>
         <source>Copy reference only</source>
         <translation>Copiar somente as referências</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
         <source>Save entry as HTML</source>
         <translation>Guardar entradas como HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
         <source>Print reference only</source>
         <translation>Imprimir somente as referências</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
         <source>Strong&apos;s Search</source>
         <translation>Procura por Negritos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
         <source>Entry with text</source>
         <translation>Entrada com o texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="134"/>
         <source>Entry as plain text</source>
         <translation>Entrada como texto puro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="265"/>
         <source>Lexicon window</source>
         <translation>Janela de Léxico</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="272"/>
         <source>Copy...</source>
         <translation>Copiar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="281"/>
         <source>Save...</source>
         <translation>Guardar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="297"/>
         <source>Print...</source>
         <translation>Imprimir...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="340"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="364"/>
         <source>Saving</source>
         <translation>A guardar</translation>
     </message>
@@ -2362,91 +2578,112 @@ atalho</translation>
 <context>
     <name>CPlainWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="235"/>
         <source>Sync with active Bible</source>
         <translation>Sincronizar com a bíblia activa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="245"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="249"/>
         <source>Save text</source>
         <translation>Guardar texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="254"/>
         <source>Delete current entry</source>
         <translation>Apagar entrada actual</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="263"/>
         <source>Restore original text</source>
         <translation>Restaurar texto original</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="163"/>
         <source>Module not writable</source>
         <translation>O módulo não permite escrita</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="165"/>
         <source>Module is not writable.</source>
         <translation>O módulo não permite escrita.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="166"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Ou o módulo não pode ser editado, ou você não tem  permissão para escrever. </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="240"/>
         <source>Synchronize (show the same verse) with the active Bible window</source>
         <translation>Sincronizar (mostrar o mesmo versículo) com a janela activa da Bíblia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="258"/>
         <source>Delete current entry (no undo)</source>
         <translation>Apagar entrada actual (não será possível desfazer)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="267"/>
         <source>Restore original text, new text will be lost</source>
         <translation>Restaurar o texto original, texto novo será perdido</translation>
     </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save Text?</source>
+        <translation>Guardar texto?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <source>Save text before closing?</source>
+        <translation>Guardar texto antes de fechar?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save changed text?</source>
+        <translation>Guardar texto alterado?</translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="232"/>
         <source>Save Search Analysis</source>
         <translation>Guardar Análise de Procura</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation>Ficheiros HTML (*.html;*.HTML;*.HTM;*.htm)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="243"/>
         <source>BibleTime Search Analysis</source>
         <translation>Análise de Procura do BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="234"/>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
+        <translation>Ficheiros XHTML (*.html *.HTML *.HTM *.htm);;Todos os Ficheiros (*)</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="259"/>
+        <source>Search text:</source>
         <translation>Procurar texto:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="263"/>
+        <source>Results by work and book</source>
+        <translation>Resultados por trabalho e livro</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="265"/>
         <source>Book</source>
         <translation>Livro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="293"/>
         <source>Total hits</source>
         <translation>Total de cliques</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="303"/>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
         <translation>Criado por &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</translation>
     </message>
@@ -2454,168 +2691,168 @@ atalho</translation>
 <context>
     <name>CSwordModuleInfo</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="763"/>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="766"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="774"/>
         <source>unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="771"/>
         <source>Markup</source>
         <translation>Marcação</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
         <source>Location</source>
         <translation>Localização</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="782"/>
         <source>Language</source>
         <translation>Idioma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="787"/>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="792"/>
         <source>LCSH</source>
         <translation>LCSH</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="796"/>
         <source>Writable</source>
         <translation>Gravável</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>yes</source>
         <translation>sim</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>no</source>
         <translation>não</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="801"/>
         <source>Unlock key</source>
         <translation>Chave de Desbloqueio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="822"/>
         <source>Features</source>
         <translation>Características</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="830"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Cuidado, esta obra contém material questionável / cultural!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="834"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="856"/>
         <source>Distribution license</source>
         <translation>Licença da distribuição</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="857"/>
         <source>Distribution source</source>
         <translation>Fonte da distribuição</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="858"/>
         <source>Distribution notes</source>
         <translation>Notas da distribuição</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="859"/>
         <source>Text source</source>
         <translation>Fonte do texto </translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="860"/>
         <source>Copyright notes</source>
         <translation>Notas do copyright</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
         <source>Copyright holder</source>
         <translation>Detentor dos direitos de autor</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
         <source>Copyright date</source>
         <translation>Data dos direitos de autor</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
         <source>Copyright contact name</source>
         <translation>Nome do contacto dos direitos de autor</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
         <source>Copyright contact address</source>
         <translation>Endereço do contacto dos direitos de autor</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
         <source>Copyright contact email</source>
         <translation>Email do contacto dos direitos de autor</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="956"/>
         <source>Bibles</source>
         <translation>Bíblias</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="958"/>
         <source>Commentaries</source>
         <translation>Comentários</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="960"/>
         <source>Books</source>
         <translation>Livros</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="962"/>
         <source>Cults/Unorthodox</source>
         <translation>Cultos/Heterodoxos</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="964"/>
         <source>Maps and Images</source>
         <translation>Mapas e Imagens</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="966"/>
         <source>Daily Devotionals</source>
         <translation>Devocionais Diários</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="968"/>
         <source>Lexicons and Dictionaries</source>
         <translation>Léxicos e Dicionários</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="970"/>
         <source>Glossaries</source>
         <translation>Glossários</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="972"/>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
@@ -2623,17 +2860,17 @@ atalho</translation>
 <context>
     <name>CSwordSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="43"/>
         <source>Standard works</source>
         <translation>Obras padrão</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="44"/>
         <source>Text filters</source>
         <translation>Filtros do texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="41"/>
         <source>Desk</source>
         <translation>Mesa</translation>
     </message>
@@ -2646,37 +2883,37 @@ atalho</translation>
 <context>
     <name>CSwordSetupInstallSourcesDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="47"/>
         <source>Caption</source>
         <translation>Título</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="68"/>
         <source>Path</source>
         <translation>Caminho</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="91"/>
         <source>Get list...</source>
         <translation>Obter lista...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
         <source>A source with this caption already exists. Please provide a different caption.</source>
         <translation>Uma fonte com este título já existe. Por favor, forneça outro título.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="160"/>
         <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
 
 Do you want to continue?</source>
@@ -2685,140 +2922,121 @@ Do you want to continue?</source>
 Deseja continuar?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
         <source>Get source list from remote server?</source>
         <translation>Obter lista de fontes de servidor remoto?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="167"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="168"/>
         <source>Downloading List</source>
         <translation>A transferir a Lista</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="178"/>
         <source>Connecting...</source>
         <translation>A Conectar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="197"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="198"/>
         <source>Refreshing...</source>
         <translation>A actualizar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="92"/>
         <source>Download a list of sources from CrossWire server and add sources</source>
         <translation>Descarregar uma lista de fontes do servidor CrossWire e adicionar fontes</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
         <source>Please provide a caption.</source>
         <translation>Por favor forneça um título.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
         <source>Please provide a server name.</source>
         <translation>Por favor, forneça um nome de servidor.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
         <source>Please provide a valid, readable path.</source>
         <translation>Por favor forneça um caminho válido.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Please provide a path.</source>
         <translation>Por favor forneça um caminho.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="39"/>
         <source>New  Installation Source</source>
         <translation>Nova fonte de instalação</translation>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>Guardar texto antes de fechar?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>Guardar texto alterado?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>Guardar texto?</translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="178"/>
         <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
         <translation>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Versão: %3&lt;/p&gt;&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="194"/>
         <source>Abbreviation</source>
         <translation>Abreviação</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="203"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="290"/>
         <source>Cross references</source>
         <translation>Referências Cruzadas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="343"/>
         <source>Footnote</source>
         <translation>Notas de rodapé</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="374"/>
         <source>Strongs</source>
         <translation>Negritos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="451"/>
         <source>Morphology</source>
         <translation>Marcações morfológicas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="472"/>
         <source>Word lookup</source>
         <translation>Pesquisa de palavras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="60"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
         <source>Select all</source>
         <translation>Seleccionar tudo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="80"/>
         <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
         <translation>&lt;small&gt;Esta é a área da visualização da Lupa. Passe o rato por cima de links ou outros items que incluem alguma informação e o conteúdo aparecerá na Lupa depois de um pequeno atraso. Movimente o rato para dentro da Lupa rapidamente ou bloquear a visualização pressionando e soltando a tecla Shift enquanto movimenta o rato.&lt;/small&gt;</translation>
     </message>
@@ -2826,28 +3044,28 @@ Deseja continuar?</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="412"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="422"/>
         <source>Indexing aborted</source>
         <translation>Indexação abortada</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="413"/>
         <source>An internal error occurred while building the index: %1</source>
         <translation>Ocorreu um erro interno durante a construção do índice. %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="423"/>
         <source>An internal error occurred while building the index.</source>
         <translation>Ocorreu um erro interno durante a construção do índice.</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="522"/>
         <source>Search aborted</source>
         <translation>Pesquisa abortada</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="523"/>
         <source>An internal error occurred while executing your search.</source>
         <translation>Ocorreu um erro interno enquanto se executava a sua pesquisa.</translation>
     </message>
@@ -2888,7 +3106,7 @@ Deseja continuar?</translation>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="122"/>
         <source>Bibles</source>
         <translation>Bíblias</translation>
     </message>
@@ -2905,740 +3123,740 @@ Deseja continuar?</translation>
         <translation>Livros</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="390"/>
         <source>Added text</source>
         <translation>Texto Adicionado</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="143"/>
         <source>Names of languages</source>
         <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
         <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="148"/>
         <source>Afrikaans</source>
         <extracomment>Language name af</extracomment>
         <translation>Africâner</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="151"/>
         <source>Amuzgo, Guerrero</source>
         <extracomment>Language name amu</extracomment>
         <translation>Amuzgo, Guerrero, Oaxaca</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="153"/>
         <source>English, Old (ca.450-1100)</source>
         <extracomment>Language name ang</extracomment>
         <translation>Inglês Antigo (ca.450-1100)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="155"/>
         <source>Arabic</source>
         <extracomment>Language name ar</extracomment>
         <translation>�rabe</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="158"/>
         <source>Azerbaijani</source>
         <extracomment>Language name az</extracomment>
         <translation>Azeri</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="160"/>
         <source>Azerbaijani, South</source>
         <extracomment>Language name azb</extracomment>
         <translation>Azeri Sul</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="165"/>
         <source>Belarusian</source>
         <extracomment>Language name be</extracomment>
         <translation>Bielo-russo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="167"/>
         <source>Bulgarian</source>
         <extracomment>Language name bg</extracomment>
         <translation>Búlgaro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="173"/>
         <source>Breton</source>
         <extracomment>Language name br</extracomment>
         <translation>Bretão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="175"/>
         <source>Bosnian</source>
         <extracomment>Language name bs</extracomment>
         <translation>Bósnio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="177"/>
         <source>Catalan</source>
         <extracomment>Language name ca</extracomment>
         <translation>Catalão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="180"/>
         <source>Chinantec, Comaltepec</source>
         <extracomment>Language name cco</extracomment>
         <translation>Chinantec de Comaltepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="182"/>
         <source>Cebuano</source>
         <extracomment>Language name ceb</extracomment>
         <translation>Cubano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
         <source>Chamorro</source>
         <extracomment>Language name ch</extracomment>
         <translation>Chamorro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
         <source>Chontal, Highland Oaxaca</source>
         <extracomment>Language name chd</extracomment>
         <translation>Chontal, Planalto de Oaxaca</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
         <source>Chinantec, Quiotepec</source>
         <extracomment>Language name chq</extracomment>
         <translation>Chinantec, Quiotepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="190"/>
         <source>Chinantec, Ozumacu00edn</source>
         <extracomment>Language name chz</extracomment>
         <translation>Chinantec, Ozumacín</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="193"/>
         <source>Cakchiquel, Western</source>
         <extracomment>Language name ckw</extracomment>
         <translation>Cakchiquel Ocidental</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="195"/>
         <source>Chinantec, Lalana</source>
         <extracomment>Language name cnl</extracomment>
         <translation>Chinantec, Lalana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="197"/>
         <source>Chinantec, Tepetotutla</source>
         <extracomment>Language name cnt</extracomment>
         <translation>Chinantec, Tepetolutla</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="199"/>
         <source>Coptic</source>
         <extracomment>Language name cop</extracomment>
         <translation>Copta</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
         <source>Czech</source>
         <extracomment>Language name cs</extracomment>
         <translation>Tcheco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
         <source>Chinantec, Sochiapan</source>
         <extracomment>Language name cso</extracomment>
         <translation>Chinantec, Sochiapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
         <source>Chol, Tila</source>
         <extracomment>Language name cti</extracomment>
         <translation>Chol, Tila</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
         <source>Chatino, Western Highland</source>
         <extracomment>Language name ctp</extracomment>
         <translation>Chatino, Planalto Ocidental</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
         <source>Church Slavic</source>
         <extracomment>Language name cu</extracomment>
         <translation>Eslavo Eclesiástico</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="212"/>
         <source>Welsh</source>
         <extracomment>Language name cy</extracomment>
         <translation>Galês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
         <source>Danish</source>
         <extracomment>Language name da</extracomment>
         <translation>Dinamarquês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
         <source>German</source>
         <extracomment>Language name de</extracomment>
         <translation>Alemão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
         <source>Duruma</source>
         <extracomment>Language name dug</extracomment>
         <translation>Duruma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="221"/>
         <source>Greek, Modern (1453-)</source>
         <extracomment>Language name el</extracomment>
         <translation>Grego, Moderno (1453-)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
         <source>English</source>
         <extracomment>Language name en</extracomment>
         <translation>Inglês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="225"/>
         <source>American English</source>
         <extracomment>Language name en_US</extracomment>
         <translation>Inglês Americano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="227"/>
         <source>English, Middle (1100-1500)</source>
         <extracomment>Language name enm</extracomment>
         <translation>Inglês, Médio (1100-1500)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="229"/>
         <source>Esperanto</source>
         <extracomment>Language name eo</extracomment>
         <translation>Esperanto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="231"/>
         <source>Spanish</source>
         <extracomment>Language name es</extracomment>
         <translation>Espanhol</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
         <source>Estonian</source>
         <extracomment>Language name et</extracomment>
         <translation>Estoniano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
         <source>Basque</source>
         <extracomment>Language name eu</extracomment>
         <translation>Basco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
         <source>Persian</source>
         <extracomment>Language name fa</extracomment>
         <translation>Persa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
         <source>Finnish</source>
         <extracomment>Language name fi</extracomment>
         <translation>Finlandês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="243"/>
         <source>French</source>
         <extracomment>Language name fr</extracomment>
         <translation>Francês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="245"/>
         <source>Frisian</source>
         <extracomment>Language name fy</extracomment>
         <translation>Frisão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="247"/>
         <source>Irish</source>
         <extracomment>Language name ga</extracomment>
         <translation>Irlandês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="249"/>
         <source>Gaelic (Scots)</source>
         <extracomment>Language name gd</extracomment>
         <translation>Gaulês (Escocês)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="251"/>
         <source>Geez</source>
         <extracomment>Language name gez</extracomment>
         <translation>ge&apos;ez</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
         <source>Gothic</source>
         <extracomment>Language name got</extracomment>
         <translation>Gótico</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
         <source>Manx</source>
         <extracomment>Language name gv</extracomment>
         <translation>Manx</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
         <source>Greek, Ancient (to 1453)</source>
         <extracomment>Language name grc</extracomment>
         <translation>Grego, Antigo (até 1453)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="262"/>
         <source>Hebrew</source>
         <extracomment>Language name he</extracomment>
         <translation>Hebraico</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
         <source>Hausa</source>
         <extracomment>Language name hau</extracomment>
         <translation>haússa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
         <source>Hawaiian</source>
         <extracomment>Language name haw</extracomment>
         <translation>Havaiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
         <source>Hindi</source>
         <extracomment>Language name hi</extracomment>
         <translation>Hindi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="271"/>
         <source>Croatian</source>
         <extracomment>Language name hr</extracomment>
         <translation>Croata</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="275"/>
         <source>Hungarian</source>
         <extracomment>Language name hu</extracomment>
         <translation>Húngaro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
         <source>Huave, San Mateo Del Mar</source>
         <extracomment>Language name huv</extracomment>
         <translation>Huave, San Mateo Del Mar</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
         <source>Armenian</source>
         <extracomment>Language name hy</extracomment>
         <translation>Armênio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
         <source>Indonesian</source>
         <extracomment>Language name id</extracomment>
         <translation>Indonésio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
         <source>Icelandic</source>
         <extracomment>Language name is</extracomment>
         <translation>Islândico</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
         <source>Italian</source>
         <extracomment>Language name it</extracomment>
         <translation>Italiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="291"/>
         <source>Itzu00e1</source>
         <extracomment>Language name itz</extracomment>
         <translation>itzá</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="293"/>
         <source>Ixil, San Juan Cotzal</source>
         <extracomment>Language name ixl</extracomment>
         <translation>Ixil, San Juan Cotzal</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
         <source>Japanese</source>
         <extracomment>Language name ja</extracomment>
         <translation>Japonês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
         <source>Jacalteco, Eastern</source>
         <extracomment>Language name jac</extracomment>
         <translation>Jacaltelco Oriental</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
         <source>Javanese, Caribbean</source>
         <extracomment>Language name jvn</extracomment>
         <translation>Javanês, Caribe</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="302"/>
         <source>Georgian</source>
         <extracomment>Language name ka</extracomment>
         <translation>Georgiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
         <source>Korean</source>
         <extracomment>Language name ko</extracomment>
         <translation>Coreano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="315"/>
         <source>Kurdish</source>
         <extracomment>Language name ku</extracomment>
         <translation>Curdo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
         <source>Kirghiz</source>
         <extracomment>Language name ky</extracomment>
         <translation>Quirguiz</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
         <source>Latin</source>
         <extracomment>Language name la</extracomment>
         <translation>Latim</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
         <source>Lacandon</source>
         <extracomment>Language name lac</extracomment>
         <translation>lacandão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
         <source>Lithuanian</source>
         <extracomment>Language name lt</extracomment>
         <translation>Lituano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="332"/>
         <source>Latvian</source>
         <extracomment>Language name lv</extracomment>
         <translation>Letão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="334"/>
         <source>Malagasy</source>
         <extracomment>Language name mg</extracomment>
         <translation>Malgaxe</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="337"/>
         <source>Maori</source>
         <extracomment>Language name mi</extracomment>
         <translation>Maori</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="339"/>
         <source>Mixe, Isthmus</source>
         <extracomment>Language name mir</extracomment>
         <translation>Mixe, Istmo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="341"/>
         <source>Mixtec, Coatzospan</source>
         <extracomment>Language name miz</extracomment>
         <translation>Mixtec, Coatzospan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="343"/>
         <source>Macedonian</source>
         <extracomment>Language name mk</extracomment>
         <translation>Macedoniano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="345"/>
         <source>Mixtec, Silacayoapan</source>
         <extracomment>Language name mks</extracomment>
         <translation>Mixtec, Silacayoapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="350"/>
         <source>More</source>
         <extracomment>Language name mos</extracomment>
         <translation>more</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
         <source>Malay</source>
         <extracomment>Language name ms</extracomment>
         <translation>Malaio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
         <source>Maltese</source>
         <extracomment>Language name mt</extracomment>
         <translation>Maltês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="375"/>
         <source>Low German; Low Saxon</source>
         <extracomment>Language name nds</extracomment>
         <translation>Baixo Alemão; Baixo Saxão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="377"/>
         <source>Nepali</source>
         <extracomment>Language name ne</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="379"/>
         <source>Nahuatl, Guerrero</source>
         <extracomment>Language name ngu</extracomment>
         <translation>Nahuatl, Guerrero</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
         <source>Nahuatl, Northern Oaxaca</source>
         <extracomment>Language name nhy</extracomment>
         <translation>Nahuatl, Oaxaca Norte</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
         <source>Dutch</source>
         <extracomment>Language name nl</extracomment>
         <translation>Holandês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
         <source>Norwegian Nynorsk</source>
         <extracomment>Language name nn</extracomment>
         <translation>Novo Norueguês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
         <source>Norwegian</source>
         <extracomment>Language name no</extracomment>
         <translation>Norueguês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="397"/>
         <source>Otomi, Queru00e9taro</source>
         <extracomment>Language name otq</extracomment>
         <translation>Otomi, Querétaro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
         <source>Papiamento</source>
         <extracomment>Language name pap</extracomment>
         <translation>Papiamento</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
         <source>Polish</source>
         <extracomment>Language name pl</extracomment>
         <translation>Polonês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="411"/>
         <source>Persian (Dari)</source>
         <extracomment>Language name prs</extracomment>
         <translation>Dari Persa (Dari)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="415"/>
         <source>Portuguese</source>
         <extracomment>Language name pt</extracomment>
         <translation>Português</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
         <source>Brasilian Portuguese</source>
         <extracomment>Language name pt_BR</extracomment>
         <translation>Português do Brasil</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
         <source>Quichu00e9, West Central</source>
         <extracomment>Language name qut</extracomment>
         <translation>Quiché, Centro-Ocidental</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
         <source>Romanian</source>
         <extracomment>Language name ro</extracomment>
         <translation>Romeno</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
         <source>Russian</source>
         <extracomment>Language name ru</extracomment>
         <translation>Russo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="431"/>
         <source>Scots</source>
         <extracomment>Language name sco</extracomment>
         <translation>Escocês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="437"/>
         <source>Slovak</source>
         <extracomment>Language name sk</extracomment>
         <translation>Eslovaco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="439"/>
         <source>Slovenian</source>
         <extracomment>Language name sl</extracomment>
         <translation>Eslovênio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="443"/>
         <source>Somali</source>
         <extracomment>Language name so</extracomment>
         <translation>Somali</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
         <source>Albanian</source>
         <extracomment>Language name sq</extracomment>
         <translation>Albanês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="453"/>
         <source>Swedish</source>
         <extracomment>Language name sv</extracomment>
         <translation>Sueco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="455"/>
         <source>Swahili</source>
         <extracomment>Language name sw</extracomment>
         <translation>Suali</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="457"/>
         <source>Syriac</source>
         <extracomment>Language name syr</extracomment>
         <translation>Sírio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="459"/>
         <source>Tamil</source>
         <extracomment>Language name ta</extracomment>
         <translation>Tâmil</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="463"/>
         <source>Thai</source>
         <extracomment>Language name th</extracomment>
         <translation>Tailandês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
         <source>Tagalog</source>
         <extracomment>Language name tl</extracomment>
         <translation>Filipino</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="470"/>
         <source>Tswana</source>
         <extracomment>Language name tn</extracomment>
         <translation>Tsuana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="472"/>
         <source>Turkish</source>
         <extracomment>Language name tr</extracomment>
         <translation>Turco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
         <source>Tektiteko</source>
         <extracomment>Language name ttc</extracomment>
         <translation>Tektiteko</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="479"/>
         <source>Tahitian</source>
         <extracomment>Language name ty</extracomment>
         <translation>Taitiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="481"/>
         <source>Tzotzil, Zinacantu00e1n</source>
         <extracomment>Language name tzz</extracomment>
         <translation>Tzotzil, Zinacantán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
         <source>Ukrainian</source>
         <extracomment>Language name uk</extracomment>
         <translation>Ucraniano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
         <source>Orya</source>
         <extracomment>Language name ury</extracomment>
         <translation>Orya</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
         <source>Uspanteco</source>
         <extracomment>Language name usp</extracomment>
         <translation>Uspanteco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="492"/>
         <source>Vietnamese</source>
         <extracomment>Language name vi</extracomment>
         <translation>Vietnamita</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="496"/>
         <source>Xhosa</source>
         <extracomment>Language name xh</extracomment>
         <translation>Xosa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="163"/>
         <source>Bavarian</source>
         <extracomment>Language name bar</extracomment>
         <translation>Bavário</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="326"/>
         <source>Lombard</source>
         <extracomment>Language name lmo</extracomment>
         <translation>Lombardo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="403"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
         <source>Uma</source>
         <extracomment>Language name ppk
 ----------
@@ -3646,442 +3864,422 @@ Language name ppk</extracomment>
         <translation>Uma (Sulawesi)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="448"/>
         <source>Sranan</source>
         <extracomment>Language name srn</extracomment>
         <translation>sranam tongo (taki-taki)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
         <source>Yiddish</source>
         <extracomment>Language name yi</extracomment>
         <translation>Iídiche</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
         <source>Zapotec, San Juan Guelavu00eda</source>
         <extracomment>Language name zab</extracomment>
         <translation>Zapotec, San Juan Guelavía</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="507"/>
         <source>Zapotec, Mitla</source>
         <extracomment>Language name zaw</extracomment>
         <translation>Zapotec, Mitla</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="509"/>
         <source>Chinese</source>
         <extracomment>Language name zh</extracomment>
         <translation>Chinês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="511"/>
         <source>Zapotec, Amatlu00e1n</source>
         <extracomment>Language name zpo</extracomment>
         <translation>Zapotec, Amatlán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
         <source>Zapotec, Zoogocho</source>
         <extracomment>Language name zpq</extracomment>
         <translation>Zapotec, Zoogocho</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="515"/>
         <source>Zapotec, Yalu00e1lag</source>
         <extracomment>Language name zpu</extracomment>
         <translation>Zapotec, Yalálag</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
         <source>Zapotec, Chichicapan</source>
         <extracomment>Language name zpv</extracomment>
         <translation>Zapotec, Chichicapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
         <source>Zapotec, Southern Rincon</source>
         <extracomment>Language name zsr</extracomment>
         <translation>Zapotec, Rincon Sul</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
         <source>Zapotec, Quioquitani-Quieru00ed</source>
         <extracomment>Language name ztq</extracomment>
         <translation>Zapotec, Quioquitani-Quierí</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
         <source>Zapotec, Yatee</source>
         <extracomment>Language name zty</extracomment>
         <translation>Zapotec, Yatee</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="525"/>
         <source>Zulu</source>
         <extracomment>Language name zu</extracomment>
         <translation>Zulu</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="314"/>
         <source>Footnotes</source>
         <translatorcomment>Notas de Rodapé</translatorcomment>
         <translation>Notas de rodapé</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="316"/>
         <source>Strong&apos;s numbers</source>
         <translation>Números de Strong</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="318"/>
         <source>Headings</source>
         <translation>Títulos</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="320"/>
         <source>Morphological tags</source>
         <translation>Marcações morfológicas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="322"/>
         <source>Lemmas</source>
         <translation>Lemas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="324"/>
         <source>Hebrew vowel points</source>
         <translation>Pontos da vogal hebraica</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="326"/>
         <source>Hebrew cantillation marks</source>
         <translation>Sinais da crestomatia Hebraica</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="328"/>
         <source>Greek accents</source>
         <translation>Acentos Gregos</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="330"/>
         <source>Red letter words</source>
         <translation>Palavras com letras vermelhas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="332"/>
         <source>Textual variants</source>
         <translation>Variações Textuais</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="334"/>
         <source>Scripture cross-references</source>
         <translation>Referências-cruzadas das Escrituras</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="336"/>
         <source>Morph segmentation</source>
         <translation>Segmentação dos morfemas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation>Exportar</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
         <source>Local</source>
         <translation>Local</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>Remoto</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Antigo testamento</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Moisés/Pentateuco/Torá</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>História</translation>
+        <source>Remote FTP</source>
+        <translation>FTP Remoto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Profetas</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="32"/>
+        <source>Remote SFTP</source>
+        <translation>SFTP Remoto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>Novo testamento</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="33"/>
+        <source>Remote HTTP</source>
+        <translation>HTTP Remoto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Evangelhos</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="34"/>
+        <source>Remote HTTPS</source>
+        <translation>HTTPS Remoto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>Cartas/Epístolas</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Epístolas de Paulo</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
         <source>HTML files</source>
         <translation>Ficheiros HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="438"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>All files</source>
         <translation>Todos os ficheiros</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>Text files</source>
         <translation>Ficheiros de texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="444"/>
         <source>Save file</source>
         <translation>Guardar Ficheiro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="130"/>
         <source>Save document ...</source>
         <translation>Guardar documento...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
         <source>BibleTime bookmark files</source>
         <translation>Ficheiros marcadores do BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="127"/>
         <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
         <source>unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="60"/>
         <source>New folder</source>
         <translation>Nova pasta</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
+        <location filename="../../src/util/tool.cpp" line="48"/>
         <source>The file already exists.</source>
         <translation>O ficheiro já existe.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
+        <location filename="../../src/util/tool.cpp" line="49"/>
         <source>Do you want to overwrite it?</source>
         <translation>Gostaria de sobrescrevê-lo?</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
+        <location filename="../../src/util/tool.cpp" line="69"/>
+        <location filename="../../src/util/tool.cpp" line="75"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>O ficheiro não pode ser guardado.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
+        <location filename="../../src/util/tool.cpp" line="78"/>
         <source>Please check permissions etc.</source>
         <translation>Por favor verifique as permissões, etc.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
+        <location filename="../../src/util/tool.cpp" line="197"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Cuidado, esta obra contém material questionável / cultural!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
+        <location filename="../../src/util/tool.cpp" line="218"/>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
+        <location filename="../../src/util/tool.cpp" line="207"/>
         <source>Encrypted - needs unlock key</source>
         <translation>Encriptado - precisa da chave de desbloqueamento</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
+        <location filename="../../src/util/tool.cpp" line="71"/>
+        <source>Error while writing to file.</source>
+        <translation>Erro ao escrever para o ficheiro.</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="72"/>
+        <source>Please check that enough disk space is available.</source>
+        <translation>Por favor certifique-se de que existe espaço suficiente em disco.</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="77"/>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation>O ficheiro não pode ser aberto para guardar.</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="231"/>
         <source>Double click for more information</source>
         <translation>Clique duplo para mais informações</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
+        <location filename="../../src/util/tool.cpp" line="213"/>
         <source>Updated version available!</source>
         <translation>Versão Actualizada disponível!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
+        <location filename="../../src/util/tool.cpp" line="226"/>
         <source>Installed version</source>
         <translation>Versão instalada</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="273"/>
         <source>Haitian Creole</source>
         <extracomment>Language name ht</extracomment>
         <translation>Crioulo Haitiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
         <source>Kekchu00ed</source>
         <comment>kek</comment>
         <extracomment>Language name kek</extracomment>
         <translation>Queqchi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="357"/>
         <source>(Multiple languages)</source>
         <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
         <translation>(Múltiplos Idiomas)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="359"/>
         <source>Mam, Central</source>
         <extracomment>Language name mvc</extracomment>
         <translation>Mam, Central</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
         <source>Mam, Todos Santos Cuchumatu00e1n</source>
         <extracomment>Language name mvj</extracomment>
         <translation>Todos Santos Cuchumatán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="363"/>
         <source>Mixe, Juquila</source>
         <extracomment>Language name mxq</extracomment>
         <translation>Mixe, Juquila</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="365"/>
         <source>Mixtec, Jamiltepec</source>
         <extracomment>Language name mxt</extracomment>
         <translation>Mixtec, Jamiltepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="367"/>
         <source>Burmese</source>
         <extracomment>Language name my</extracomment>
         <translation>Birmanês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="370"/>
         <source>Norwegian Bokmu00e5l</source>
         <extracomment>Language name nb</extracomment>
         <translation>Norueguês Bokmål</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="372"/>
         <source>Nahuatl, Michoacu00e1n</source>
         <extracomment>Language name ncl</extracomment>
         <translation>Nahuatl Michoacán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
         <source>Potawatomi</source>
         <extracomment>Language name pot</extracomment>
         <translation>Potawatomi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="468"/>
         <source>Klingon</source>
         <extracomment>Language name tlh</extracomment>
         <translation>Klingon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="498"/>
         <source>Mixtec, Diuxi-Tilantongo</source>
         <extracomment>Language name xtd</extracomment>
         <translation>Mixtec, Diuxi-Tilantongo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
         <source>Yoryba</source>
         <extracomment>Language name yo</extracomment>
         <translation>Yorubá</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="407"/>
         <source>Verb tense changed</source>
         <translation>Tempo Verbal mudado</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>Can&apos;t write file</source>
         <translation>O ficheiro não pôde ser escrito</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>The Sword config file can&apos;t be written!</source>
         <translation>O ficheiro de configuração do Sword não pode ser escrito!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="39"/>
         <source>Export Bookmarks</source>
         <translation>Exportar Marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="50"/>
         <source>Import bookmarks</source>
         <translation>Importar marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
+        <location filename="../../src/util/tool.cpp" line="46"/>
         <source>Overwrite File?</source>
         <translation>Sobrescrever ficheiro?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="276"/>
         <source>Parsing Strong&apos;s Numbers</source>
         <translation>Analisar Números Strong</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="154"/>
         <source>This shortcut conflicts with the shortcut for the following actions:</source>
         <translation>Este atalho tem um conflito com o atalho para as seguintes acções:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
         <source>Do you want to clear the conflicting shortcuts and continue?</source>
         <translation>Você quer limpar os atalhos em conflito e continuar?</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="23"/>
         <source>Indexed works</source>
         <translation>Obras Indexadas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="24"/>
         <source>Unindexed works</source>
         <translation>Obras não-indexadas</translation>
     </message>
@@ -4126,17 +4324,17 @@ Language name ppk</extracomment>
         <translation>Erro: Argumento de linha de comandos inválido: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="57"/>
         <source>CSS base template not found!</source>
-        <translation type="unfinished"></translation>
+        <translation>Modelo base de CSS não encontrado!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="74"/>
         <source>Default template &quot;%1&quot; not found!</source>
         <translation>Modelo parão &quot;%1&quot; não encontrado!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="113"/>
         <source>Replace</source>
         <translation>Substituir</translation>
     </message>
@@ -4144,91 +4342,91 @@ Language name ppk</extracomment>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="58"/>
         <source>OK</source>
         <comment>Dialog Button</comment>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="59"/>
         <source>Open</source>
         <comment>Dialog Button</comment>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="60"/>
         <source>Save</source>
         <comment>Dialog Button</comment>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="61"/>
         <source>Cancel</source>
         <comment>Dialog Button</comment>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="62"/>
         <source>Close</source>
         <comment>Dialog Button</comment>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="63"/>
         <source>Discard</source>
         <comment>Dialog Button</comment>
         <translation>Descartar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="64"/>
         <source>Apply</source>
         <comment>Dialog Button</comment>
         <translation>Aplicar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="65"/>
         <source>Reset</source>
         <comment>Dialog Button</comment>
         <translation>Reiniciar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="66"/>
         <source>Restore defaults</source>
         <comment>Dialog Button</comment>
         <translation>Restaurar Definições</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="67"/>
         <source>Help</source>
         <comment>Dialog Button</comment>
         <translation>Ajuda</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="68"/>
         <source>Save All</source>
         <comment>Dialog Button</comment>
         <translation>Guardar Tudo</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="69"/>
         <source>Yes</source>
         <comment>Dialog Button</comment>
         <translation>Sim</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="70"/>
         <source>Yes to all</source>
         <comment>Dialog Button</comment>
         <translation>Sim para todos</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="71"/>
         <source>No</source>
         <comment>Dialog Button</comment>
         <translation>Não</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="72"/>
         <source>No to all</source>
         <comment>Dialog Button</comment>
         <translation>Não para todos</translation>
@@ -4237,102 +4435,102 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchOptionsArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="97"/>
         <source>Search for:</source>
         <translation>Procurar por:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="104"/>
         <source>&amp;Search</source>
         <translation>&amp;Procurar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="106"/>
         <source>Start to search the text in the chosen works</source>
         <translation>Começar a procurar o texto nas obras escolhidas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="109"/>
         <source>Ch&amp;oose...</source>
         <translation>Esc&amp;olher...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="111"/>
         <source>Choose works for the search</source>
         <translation>Escolher obras para pesquisa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="114"/>
         <source>S&amp;etup...</source>
         <translation>Con&amp;figurar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="133"/>
         <source>All of the words (AND is added between the words)</source>
         <translation>Todas as palavras (AND é adicionado entre as palavras)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="137"/>
         <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
         <translation> (&lt;a href=&apos;syntax_help&apos;&gt;Sintaxe completa&lt;/a&gt;)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="148"/>
         <source>Scope:</source>
         <translation>Âmbito:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="169"/>
         <source>The text you want to search for</source>
         <translation>O texto que você deseja pesquisar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="173"/>
         <source>Works:</source>
         <translation>Obras:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="346"/>
         <source>No search scope</source>
         <translation>Sem âmbito de pesquisa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="128"/>
         <source>All words</source>
         <translation>Todas as palavras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="116"/>
         <source>Configure predefined scopes for search</source>
         <translation>Configurar âmbitos pré-definidos para pesquisa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="130"/>
         <source>Some words</source>
         <translation>Algumas palavras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
         <source>Free</source>
         <translation>Livre</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
         <source>Some of the words (OR is added between the words)</source>
         <translation>Algumas das palavras (OR é adicionado entre as palavras)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
         <source>Full lucene syntax</source>
         <translation>Sintaxe lucene completa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
         <source>Click the link to get help for search syntax</source>
         <translation>Clique no link para obter ajuda para a sintaxe de pesquisa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="159"/>
         <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
         <translation>Escolha o âmbito (livros/capítulos/versículos para procurar neles).&lt;br /&gt;Aplicável para Bíblias e comentários.</translation>
     </message>
@@ -4340,17 +4538,17 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchResultArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="85"/>
         <source>Text of the selected search result item</source>
         <translation>Texto do item seleccionado do resultados de pesquisa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="88"/>
         <source>Select all</source>
         <translation>Seleccionar tudo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="92"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -4358,242 +4556,242 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchSyntaxHelpDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="47"/>
         <source>Search Syntax Help</source>
         <translation>Procurar Ajuda de Sintaxe</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="94"/>
         <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
         <translation>Esta ajuda é principalmente para a opção Sintaxe Completa&apos;. As opções &apos;Todas as palavras&apos; e &apos;Algumas palavras&apos;tem sintaxe mais limitada;&lt;a href=&apos;#wildcards&apos;&gt;curingas&lt;/a&gt; e &lt;a href=&apos;#fields&apos;&gt;campos de texto&lt;/a&gt;são suporadas por elas. Algumas outras características de sintaxe podem devolver resultados estranhos ou errados. com Todas as palavras/Algumas palavras.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
         <source>Which words to find</source>
         <translation>Quais as palavras a procurar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="101"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
         <source>Grouping and order</source>
         <translation>Agrupamento e ordem</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="103"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
         <source>Wildcards (partial words)</source>
         <translation>Wildcards (palavras parciais)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
         <source>Text fields (different parts of text)</source>
         <translation>Campos de texto (diferentes partes do texto)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="208"/>
         <source>Other syntax features</source>
         <translation>Outras características de sintaxe</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
         <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
         <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
         <translation>Os termos de pesquisa são separadas por espaços. &lt;strong&gt;  AND &lt;/strong&gt; (todas as palavras), &lt;strong&gt; OR &lt;/strong&gt; (algumas palavras) e &lt;strong&gt; NOT &lt;/strong&gt; (não a palavra seguinte) podem ser adicionados entre as palavras. Se nada for adicionado explicitamente OR é usado automaticamente. &quot;&lt;strong&gt;  + &lt;/Strong&gt; palavra&quot;, significa que a palavra deve estar nos resultados, &quot;&lt;strong&gt; - &lt;/strong&gt; palavra&quot; significa que a palavra não deve estar nos resultados.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="119"/>
         <source>jesus AND god</source>
         <comment>Do not translate &quot;AND&quot;.</comment>
         <translation>jesus AND deus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="121"/>
         <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
         <translation>Localiza versículos com &apos;Jesus&apos; e  &apos;Deus&apos;, simultaneamente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="123"/>
         <source>jesus OR god</source>
         <comment>Do not translate &quot;OR&quot;.</comment>
         <translation>jesus OR deus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="125"/>
         <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
         <translation>Localiza versículos tanto com &apos;Jesus&apos; ou com &apos;Deus&apos; ou com ambos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="127"/>
         <source>jesus NOT god</source>
         <comment>Do not translate &quot;NOT&quot;.</comment>
         <translation>jesus NOT deus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="133"/>
         <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
         <translation>Localiza versículos com &apos;Jesus&apos;, mas não com &apos;Deus&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="131"/>
         <source>+jesus -god</source>
         <translation>+jesus -deus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
         <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
         <translation>Palavras podem ser agrupadas com &lt;strong&gt;parêntises&lt;/strong&gt;. Ordem estrita das palavras pode ser definida com &lt;strong&gt; aspas &lt;/strong&gt;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
         <source>(a AND b) OR c</source>
         <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
         <translation>(a AND b) OR c</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
         <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
         <translation>Localiza versículos com &apos;a&apos; AND &apos;b&apos; e versículos com &apos;c&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="145"/>
         <source>&quot;says lord&quot;</source>
         <translation>&quot;diz senhor&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="149"/>
         <source>&quot;says the lord&quot;</source>
         <translation>&quot;diz o senhor&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="151"/>
         <source>Finds all verses with &apos;says the LORD&apos;</source>
         <translation>Localiza todos os versículos com &quot;diz o senhor&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
         <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
         <translation>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; casa qualquer sequência de 0 ou mais caracteres, enquanto  &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; casa qualquer caractere unico. Um curinga não pode ser usado no início de uma palavra.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="160"/>
         <source>a*</source>
         <translation>a*</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="162"/>
         <source>All words beginning with &apos;a&apos;</source>
         <translation>Todas as palavras que começam com &apos;a&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="164"/>
         <source>a*a</source>
         <translation>a*a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="166"/>
         <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
         <translation>&apos;Assíria&apos;, &apos;aroma&apos;, &apos;abba&apos;, etc.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="168"/>
         <source>a?</source>
         <translation>a?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="170"/>
         <source>&apos;at&apos; and &apos;an&apos;</source>
         <translation>&apos;na&apos; e &apos;uma&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="172"/>
         <source>a??a</source>
         <translation>a??a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="174"/>
         <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
         <translation>&apos;abba&apos;, &apos;área&apos;, &apos;�sia&apos;, etc.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
         <source>Available text fields:</source>
         <translation>Campos de texto disponíveis:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="181"/>
         <source>Searches headings</source>
         <translation>Pesquisa em títulos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="183"/>
         <source>Searches footnotes</source>
         <translation>Procurar em notas de rodapé</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="185"/>
         <source>Searches Strong&apos;s numbers</source>
         <translation>Procura de numeros Strong</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="187"/>
         <source>Searches morphology codes</source>
         <translation>Procura de códigos morfológicos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="189"/>
         <source>Examples:</source>
         <translation>Exemplos:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="191"/>
         <source>heading:Jesus</source>
         <comment>Do not translate &quot;heading:&quot;.</comment>
         <translation>heading:Jesus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="193"/>
         <source>Finds headings with &apos;Jesus&apos;</source>
         <translation>Localiza títulos com &apos;Jesus&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="195"/>
         <source>footnote:Jesus AND footnote:said</source>
         <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
         <translation>footnote:Jesus AND footnote:disse</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
         <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
         <translation>Localiza notas de rodapé com &apos;Jesus&apos; e &apos;disse&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
         <source>strong:G846</source>
         <comment>Do not translate &quot;strong:&quot;.</comment>
         <translation>strong:G846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="202"/>
         <source>Finds verses with Strong&apos;s Greek number 846</source>
         <translation>Localiza versículos com o número grego 846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="204"/>
         <source>morph:&quot;N-NSF&quot;</source>
         <comment>Do not translate &quot;morph:&quot;.</comment>
         <translation>morph:&quot;N-NSF&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="206"/>
         <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
         <translation>Localiza versículos com códigos morfológicos &apos;N-NSF&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="210"/>
         <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
         <translation>BibleTime utiliza o motor de busca CLucne. Você pode ler mais em &lt;a href=&apos;%1&apos;&gt;página web da sintaxe lucene&lt;/a&gt; (em navegador externo).</translation>
     </message>
@@ -4639,19 +4837,19 @@ Language name ppk</extracomment>
         <translation>Imprimir...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="231"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="241"/>
         <source>Copying search result</source>
         <translation>A copiar resultado da pesquisa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="250"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="259"/>
         <source>Saving search result</source>
         <translation>A guardar resultado da pesquisa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="268"/>
         <source>Printing search result</source>
         <translation>A Imprimir resultado de pesquisa</translation>
     </message>
@@ -4737,42 +4935,42 @@ Language name ppk</extracomment>
 <context>
     <name>Search::CSearchDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="130"/>
         <source>Missing indices</source>
         <translation>�ndices em falta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="87"/>
         <source>Search</source>
         <translation>Pesquisar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="131"/>
         <source>The following modules need to be indexed before they can be searched in:</source>
         <translation>Os seguintes módulos precisam ser indexados antes de poderem ser feitas pesquisas neles:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="132"/>
         <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
         <translation>O processo de indexação pode levar bastante tempo. Clique &quot;Sim&quot; para indexar os módulos e iniciar a busca, ou &quot;Não&quot; para cancelar a busca.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="236"/>
         <source>Drag any verse reference onto an open Bible window</source>
         <translation>Arraste qualquer versículo ou referência para uma janela de Bíblia aberta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="241"/>
         <source>&amp;Analyze results...</source>
         <translation>&amp;Analisar resultados...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="242"/>
         <source>Show a graphical analysis of the search result</source>
         <translation>Mostrar uma analise gráfica do resultado da pesquisa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="248"/>
         <source>&amp;Close</source>
         <translation>Fe&amp;char</translation>
     </message>
@@ -4813,19 +5011,19 @@ Language name ppk</extracomment>
         <translation>Imprimir...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="164"/>
         <source>Printing search result</source>
         <translation>A Imprimir resultado da pesquisa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="192"/>
         <source>Saving search result</source>
         <translation>A Guardar resultado da pesquisa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="210"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="228"/>
         <source>Copying search result</source>
         <translation>A copiar resultado da pesquisa</translation>
     </message>
@@ -4838,91 +5036,6 @@ Language name ppk</extracomment>
 <context>
     <name>StandardWorksTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation>Obras padrão são usadas quando nenhuma obra é especificada, por exemplo, quando uma hiperligação de uma Bíblia ou de um Léxico é clicado.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>Bíblia:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>A Bíblia Padrão é usada quando um hiperligação para dentro da Bíblia é clicado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>Comentário:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>O comentário padrão é usado quando uma hiperligação de um comentário é clicado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation>Léxico:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>O léxico normal é usado quando uma hiperligação em um léxico é clicado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>Devocional diário:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>O devocional padrão será usado para mostrar uma curta inicialização do devocional </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>Léxico hebraico Strong:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>O léxico hebraico padrão é usado quando uma hiperligação em um léxico hebraico é clicado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>Léxico grego Strong:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>O léxico grego padrão é usado quando uma hiperligação em um léxico grego é clicado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>Léxico hebraico morfológico:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>O léxico padrão morfológico dos textos hebraicos, é usado quando uma hiperligação de uma tag morfológica de um texto hebraico é clicada</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation>Léxico morfológico Grego:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>O léxico padrão morfológico para os textos gregos é usado quando uma hiperligação de uma tag morfológica de um texto grego é clicada</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="62"/>
         <source></source>
         <translation></translation>
@@ -4931,112 +5044,97 @@ Language name ppk</extracomment>
 <context>
     <name>TextFiltersTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation>Inserir quebra de linha após cada versículo</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation> Mostrar número dos versículos</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation>Mostrar titulos de secção</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation>Mostrar referências-cruzadas das escrituras</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation>Mostrar acentos gregos</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation>Mostrar pontos vogais Hebreus</translation>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
+        <source></source>
+        <translation></translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallProgress</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation>Mostrar sinais da cantilena hebraica</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="81"/>
+        <source>Failed</source>
+        <translation>Falhou</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation>Mostrar a segmentação dos morfemas</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="84"/>
+        <source>Completed</source>
+        <translation>Completado</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation>Usar variações textuais</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="90"/>
+        <source>Cancelled</source>
+        <translation>Cancelado</translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallSources</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation>Filtros de controle da aparência do texto. Aqui você pode especificar configurações padrão para todos os filtros. Você pode substituir essas configurações em cada janela de visualização.</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installsources.cpp" line="63"/>
+        <source>Failed to refresh source %1</source>
+        <translation>Falhou ao actualizar a fonte %1</translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source></source>
-        <translation></translation>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="59"/>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="62"/>
+        <source>The text you want to search for</source>
+        <translation>O texto pelo qual pretende procurar</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation>Procurar texto</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="135"/>
+        <source>New Window</source>
+        <translation>Nova Janela</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation>O texto que pretende procurar</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="136"/>
+        <source>View Window</source>
+        <translation>Ver Janela</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation>Procura sensível a maiúsculas e minúsculas</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="137"/>
+        <source>Text Font Size</source>
+        <translation>Tamanho do Tipo de Letra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation>Sensivel a maiusculas</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="138"/>
+        <source>User Interface Font Size</source>
+        <translation>Tamanho de Letra da Interface do Utilizador</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation>Procurar a localização anterior do texto</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="141"/>
+        <source>Bookshelf Manager</source>
+        <translation>Gestor de Estante</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation>A&amp;nterior</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="187"/>
+        <source>Single</source>
+        <translation>Único</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation>Procurar a próxima localização do texto</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="188"/>
+        <source>Tabbed</source>
+        <translation>Com Separadores</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation>Próxi&amp;mo</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="189"/>
+        <source>Auto-tile</source>
+        <translation>Organização Automática</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation>Fechar a caixa de diálogo</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="190"/>
+        <source>Auto-tile horizontally</source>
+        <translation>Organização Horizontal Automática</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation>Fe&amp;char</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="191"/>
+        <source>Auto-tile vertically</source>
+        <translation>Organização Vertical Automática</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/messages/bibletime_ui_pt_BR.ts b/i18n/messages/bibletime_ui_pt_BR.ts
index f4b6113..8a8d7f1 100644
--- a/i18n/messages/bibletime_ui_pt_BR.ts
+++ b/i18n/messages/bibletime_ui_pt_BR.ts
@@ -6,7 +6,7 @@
     <message>
         <source></source>
         <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
 This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
@@ -22,452 +22,457 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTime</name>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
+        <location filename="../../src/bibletime_init.cpp" line="741"/>
         <source>&amp;File</source>
         <translation>&amp;Arquivo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&amp;View</source>
         <translation>E&amp;xibir</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&amp;Search</source>
         <translation>&amp;Procurar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&amp;Window</source>
         <translation>&amp;Janela</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&amp;ttings</source>
         <translation>&amp;Configurações</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&amp;Help</source>
         <translation>Aju&amp;da</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&amp;Show toolbar</source>
         <translation>&amp;Exibir barra de ferramentas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&amp;Fullscreen mode</source>
         <translation>&amp;Modo tela cheia</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&amp;Quit</source>
         <translation>&amp;Sair</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
+        <location filename="../../src/bibletime_init.cpp" line="251"/>
         <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
         <translation>Abra o estudo bíblico &quot;Como Fazer&quot; incluído no BibleTime. &lt;br/&gt; Este &quot;Como Fazer&quot; é uma introdução a o estudo bíblico de maneira eficiente.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
+        <location filename="../../src/bibletime_init.cpp" line="256"/>
         <source>Information about the BibleTime program</source>
         <translation>Informações sobre o BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation>&amp;Salvar sessão</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>&amp;Carregar sessão</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&amp;Delete session</source>
         <translation>&amp;Apagar sessão</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&amp;Arrangement mode</source>
         <translation>Mod&amp;alidade do arranjo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&amp;Manual mode</source>
         <translation>&amp;Modo manual</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &amp;vertically</source>
         <translation>Titulo &amp;vertical automático</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &amp;horizontally</source>
         <translation>Titulo &amp;horizontal automático</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&amp;cascade</source>
         <translation>&amp;Cascata automática</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&amp;Cascade</source>
         <translation>&amp;Cascata</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &amp;vertically</source>
         <translation>Organizar &amp;verticalmente</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &amp;horizontally</source>
         <translation>Organizar &amp;horizontalmente</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&amp;ose all windows</source>
         <translation>Fechar t&amp;odas as janelas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
+        <location filename="../../src/bibletime_init.cpp" line="224"/>
         <source>Close all open windows inside BibleTime</source>
         <translation>Fechar todas as janelas abetas no BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
+        <location filename="../../src/bibletime_init.cpp" line="241"/>
         <source>&amp;Handbook</source>
         <translation>&amp;Manual</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&amp;Bible Study Howto</source>
         <translation>Estudo &amp;Bíblico HowTo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
+        <location filename="../../src/bibletime_slots.cpp" line="533"/>
         <source>Please enter a name for the new session.</source>
         <translation>Por favor digite um nome para a nova sessão.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
+        <location filename="../../src/bibletime_slots.cpp" line="541"/>
+        <source>Session already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_slots.cpp" line="542"/>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="107"/>
         <source>Quit BibleTime</source>
         <translation>Sair do BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
+        <location filename="../../src/bibletime_init.cpp" line="114"/>
         <source>Toggle fullscreen mode of the main window</source>
         <translation>Mudar a janela principal para o modo tela cheia</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
+        <location filename="../../src/bibletime_init.cpp" line="123"/>
         <source>Search in &amp;open works...</source>
         <translation>Procurar nas &amp;obras abertos...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &amp;Bible...</source>
         <translation>Procurar na &amp;Bíblia padrão...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &amp;new session...</source>
         <translation>Salvar como &amp;nova sassão...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
+        <location filename="../../src/bibletime_init.cpp" line="140"/>
         <source>Create and save a new session</source>
         <translation>Criar e salvar uma nova sessão</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
+        <location filename="../../src/bibletime_init.cpp" line="147"/>
         <source>Manually arrange the open windows</source>
         <translation>Organizar manualmente as janelas abertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
+        <location filename="../../src/bibletime_init.cpp" line="154"/>
         <source>Automatically tile the open windows vertically (arrange side by side)</source>
         <translation>Organizar automaticamente as janelas abertas verticalmente (arranjar lado a lado)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
+        <location filename="../../src/bibletime_init.cpp" line="161"/>
         <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
         <translation>Organizar automaticamente as janelas abertas horizontalmente (arranjo uma em cima da outra)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
+        <location filename="../../src/bibletime_init.cpp" line="165"/>
         <source>Auto-&amp;tile</source>
         <translation>Au&amp;to-organizar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
+        <location filename="../../src/bibletime_init.cpp" line="168"/>
         <source>Automatically tile the open windows</source>
         <translation>Organizar automaticamente as janelas abertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
+        <location filename="../../src/bibletime_init.cpp" line="172"/>
         <source>Ta&amp;bbed</source>
         <translation>Ta&amp;bulada</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
+        <location filename="../../src/bibletime_init.cpp" line="175"/>
         <source>Automatically tab the open windows</source>
         <translation>Tabelar automaticamente as janelas abertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
+        <location filename="../../src/bibletime_init.cpp" line="182"/>
         <source>Automatically cascade the open windows</source>
         <translation>Organizar automaticamente as janelas abertas em cascata</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
+        <location filename="../../src/bibletime_init.cpp" line="189"/>
         <source>Cascade the open windows</source>
         <translation>Janelas abertas em cascata</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
+        <location filename="../../src/bibletime_init.cpp" line="193"/>
         <source>&amp;Tile</source>
         <translation>Organi&amp;zar</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
+        <location filename="../../src/bibletime_init.cpp" line="196"/>
         <source>Tile the open windows</source>
         <translation>Organizar as janelas abertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
+        <location filename="../../src/bibletime_init.cpp" line="203"/>
         <source>Vertically tile (arrange side by side) the open windows</source>
         <translation>Organizar verticalmente (lado a lado) as janelas abertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
+        <location filename="../../src/bibletime_init.cpp" line="210"/>
         <source>Horizontally tile (arrange on top of each other) the open windows</source>
         <translation>Organizar horizontalmente (uma acima da outra) as janelas abertas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
+        <location filename="../../src/bibletime_init.cpp" line="214"/>
         <source>Close &amp;window</source>
         <translation>Fechar &amp;Janela</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
+        <location filename="../../src/bibletime_init.cpp" line="217"/>
         <source>Close the current open window</source>
         <translation>Fechar a janela ativa aberta</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
+        <location filename="../../src/bibletime_init.cpp" line="228"/>
         <source>&amp;Configure BibleTime...</source>
         <translation>&amp;Configurar BibleTime...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime&apos;s preferences</source>
         <translation>Preferências do BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
+        <location filename="../../src/bibletime_init.cpp" line="234"/>
         <source>Bookshelf &amp;Manager...</source>
         <translation>Gere&amp;nciador de Livros...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
+        <location filename="../../src/bibletime_init.cpp" line="237"/>
         <source>Configure your bookshelf and install/update/remove/index works</source>
         <translation>Configurar sua estante e instalar/atualizar/remover/indexar obras</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
+        <location filename="../../src/bibletime_init.cpp" line="244"/>
         <source>Open BibleTime&apos;s handbook</source>
         <translation>Abrir o Manual do BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&amp;Tip of the day...</source>
         <translation>&amp;Dica do dia...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
+        <location filename="../../src/bibletime_init.cpp" line="263"/>
         <source>Show tips about BibleTime</source>
         <translation>Mostrar dicas do BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
+        <location filename="../../src/bibletime_init.cpp" line="402"/>
         <source>Toggle visibility of the bookshelf window</source>
         <translation>Mudar visibilidade da estante</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
+        <location filename="../../src/bibletime_init.cpp" line="406"/>
         <source>Toggle visibility of the bookmarks window</source>
         <translation>Mudar visibilidade da janela de favoritos</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
+        <location filename="../../src/bibletime_init.cpp" line="410"/>
         <source>Toggle visibility of the mag window</source>
         <translation>Mudar visibilidadea janela da lupa</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
+        <location filename="../../src/bibletime_init.cpp" line="735"/>
         <source>Main toolbar</source>
         <translation>Barra de ferramentas principal</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
+        <location filename="../../src/bibletime_init.cpp" line="736"/>
         <source>Navigation toolbar</source>
         <translation>Barra de ferramentas navegação</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
+        <location filename="../../src/bibletime_init.cpp" line="737"/>
         <source>Works toolbar</source>
         <translation>Barra de ferramentas das obras</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
+        <location filename="../../src/bibletime_init.cpp" line="738"/>
         <source>Tools toolbar</source>
         <translation>Barra de ferramentas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
+        <location filename="../../src/bibletime_init.cpp" line="739"/>
         <source>Format toolbar</source>
         <translation>Barra de ferramentas formatação</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
+        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <source>Sw&amp;itch session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="777"/>
         <source>Show main toolbar</source>
         <translation>Mostrar barra de ferramentas principal</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
+        <location filename="../../src/bibletime_init.cpp" line="780"/>
         <source>Show navigation bar</source>
         <translation>Mostrar barra de ferramentas navegação</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
+        <location filename="../../src/bibletime_init.cpp" line="783"/>
         <source>Show works toolbar</source>
         <translation>Mostrar barra de ferramentas das obras</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
+        <location filename="../../src/bibletime_init.cpp" line="786"/>
         <source>Show tools toolbar</source>
         <translation>Mostrar barra de ferramentas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
+        <location filename="../../src/bibletime_init.cpp" line="789"/>
         <source>Show formatting toolbar</source>
         <translation>Mostrar barra de ferramentas formatação</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
+        <location filename="../../src/bibletime_init.cpp" line="792"/>
         <source>Show bookshelf</source>
         <translation>Mostrar Estante</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
+        <location filename="../../src/bibletime_init.cpp" line="795"/>
         <source>Show bookmarks</source>
         <translation>Mostrar marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
+        <location filename="../../src/bibletime_init.cpp" line="798"/>
         <source>Show mag</source>
         <translation>Mostrar Lupa</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
+        <location filename="../../src/bibletime_init.cpp" line="743"/>
         <source>Toolbars</source>
         <translation>Barras de ferramentas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <location filename="../../src/bibletime_init.cpp" line="774"/>
         <source>Show toolbars in text windows</source>
         <translation>Mostrar barras de ferramentas nas janelas de texto</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
+        <location filename="../../src/bibletime_init.cpp" line="801"/>
         <source>Show parallel text headers</source>
         <translation>Mostrar cabeçalhos paralelos ao texto</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
+        <location filename="../../src/bibletime_init.cpp" line="747"/>
         <source>O&amp;pen windows</source>
         <translation>A&amp;brir janelas</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show &quot;Whats this widget&quot; dialog</source>
         <translation>Mostrar diálogo &quot;Que widget é este&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
+        <location filename="../../src/bibletime_init.cpp" line="954"/>
         <source>Whats this widget?</source>
         <translation>Que widget é este?</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
+        <location filename="../../src/bibletime_init.cpp" line="126"/>
         <source>Search in all works that are currently open</source>
         <translation>Buscar em todas as obras que estão abertas agora</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
+        <location filename="../../src/bibletime_init.cpp" line="133"/>
         <source>Search in the standard Bible</source>
         <translation>Procurar na Bíblia padrão</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
+        <location filename="../../src/bibletime_slots.cpp" line="532"/>
         <source>New Session</source>
         <translation>Nova sessão</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
+        <location filename="../../src/bibletime.cpp" line="77"/>
         <source>Initializing the SWORD engine...</source>
         <translation>Inicializando o motor SWORD...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
+        <location filename="../../src/bibletime.cpp" line="85"/>
         <source>Creating BibleTime&apos;s user interface...</source>
         <translation>Criando a interface com o usuário BibleTime...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
+        <location filename="../../src/bibletime.cpp" line="92"/>
         <source>Initializing menu- and toolbars...</source>
         <translation>Inicializando menu e barras de ferramentas...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Unlock Work</source>
         <translation>Obra Destravada</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Enter the unlock key for %1.</source>
         <translation>Entre com a chave para %1.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
+        <location filename="../../src/bibletime.cpp" line="214"/>
         <source>Warning: Invalid unlock key!</source>
         <translation>Atenção: Chave inválida!</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
+        <location filename="../../src/bibletime.cpp" line="215"/>
         <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
         <translation>A chave fornecida não destravou este módulo. Por favor, tente novamente.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
+        <location filename="../../src/bibletime_init.cpp" line="255"/>
         <source>&amp;About BibleTime</source>
         <translation>&amp;Sobre BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
+        <location filename="../../src/bibletime_init.cpp" line="733"/>
         <source>Bookmarks</source>
         <translation>Marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
+        <location filename="../../src/bibletime_init.cpp" line="734"/>
         <source>Mag</source>
         <translation>Lupa</translation>
     </message>
@@ -475,7 +480,8 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTimeApp</name>
     <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
+        <location filename="../../src/bibletimeapp.cpp" line="59"/>
+        <location filename="../../src/mobile/bibletimeapp.cpp" line="63"/>
         <source>Fatal error!</source>
         <translation>Erro Fatal!</translation>
     </message>
@@ -483,7 +489,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtAboutDialog</name>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
         <source>BibleTime is an easy to use but powerful Bible study tool.</source>
         <translation>BibleTime é uma poderosa ferramenta de estudo Bíblico e fácil de usar.</translation>
     </message>
@@ -498,52 +504,47 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Abaixo está a licença completa vinculada juridicamente.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="109"/>
         <source>About BibleTime</source>
         <translation>Sobre o BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="121"/>
         <source>&amp;BibleTime</source>
         <translation>&amp;BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="126"/>
         <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
         <translation>Nós estamos procurando desenvolvedores e tradutores. Se você gostaria de se juntar ao nosso time, por favor, envie um e-mail para %1.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="137"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Colaboradores</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="148"/>
         <source>The following people contributed to BibleTime:</source>
         <translation>As seguintes pessoas contribuíram para o BibleTime:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="150"/>
         <source>documentation and translation manager</source>
         <translation>Gerenciador de documentação e traduções</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="172"/>
         <source>project manager</source>
         <translation>administrador do projeto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>tester</source>
         <translation>testador</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>usability expert</source>
         <translation>especialista em usabilidade</translation>
     </message>
@@ -583,53 +584,58 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>&amp;Licença</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
         <source>designer</source>
         <translation>designer</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="130"/>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="139"/>
         <source>developer</source>
         <translation>desenvolvedor</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
         <source>project founder</source>
         <translation>fundador do projeto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="157"/>
         <source>packager</source>
         <translation>criador dos pacotes</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="158"/>
         <source>creator of The Sword Project</source>
         <translation>criador do projeto Sword</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
         <source>domain sponsor</source>
         <translation>patrocinador do domínio</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
         <source>howto</source>
         <translatorcomment>Já foi consagrado o uso</translatorcomment>
         <translation>howto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="141"/>
         <source>artist</source>
         <translation>artista</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="173"/>
         <source>documentation</source>
         <translation>documentação</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="188"/>
         <source>The following people translated BibleTime into their language:</source>
         <translation>As seguintes pessoas traduziram BibleTime em suas línguas:</translation>
     </message>
@@ -657,37 +663,37 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBibleKeyWidget</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="110"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Rolar através das entradas da lista. Aperte o botão e mova o mouse para incrementar ou decrementar o item.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
         <source>Next book</source>
         <translation>Próximo livro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
         <source>Previous book</source>
         <translation>Livro Anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="117"/>
         <source>Next chapter</source>
         <translation>Próximo capítulo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
         <source>Previous chapter</source>
         <translation>Capítulo anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="122"/>
         <source>Next verse</source>
         <translation>Próximo versículo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
         <source>Previous verse</source>
         <translation>Versículo anterior</translation>
     </message>
@@ -766,27 +772,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfGroupingMenu</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
         <source>Category/Language</source>
         <translation>Categoria/Idioma</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
         <source>Language/Category</source>
         <translation>idioma/Categoria</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="105"/>
         <source>Language</source>
         <translation>Idioma</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="108"/>
         <source>No grouping</source>
         <translation>Sem agrupamento</translation>
     </message>
@@ -794,7 +800,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfModel</name>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
+        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="78"/>
         <source>Module</source>
         <translation>Módulo</translation>
     </message>
@@ -802,23 +808,23 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfWidget</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="157"/>
         <source>Fi&amp;lter:</source>
         <translation>Fi&amp;ltro:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="158"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
         <source>Grouping</source>
         <translation>Agrupando</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="159"/>
         <source>Change the grouping of items in the bookshelf.</source>
         <translation>Alterar o agrupamento de itens na estante.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
         <source>Show/hide works</source>
         <translation>Mostrar/Esconder obras</translation>
     </message>
@@ -832,69 +838,130 @@ This file is distributed under the same license as the Bibetime package.</transl
     </message>
 </context>
 <context>
+    <name>BtConfig</name>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="46"/>
+        <source>Old testament</source>
+        <translation type="unfinished">Antigo testamento</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="47"/>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation type="unfinished">Moisés/Pentateuco/Torá</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="48"/>
+        <source>History</source>
+        <translation type="unfinished">História</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="49"/>
+        <source>Prophets</source>
+        <translation type="unfinished">Profetas</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="50"/>
+        <source>New testament</source>
+        <translation type="unfinished">Novo testamento</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="51"/>
+        <source>Gospels</source>
+        <translation type="unfinished">Evangelhos</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="52"/>
+        <source>Letters/Epistles</source>
+        <translation type="unfinished">Cartas/Epístolas</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="53"/>
+        <source>Paul&apos;s Epistles</source>
+        <translation type="unfinished">Epístolas de Paulo</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="89"/>
+        <source>Error loading configuration!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="90"/>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BtConfigCore</name>
+    <message>
+        <location filename="../../src/backend/config/btconfigcore.cpp" line="62"/>
+        <source>Default Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtDisplaySettingsButton</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="103"/>
         <source>Use linebreaks after each verse</source>
         <translation>Usar quebras de linha após cada versículo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
         <source>Show verse numbers</source>
         <translation>Mostrar número dos versículos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
         <source>Show headings</source>
         <translation>Mostar títulos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
         <source>Highlight words of Jesus</source>
         <translation>Realçar palavras de Jesus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
         <source>Show Hebrew vowel points</source>
         <translation>Mostrar pontos da vogal hebraica</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
         <source>Show Hebrew cantillation marks</source>
         <translation>Mostrar sinais da cantilena hebraica</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
         <source>Show Greek accents</source>
         <translation>Mostrar acentos gregos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
         <source>Use alternative textual variant</source>
         <translation>Usar variação textual alternativa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
         <source>Show scripture cross-references</source>
         <translation>Mostrar referências-cruzadas das escrituras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
         <source>Show footnotes</source>
         <translation>Mostrar notas de rosapé</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
         <source>Show morph segmentation</source>
         <translation>Mostrar a segmentação dos morfemas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="120"/>
         <source>Display settings</source>
         <translation>Preferências de exibição</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="123"/>
         <source>Display settings: No options available</source>
         <translation>Configurações de exibição: Nenhuma opção disponível</translation>
     </message>
@@ -902,27 +969,45 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtEditBookmarkDialog</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="71"/>
         <source>Edit Bookmark</source>
         <translation>Editar marcador</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
         <source>Title:</source>
         <translation>Título:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
         <source>Description:</source>
         <translation>Descrição:</translation>
     </message>
 </context>
 <context>
+    <name>BtFindWidget</name>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="28"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="29"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="74"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtFontChooserWidget</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
@@ -943,27 +1028,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="151"/>
         <source>&amp;Language:</source>
         <translation>&amp;Idioma:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
         <source>The font selection below will apply to all texts in this language</source>
         <translation>A seleção da fonte abaixo será aplicada a todos os textos neste idioma</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
         <source>Use custom font</source>
         <translation>Usar fonte personalizada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
         <source>Optionally specify a custom font for each language:</source>
         <translation>Opcional: Especificar uma fonte personalizada para cada idioma:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="150"/>
         <source>Fonts</source>
         <translation>Fontes</translation>
     </message>
@@ -971,67 +1056,67 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtIndexPage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="107"/>
         <source>%1 KiB</source>
         <translation>%1 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="114"/>
         <source>0 KiB</source>
         <translation>0 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="124"/>
         <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
         <translation>Se selecionados, aqueles índices não corresponderão a obras e serão deletadas quando o BibleTime iniciar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
         <source>Automatically delete orphaned indexes when BibleTime starts</source>
         <translation>Apagar automaticamente índices órfãos quando o BibleTime Iniciar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="127"/>
         <source>Delete the selected indexes</source>
         <translation>Excluir os índices selecionados</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
         <source>Delete</source>
         <translation>Excluir</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="130"/>
         <source>Create new indexes for the selected works</source>
         <translation>Criar novos índices para as obraa selecionados</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Work</source>
         <translation>Obra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Index size</source>
         <translation>Tamanho do índice</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="122"/>
         <source>Search Indexes</source>
         <translation>Procurar índices</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="91"/>
         <source>Indexed Works</source>
         <translation>Obrass Indexadas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="96"/>
         <source>Unindexed Works</source>
         <translation>Obras não - indexados</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
         <source>Create...</source>
         <translation>Criar...</translation>
     </message>
@@ -1057,17 +1142,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallModuleChooserDialogModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="88"/>
         <source>Work</source>
         <translation>Obra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="89"/>
         <source>Installation source</source>
         <translation>Fonte de instalação</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="90"/>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
@@ -1160,12 +1245,12 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>O diretório de destino não é gravável ou não existe. A instalação vai falhar se isto não for corrigido primeiro.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="388"/>
         <source>Delete Source?</source>
         <translation>Apagar Fonte?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="389"/>
         <source>Do you really want to delete this source?</source>
         <translation>Você realmente deseja apagar esta fonte?</translation>
     </message>
@@ -1178,17 +1263,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPageModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="75"/>
         <source>Work</source>
         <translation>Obra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="76"/>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="77"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
@@ -1204,99 +1289,99 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPathDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="35"/>
         <source>Bookshelf Folders</source>
         <translation>Estante: Pastas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
         <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
         <translation>Obras podem ser instaladas em uma ou mais pastas. Depois de configurá-las aqui, você pode escolher uma delas na página de instalação.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="45"/>
         <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
         <translation>BibleTime e a biblioteca SWORD buscam as obras de todas estas pastas. Se uma pasta é removida daqui, ela ainda existe no sistema com todos as obras nela.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="48"/>
         <source>Configure bookshelf folders</source>
         <translation>Configurar pastas da Estante</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="53"/>
         <source>Configuration file for the folders is: </source>
         <translation>Arquivo de configuração para as pastas é:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="61"/>
         <source>Folders where new works can be installed</source>
         <translation>Pastas onde novas obras podem ser instaladas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
         <source>Read-only folders</source>
         <translation>Pastas somente leitura</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="66"/>
         <source>Nonexistent folders</source>
         <translation>Pastas não-existentes</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="80"/>
         <source>&amp;Add...</source>
         <translation>&amp;Adicionar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="81"/>
         <source>Add new folder</source>
         <translation>Adicionar nova pasta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="86"/>
         <source>&amp;Edit...</source>
         <translation>&amp;Editar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="87"/>
         <source>Edit the selected folder</source>
         <translation>Editar a pasta selecionada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="92"/>
         <source>&amp;Remove</source>
         <translation>&amp;Remover</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="93"/>
         <source>Remove the selected folder</source>
         <translation>Remover a pasta selecionada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="167"/>
         <source>This default folder in your home directory can&apos;t be removed</source>
         <translation>Esta pasta padrão em seu diretório pessoal não pode ser removida</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="194"/>
         <source>Choose Folder</source>
         <translation>Escolher pasta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>Use Folder?</source>
         <translation>Usar pasta?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
         <translation>Esta pasta não pode ser escrita, logo, obras não podem ser instaladas aqui utilizando o BibleTime. Você gostaria de utilizar esta pasta ao invés da anterior?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
         <translation>Esta pasta não pode ser escrita, logo, obras não podem ser instaladas aqui utilizando o BibleTime. Você ainda quer adicioná-la à lista das pastas da Estante?</translation>
     </message>
@@ -1304,52 +1389,42 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallProgressDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Work</source>
         <translation>Obra</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Progress</source>
         <translation>Progresso</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>Parar</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="60"/>
         <source>Stop All</source>
         <translation>Parar Tudo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Completed</source>
         <translation>Completado</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>Cancelado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="55"/>
         <source>Waiting for turn...</source>
         <translation>Esperando pela vez...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="113"/>
         <source>Preparing install...</source>
         <translation>Preparando Instalação...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="37"/>
         <source>Install Progress</source>
         <translation>Progresso da Instalação</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Failed</source>
         <translation>Falhou</translation>
     </message>
@@ -1357,17 +1432,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
         <source>Language for names of Bible books:</source>
         <translation>Idioma para os nomes dos livros bíblicos:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation>Os idiomas que podem ser usados para os nomes dos livros da bíblia</translation>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="136"/>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="133"/>
         <source>Languages</source>
         <translation>Idiomas</translation>
     </message>
@@ -1417,7 +1492,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtModuleManagerDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="57"/>
         <source>Bookshelf Manager</source>
         <translation>Gerenciador de livros</translation>
     </message>
@@ -1425,7 +1500,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkAction</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="103"/>
         <source>&amp;Open work</source>
         <translation>&amp;Abrir obra</translation>
     </message>
@@ -1433,12 +1508,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkActionMenu</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="42"/>
         <source>&amp;Grouping order</source>
         <translation>Ordem de a&amp;grupamento</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="43"/>
         <source>Sets the grouping order for the items in this menu.</source>
         <translation>Define a ordem de agrupamento dos itens no menu.</translation>
     </message>
@@ -1474,47 +1549,47 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtRemovePage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="100"/>
         <source>Select &amp;works to uninstall:</source>
         <translation>Selecione &amp;obras para desinstalar:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&amp;Remove...</source>
         <translation>&amp;Remover...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="98"/>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="111"/>
         <source>Start removal of %1 works:</source>
         <translation>Iniciar remoção de %1 obras:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="114"/>
         <source>Start removal:</source>
         <translation>Iniciar remoção:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="145"/>
         <source>You selected the following work(s): </source>
         <translation>Você selecionou a(s) seguinte(s) obra(s):</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="149"/>
         <source>Do you really want to remove them from your system?</source>
         <translation>Você realmente deseja removê-los de seu sistema?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
         <source>Remove the selected works</source>
         <translation>Remover as obras selecionadas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="151"/>
         <source>Remove Works?</source>
         <translation>Remover Obras?</translation>
     </message>
@@ -1535,12 +1610,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtSearchModuleChooserDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="47"/>
         <source>Works to Search in</source>
         <translation>Obras para Buscar em</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="49"/>
         <source>Select the works which should be searched.</source>
         <translation>Selecionar as obras que devem ser buscadas.</translation>
     </message>
@@ -1624,24 +1699,165 @@ atalho</translation>
     </message>
 </context>
 <context>
+    <name>BtStandardWorksTab</name>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="169"/>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation type="unfinished">Obras padrão são usadas quando nenhuma obra é especificada, por exemplo, quando um link de uma Bíblia ou de um dicionário é clicado.</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
+        <translation type="unfinished">Bíblia:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="174"/>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation type="unfinished">A Bíblia Padrão é usada quando um hiperlink dentro da Bíblia é clicada</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</source>
+        <translation type="unfinished">Comentário:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="178"/>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation type="unfinished">O comentário padrão é usado quando um hiperlink de um comentário é clicado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
+        <translation type="unfinished">Léxico:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="182"/>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation type="unfinished">O léxico normal é usado quando um hiperlink em um léxico é clicado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</source>
+        <translation type="unfinished">Devociona diário:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="186"/>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation type="unfinished">O devocional padrão será usado para mostrar uma curta inicialização do devocional </translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation type="unfinished">Léxico hebraico Strong:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="190"/>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation type="unfinished">O léxico hebraico padrão é usado quando um hiperlink em um léxico hebraico é clicado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation type="unfinished">Léxico grego Strong:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="194"/>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation type="unfinished">O léxico grego padrão é usado quando um hiperlink em um léxico grego é clicado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</source>
+        <translation type="unfinished">Léxico hebraico morfológico:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="198"/>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation type="unfinished">O léxico padrão morfológico dos textos hebraicos, é usado quando um hiperlink de um tag morfológico de um texto hebraico é clicado</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</source>
+        <translation type="unfinished">Léxico morfológico Grego:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="202"/>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation type="unfinished">O léxico padrão morfológico dos textos gregos é usado quando um hiperlink de um tag morfológica de um texto grego é clicado</translation>
+    </message>
+</context>
+<context>
+    <name>BtTextFiltersTab</name>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="74"/>
+        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
+        <translation type="unfinished">Filtros de controle a aparência do texto. Aqui você pode especificar configurações padrão para todos os filtros. Você pode substituir essas configurações em cada janela de visualização.</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="78"/>
+        <source>Insert line break after each verse</source>
+        <translation type="unfinished">Inserir quebra de linha após cada versículo</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
+        <source>Show verse numbers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
+        <source>Show section headings</source>
+        <translation type="unfinished">Mostrar seção de títulos</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
+        <source>Show scripture cross-references</source>
+        <translation type="unfinished">Mostrar referências-cruzadas das escrituras</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="82"/>
+        <source>Show Greek accents</source>
+        <translation type="unfinished">Mostrar acentos gregos</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="83"/>
+        <source>Show Hebrew vowel points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="84"/>
+        <source>Show Hebrew cantillation marks</source>
+        <translation type="unfinished">Mostrar sinais da cantilena hebraica</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="85"/>
+        <source>Show morph segmentation</source>
+        <translation type="unfinished">Mostrar a segmentação dos morfemas</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="86"/>
+        <source>Use textual variants</source>
+        <translation type="unfinished">Usar variações textuais</translation>
+    </message>
+</context>
+<context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
         <source>Add/remove/replace</source>
         <translation>Adicionar/remover/substituir</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
         <source>Replace</source>
         <translation>Substituir</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
@@ -1649,87 +1865,87 @@ atalho</translation>
 <context>
     <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="69"/>
         <source>Tip Of The Day</source>
         <translation>Dica do dia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="83"/>
         <source>Show tips at startup</source>
         <translation>Mostrar dicas na inicialização</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="94"/>
         <source>Next Tip</source>
         <translation>Próxima dica</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
         <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
         <translation>Para adicionar várias bíblias em paralelo em sua janela ativa da Bíblia, selecione este ícone e escolha outra obra bíblia.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
         <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
         <translation>Para adicionar vários comentários bíblicos em paralelo em sua janela ativa da Bíblia, ative a janela de comentários, selecione este ícone e escolha outro comentário bíblico.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="134"/>
         <source>To learn more about the BibleTime project please go to our web site.</source>
         <translation>Para ler mais sobre o projeto BibleTime, por favor, visite nosso site.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="137"/>
         <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
         <translation>Para sincronizar a janela do comentário com a Bíblia ativa, ative a janela do comentário e selecione este ícone.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
         <source>Select the icon again to stop the synchronization.</source>
         <translation>Selecione o ícone novamente para parar o sincronismo.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="142"/>
         <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
         <translation>Para criar um marcador, arraste qualquer versículo ou referễncia de uma Bíblia ou comentário para a janela de marcadores. Uma seta indicará a posição do indicador vai quando você liberar o cursor. Outras obras terão uma referência no canto superior esquerdo que podem ser usadas para criar um marcador.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="147"/>
         <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
         <translation>Para mudar um título de marcador ou descrição, clique com o botão direito no marcador e selecione o menu Editar Marcador. Depois de terminar a edição, a descrição pode ser vista ao passar o cursor sobre o marcador.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="151"/>
         <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
         <translation>Para carregar várias fontes de instalação de obras, vá ao Gerenciador de Livros, selecione o botão adicionar, e então o botão Obter Lista.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="154"/>
         <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
         <translation>Para encontrar mais informação acerca de uma obra, vá à janela da Estante, clique com o botão direito, e selecione o menu Sobre.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="157"/>
         <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
         <translation>A Estante, os Marcadores e a janela da Lupa podem ser movidas para novos locais arrastado-as pelo título, no topo de cada janela. Elas podem ser colocadas à direita, esquerda, acima ou abaixo das janelas das obras.Elas podem ser colocados em cima, umas das outras e as abas aparecerão de forma que cada janela possa ser selecionada. Elas podem ser redimensionadas arrastando as bordas entre as janelas.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="163"/>
         <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
         <translation>Você pode buscar por números Strong numa obra. Inicie com uma obra que possui números Strong e passe o cursor por cima de uma palavra. Clique com o botão direito sobre a palavra e utilize o menu Busca Strong. Um diálogo de busca aparecerá e permitirá que você veja o uso do mesmo número Strong em outros lugares da obra.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="178"/>
         <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
         <translation>Vocẽ pode sarvar suas janelas abertas atualmente como uma sessão. Assim, a sessão pode ser facilmente restaurada depois. Você pode salvar quanta sessões desejar. Este recurso pode ser acessado abaixo do menu Janelas.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="168"/>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
         <translation>Você pode salvar notas pessoais para referências específicas de versículos. Você precisa instalar o comentário Personal. Abra o Gerenciador de Livros, escolha Crosswire como fonte e procure em Commentários e Inglês. Uma vez instalado. use a janela da Estante e clique com o botão direito no comentário Personal. Use tanto o menu Editar Texto Puro quanto o Editar HTML para abrir a obra em modo escrita.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
         <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
         <translation>Você pode visualizar a informação do número Strong na janela Lupa passando o cursor sobre uma palavra na Bíblia que possui os números Strong. Você deve ter os léxicos StrongsGreek e StrongsHebrew de Crosswire instalados.</translation>
     </message>
@@ -1745,49 +1961,49 @@ atalho</translation>
 <context>
     <name>CAcceleratorSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="128"/>
         <source>Choose action group:</source>
         <translation>Escolha um grupo de ações:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="130"/>
         <source>Main Window</source>
         <translation>Janela Principal</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
         <source>All text windows</source>
         <translation>Todas as janelas de texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="132"/>
         <source>Bible windows</source>
         <translation>Janela de Bíblia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
         <source>Commentary windows</source>
         <translation>Janela de comentário</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="134"/>
         <source>Lexicon windows</source>
         <translation>Janela do léxico</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
         <source>Book windows</source>
         <translation>Janela de Livro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
         <source>
    &quot;%1&quot; in the &quot;%2&quot; group</source>
         <translation>
    &quot;%1&quot; no &quot;%2&quot; grupo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
         <source>Shortcuts</source>
         <translation>Atalhos</translation>
     </message>
@@ -1795,95 +2011,95 @@ atalho</translation>
 <context>
     <name>CBibleReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="64"/>
         <source>Next book</source>
         <translation>Próximo livro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="68"/>
         <source>Previous book</source>
         <translation>Livro Anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="72"/>
         <source>Next chapter</source>
         <translation>Próximo capítulo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="76"/>
         <source>Previous chapter</source>
         <translation>Capítulo anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="80"/>
         <source>Next verse</source>
         <translation>Próximo versículo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="84"/>
         <source>Previous verse</source>
         <translation>Versículo anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="89"/>
         <source>Copy chapter</source>
         <translation>Copiar capítulo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="92"/>
         <source>Save chapter as plain text</source>
         <translation>Capítulo como texto puro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="95"/>
         <source>Save chapter as HTML</source>
         <translation>Capítulo como HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="98"/>
         <source>Print chapter</source>
         <translation>Imprimir capítulo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="110"/>
         <source>Text of reference</source>
         <translation>Texto da referência</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
         <source>Reference with text</source>
         <translation>Referencia com texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="253"/>
         <source>Bible window</source>
         <translation>Janela da Bíblia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="263"/>
         <source>Copy...</source>
         <translation>Copiar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="274"/>
         <source>Save...</source>
         <translation>Salvar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="287"/>
         <source>Print...</source>
         <translation>Imprimir...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="371"/>
         <source>Copying</source>
         <translation>Copiando</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="390"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="408"/>
         <source>Saving</source>
         <translation>Salvando</translation>
     </message>
@@ -1891,7 +2107,7 @@ atalho</translation>
 <context>
     <name>CBookReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
+        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="70"/>
         <source>Toggle tree view</source>
         <translation>Alternar visualização de árvore</translation>
     </message>
@@ -1899,93 +2115,93 @@ atalho</translation>
 <context>
     <name>CBookmarkIndex</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
         <source>Bookmarks</source>
         <translation>Marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="92"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="583"/>
         <source>New folder</source>
         <translation>Nova pasta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
         <source>Rename folder</source>
         <translation>Renomear pasta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
         <source>Delete Items</source>
         <translation>Apagar Itens</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="704"/>
         <source>Do you really want to delete the selected items and child-items?</source>
         <translation>Você realmente quer deletar o item selecionado e todos os sub-itens?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="814"/>
         <source>The work to which the bookmark points to is not installed.</source>
         <translation>A obra para a qual o marcador está apontando não está instalado.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
         <source>Print bookmarks...</source>
         <translation>Imprimir macadores...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="103"/>
         <source>Remove selected items...</source>
         <translation>Remover itens selecionados...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
         <source>Import to folder...</source>
         <translation>Importar para pasta...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
         <source>Edit bookmark...</source>
         <translation>Editar marcador...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
         <source>Sort folder bookmarks...</source>
         <translation>Classificar marcadores da pasta...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
         <source>Sort all bookmarks...</source>
         <translation>Classificar todos os marcadores...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="100"/>
         <source>Export from folder...</source>
         <translation>Exportar para pasta...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="393"/>
         <source>Can drop only bookmarks or one folder</source>
         <translation>Pode arrastar e soltar somente marcadores ou uma pasta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="398"/>
         <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
         <translation>Não pode arrastar e soltar uma pasta nela mesma ou numa subpasta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="406"/>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="467"/>
         <source>Drag references from text views to this view</source>
         <translation>Arrastar referências das visualizações de texto para esta visualização</translation>
     </message>
@@ -1993,42 +2209,42 @@ atalho</translation>
 <context>
     <name>CCommentaryReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="31"/>
         <source>Next book</source>
         <translation>Próximo livro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="35"/>
         <source>Previous book</source>
         <translation>Livro Anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="39"/>
         <source>Next chapter</source>
         <translation>Próximo capítulo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="43"/>
         <source>Previous chapter</source>
         <translation>Capítulo anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="47"/>
         <source>Next verse</source>
         <translation>Próximo versículo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="51"/>
         <source>Previous verse</source>
         <translation>Versículo anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="56"/>
         <source>Synchronize</source>
         <translation>Sincronizar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="59"/>
         <source>Synchronize the displayed entry of this work with the active Bible window</source>
         <translation>Sincronizar a entrada mostrada desta obra com a janela ativa da Bíblia</translation>
     </message>
@@ -2036,7 +2252,7 @@ atalho</translation>
 <context>
     <name>CConfigurationDialog</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="41"/>
         <source>Configure BibleTime</source>
         <translation>Configurar BibleTime</translation>
     </message>
@@ -2044,67 +2260,67 @@ atalho</translation>
 <context>
     <name>CDisplaySettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
         <source>Display templates</source>
         <translation>Mostrar modelos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
         <source>Available display styles:</source>
         <translation>Estilos disponíveis da exposição:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="113"/>
         <source>Style preview</source>
         <translation>Pré-visualização do estilo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="131"/>
         <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
         <translation>Porque Deus amou o mundo de tal maneira que deu o seu Filho unigênito, para que todo aquele que nele crê não pereça, mas tenha a vida eterna.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="138"/>
         <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
         <translation>Porque Deus enviou o seu Filho ao mundo, não para que condenasse o mundo, mas para que o mundo fosse salvo por ele.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="145"/>
         <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
         <translation>Quem crê nele não é condenado; mas quem não crê já está condenado, porquanto não crê no nome do unigênito Filho de Deus.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="155"/>
         <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
         <translation>Porque todo aquele que faz o mal odeia a luz, e não vem para a luz, para que as suas obras não sejam reprovadas.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="160"/>
         <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
         <translation>Mas quem pratica a verdade vem para a luz, a fim de que as suas obras sejam manifestas, porque são feitas em Deus.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="106"/>
         <source>Display templates define how text is displayed.</source>
         <translation>Mostrar modelos define como o texto é exibido.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="110"/>
         <source>Show the BibleTime logo on startup</source>
         <translation>Mostrar o logo BibleTime na inicialização</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
         <source>Show startup logo</source>
         <translation>Mostrar logo na inicialização</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="150"/>
         <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
         <translation>E a condenaçäo é esta: Que a luz veio ao mundo, e os homens amaram mais as trevas do que a luz, porque as suas obras eram más. </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="101"/>
         <source>Display</source>
         <translation>Opções de Exibição</translation>
     </message>
@@ -2117,62 +2333,62 @@ atalho</translation>
 <context>
     <name>CDisplayWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="215"/>
         <source>Back in history</source>
         <translation>Voltar no histórico</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="223"/>
         <source>Forward in history</source>
         <translation>Adiante no histórico</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="192"/>
         <source>Select all</source>
         <translation>Selecionar tudo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="196"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="200"/>
         <source>Find...</source>
         <translation>Procurar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="204"/>
         <source>Change location</source>
         <translation>Mudar local</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="209"/>
         <source>Search with works of this window</source>
         <translation>Procurar em obras desta janela</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="393"/>
         <source>Work chooser buttons</source>
         <translation>Botões selecionadores de obras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="403"/>
         <source>Text area header</source>
         <translation>�rea do cabeçalho</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="453"/>
         <source>Navigation</source>
         <translation>Navegação</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="459"/>
         <source>Tool</source>
         <translation>Ferramenta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="465"/>
         <source>Format</source>
         <translation>Formatar</translation>
     </message>
@@ -2180,61 +2396,61 @@ atalho</translation>
 <context>
     <name>CHTMLWriteDisplay</name>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
         <source>Bold</source>
         <translation>Negrito</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="60"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="67"/>
         <source>Italic</source>
         <translation>Itálico</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="79"/>
         <source>Underline</source>
         <translation>Sublinhado</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="84"/>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="94"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="99"/>
         <source>Center</source>
         <translation>Central</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="104"/>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="231"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="243"/>
         <source>Font size</source>
         <translation>Tamanho da Fonte</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="255"/>
         <source>Font color</source>
         <translation>Cor da Fonte</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="89"/>
         <source>Align left</source>
         <translation>Alinhar à esquerda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="109"/>
         <source>Align right</source>
         <translation>Alinhar à direita</translation>
     </message>
@@ -2242,17 +2458,17 @@ atalho</translation>
 <context>
     <name>CHTMLWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="122"/>
         <source>Module not writable</source>
         <translation>Não é permitido escrever neste módulo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="124"/>
         <source>Module is not writable.</source>
         <translation>Não é permitido escrever neste módulo.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="125"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Ou o módulo não pode ser editado, ou você não tem  permissão para escrever.</translation>
     </message>
@@ -2268,22 +2484,22 @@ atalho</translation>
 <context>
     <name>CLexiconKeyChooser</name>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Rolar através das entradas da lista. Aperte o botão e mova o mouse para incrementar ou decrementar o item.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
         <source>Entries of the current work</source>
         <translation>Registros da obra atual</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Próximo registro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="49"/>
         <source>Previous entry</source>
         <translation>Registro anterior</translation>
     </message>
@@ -2291,70 +2507,70 @@ atalho</translation>
 <context>
     <name>CLexiconReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Próxima entrada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="51"/>
         <source>Previous entry</source>
         <translation>Entrada anterior</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="55"/>
         <source>Copy reference only</source>
         <translation>Copiar referências somente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
         <source>Save entry as HTML</source>
         <translation>Salvar endradas como HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
         <source>Print reference only</source>
         <translation>Imprimir referências somente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
         <source>Strong&apos;s Search</source>
         <translation>Busca de Strong</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
         <source>Entry with text</source>
         <translation>Entrada com texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="134"/>
         <source>Entry as plain text</source>
         <translation>Entrada como texto puro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="265"/>
         <source>Lexicon window</source>
         <translation>Janela de Dicionário</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="272"/>
         <source>Copy...</source>
         <translation>Copiar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="281"/>
         <source>Save...</source>
         <translation>Salvar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="297"/>
         <source>Print...</source>
         <translation>Imprimir...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="340"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="364"/>
         <source>Saving</source>
         <translation>Salvando</translation>
     </message>
@@ -2362,91 +2578,112 @@ atalho</translation>
 <context>
     <name>CPlainWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="235"/>
         <source>Sync with active Bible</source>
         <translation>Sincronizar com bíblia ativa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="245"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="249"/>
         <source>Save text</source>
         <translation>Salvar texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="254"/>
         <source>Delete current entry</source>
         <translation>Deletar entrada atual</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="263"/>
         <source>Restore original text</source>
         <translation>Restaurar texto original</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="163"/>
         <source>Module not writable</source>
         <translation>Módulo não permite escrita</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="165"/>
         <source>Module is not writable.</source>
         <translation>Módulo não permite escrita.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="166"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Ou o módulo não pode ser editado, ou você não tem  permissão para escrever. </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="240"/>
         <source>Synchronize (show the same verse) with the active Bible window</source>
         <translation>Sincronizar (mostrar o mesmo versículo) com a janela ativa da Bíblia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="258"/>
         <source>Delete current entry (no undo)</source>
         <translation>Apagar entrada atual (não será possível desfazer)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="267"/>
         <source>Restore original text, new text will be lost</source>
         <translation>Restaurar o texto original, novo texto será perdido</translation>
     </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save Text?</source>
+        <translation type="unfinished">Salvar texto?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <source>Save text before closing?</source>
+        <translation type="unfinished">Salvar texto antes de fechar?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save changed text?</source>
+        <translation type="unfinished">Salvar texto alterado?</translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="232"/>
         <source>Save Search Analysis</source>
         <translation>Salvar Análise de Busca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation>Arquivos HTML (*.html;*.HTML;*.HTM;*.htm)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="243"/>
         <source>BibleTime Search Analysis</source>
         <translation>Análise de Busca Bibletime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation>Procurar texto:</translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="234"/>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="259"/>
+        <source>Search text:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="263"/>
+        <source>Results by work and book</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="265"/>
         <source>Book</source>
         <translation>Livro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="293"/>
         <source>Total hits</source>
         <translation>Total de acertos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="303"/>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
         <translation>Criado por &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</translation>
     </message>
@@ -2454,168 +2691,168 @@ atalho</translation>
 <context>
     <name>CSwordModuleInfo</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="763"/>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="766"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="774"/>
         <source>unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="771"/>
         <source>Markup</source>
         <translation>Marcação</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
         <source>Location</source>
         <translation>Localização</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="782"/>
         <source>Language</source>
         <translation>Idioma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="787"/>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="792"/>
         <source>LCSH</source>
         <translation>LCSH</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="796"/>
         <source>Writable</source>
         <translation>Gravável</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>yes</source>
         <translation>sim</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>no</source>
         <translation>não</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="801"/>
         <source>Unlock key</source>
         <translation>Chave de Desbloqueio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="822"/>
         <source>Features</source>
         <translation>Características</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="830"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Cuidado, esta obra contém material questionável / cultural!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="834"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="856"/>
         <source>Distribution license</source>
         <translation>Licença da distribuição</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="857"/>
         <source>Distribution source</source>
         <translation>Fonte da distribuição</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="858"/>
         <source>Distribution notes</source>
         <translation>Notas da distribuição</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="859"/>
         <source>Text source</source>
         <translation>Fonte do texto </translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="860"/>
         <source>Copyright notes</source>
         <translation>Notas do copyright</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
         <source>Copyright holder</source>
         <translation>Detentor dos direitos autorais</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
         <source>Copyright date</source>
         <translation>Data do copyright</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
         <source>Copyright contact name</source>
         <translation>Nome do contato do copyright</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
         <source>Copyright contact address</source>
         <translation>Endereço do contato do copyright</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
         <source>Copyright contact email</source>
         <translation>Email do contato do copyright</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="956"/>
         <source>Bibles</source>
         <translation>Bíblias</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="958"/>
         <source>Commentaries</source>
         <translation>Comentários</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="960"/>
         <source>Books</source>
         <translation>Livros</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="962"/>
         <source>Cults/Unorthodox</source>
         <translation>Cultos/Heterodoxos</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="964"/>
         <source>Maps and Images</source>
         <translation>Mapas e Imagens</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="966"/>
         <source>Daily Devotionals</source>
         <translation>Devocionais Diários</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="968"/>
         <source>Lexicons and Dictionaries</source>
         <translation>Léxicos e Dicionários</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="970"/>
         <source>Glossaries</source>
         <translation>Glossários</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="972"/>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
@@ -2623,17 +2860,17 @@ atalho</translation>
 <context>
     <name>CSwordSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="43"/>
         <source>Standard works</source>
         <translation>Obras padrão</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="44"/>
         <source>Text filters</source>
         <translation>Filtros do texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="41"/>
         <source>Desk</source>
         <translation>Mesa</translation>
     </message>
@@ -2646,37 +2883,37 @@ atalho</translation>
 <context>
     <name>CSwordSetupInstallSourcesDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="47"/>
         <source>Caption</source>
         <translation>Título</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="68"/>
         <source>Path</source>
         <translation>Caminho</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="91"/>
         <source>Get list...</source>
         <translation>Obter lista...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
         <source>A source with this caption already exists. Please provide a different caption.</source>
         <translation>Uma fonte com este título já existe. Por favor, forneça outro título.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="160"/>
         <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
 
 Do you want to continue?</source>
@@ -2685,140 +2922,121 @@ Do you want to continue?</source>
 Deseja continuar?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
         <source>Get source list from remote server?</source>
         <translation>Obter lista de fontes de servidor remoto?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="167"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="168"/>
         <source>Downloading List</source>
         <translation>Baixando Lista</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="178"/>
         <source>Connecting...</source>
         <translation>Conectando...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="197"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="198"/>
         <source>Refreshing...</source>
         <translation>Atualizando...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="92"/>
         <source>Download a list of sources from CrossWire server and add sources</source>
         <translation>Baixar uma lista de fontes do servidor CrossWire e adicionar fontes</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
         <source>Please provide a caption.</source>
         <translation>Forneça por favor um título.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
         <source>Please provide a server name.</source>
         <translation>Forneça por favor o nome do servidor.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
         <source>Please provide a valid, readable path.</source>
         <translation>Forneça por favor um caminho válido.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Please provide a path.</source>
         <translation>Forneça por favor um caminho.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="39"/>
         <source>New  Installation Source</source>
         <translation>Nova fonte de instalação</translation>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>Salvar texto antes de fechar?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>Salvar texto alterado?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>Salvar texto?</translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="178"/>
         <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
         <translation>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Versão: %3&lt;/p&gt;&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="194"/>
         <source>Abbreviation</source>
         <translation>Abreviação</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="203"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="290"/>
         <source>Cross references</source>
         <translation>Referência Cruzada</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="343"/>
         <source>Footnote</source>
         <translation>Notas de rodapé</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="374"/>
         <source>Strongs</source>
         <translation>Números de Strong</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="451"/>
         <source>Morphology</source>
         <translation>Marcações morfológicas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="472"/>
         <source>Word lookup</source>
         <translation>Pesquisa de palavras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="60"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
         <source>Select all</source>
         <translation>Selecionar tudo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="80"/>
         <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
         <translation>&lt;small&gt;Esta é a área da visualização da Lupa. Passe o mouse por cima de links ou outros items que incluem alguma informação e o conteúdo aparecerá na Lupa depois de um pequeno atraso. Movimente o mouse dentro da Lupa rapidamente ou trave a visualização pressionando e soltando a tecla Shift enquanto movimenta o mouse.&lt;/small&gt;</translation>
     </message>
@@ -2826,28 +3044,28 @@ Deseja continuar?</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="412"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="422"/>
         <source>Indexing aborted</source>
         <translation>Indexação abortada</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="413"/>
         <source>An internal error occurred while building the index: %1</source>
         <translation>Ocorreu um erro interno durante a construç/ao do índice. %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="423"/>
         <source>An internal error occurred while building the index.</source>
         <translation>Ocorreu um erro interno durante a construç/ao do índice.</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="522"/>
         <source>Search aborted</source>
         <translation>Busca abortada</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="523"/>
         <source>An internal error occurred while executing your search.</source>
         <translation>Um ero interno ocorreu durante a execução da busca.</translation>
     </message>
@@ -2888,7 +3106,7 @@ Deseja continuar?</translation>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="122"/>
         <source>Bibles</source>
         <translation>Bíblias</translation>
     </message>
@@ -2905,740 +3123,740 @@ Deseja continuar?</translation>
         <translation>Livros</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="390"/>
         <source>Added text</source>
         <translation>Texto Adicionado</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="143"/>
         <source>Names of languages</source>
         <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
         <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="148"/>
         <source>Afrikaans</source>
         <extracomment>Language name af</extracomment>
         <translation>Africâner</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="151"/>
         <source>Amuzgo, Guerrero</source>
         <extracomment>Language name amu</extracomment>
         <translation>Amuzgo, Guerrero, Oaxaca</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="153"/>
         <source>English, Old (ca.450-1100)</source>
         <extracomment>Language name ang</extracomment>
         <translation>Inglês Antigo (ca.450-1100)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="155"/>
         <source>Arabic</source>
         <extracomment>Language name ar</extracomment>
         <translation>�rabe</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="158"/>
         <source>Azerbaijani</source>
         <extracomment>Language name az</extracomment>
         <translation>Azeri</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="160"/>
         <source>Azerbaijani, South</source>
         <extracomment>Language name azb</extracomment>
         <translation>Azeri Sul</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="165"/>
         <source>Belarusian</source>
         <extracomment>Language name be</extracomment>
         <translation>Bielo-russo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="167"/>
         <source>Bulgarian</source>
         <extracomment>Language name bg</extracomment>
         <translation>Búlgaro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="173"/>
         <source>Breton</source>
         <extracomment>Language name br</extracomment>
         <translation>Bretão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="175"/>
         <source>Bosnian</source>
         <extracomment>Language name bs</extracomment>
         <translation>Bósnio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="177"/>
         <source>Catalan</source>
         <extracomment>Language name ca</extracomment>
         <translation>Catalão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="180"/>
         <source>Chinantec, Comaltepec</source>
         <extracomment>Language name cco</extracomment>
         <translation>Chinantec de Comaltepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="182"/>
         <source>Cebuano</source>
         <extracomment>Language name ceb</extracomment>
         <translation>Cubano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
         <source>Chamorro</source>
         <extracomment>Language name ch</extracomment>
         <translation>Chamorro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
         <source>Chontal, Highland Oaxaca</source>
         <extracomment>Language name chd</extracomment>
         <translation>Chontal, Planalto de Oaxaca</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
         <source>Chinantec, Quiotepec</source>
         <extracomment>Language name chq</extracomment>
         <translation>Chinantec, Quiotepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="190"/>
         <source>Chinantec, Ozumacu00edn</source>
         <extracomment>Language name chz</extracomment>
         <translation>Chinantec, Ozumacín</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="193"/>
         <source>Cakchiquel, Western</source>
         <extracomment>Language name ckw</extracomment>
         <translation>Cakchiquel Ocidental</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="195"/>
         <source>Chinantec, Lalana</source>
         <extracomment>Language name cnl</extracomment>
         <translation>Chinantec, Lalana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="197"/>
         <source>Chinantec, Tepetotutla</source>
         <extracomment>Language name cnt</extracomment>
         <translation>Chinantec, Tepetolutla</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="199"/>
         <source>Coptic</source>
         <extracomment>Language name cop</extracomment>
         <translation>Copta</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
         <source>Czech</source>
         <extracomment>Language name cs</extracomment>
         <translation>Tcheco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
         <source>Chinantec, Sochiapan</source>
         <extracomment>Language name cso</extracomment>
         <translation>Chinantec, Sochiapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
         <source>Chol, Tila</source>
         <extracomment>Language name cti</extracomment>
         <translation>Chol, Tila</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
         <source>Chatino, Western Highland</source>
         <extracomment>Language name ctp</extracomment>
         <translation>Chatino, Planalto Ocidental</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
         <source>Church Slavic</source>
         <extracomment>Language name cu</extracomment>
         <translation>Eslavo Eclesiástico</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="212"/>
         <source>Welsh</source>
         <extracomment>Language name cy</extracomment>
         <translation>Galês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
         <source>Danish</source>
         <extracomment>Language name da</extracomment>
         <translation>Dinamarquês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
         <source>German</source>
         <extracomment>Language name de</extracomment>
         <translation>Alemão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
         <source>Duruma</source>
         <extracomment>Language name dug</extracomment>
         <translation>Duruma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="221"/>
         <source>Greek, Modern (1453-)</source>
         <extracomment>Language name el</extracomment>
         <translation>Grego, Moderno (1453-)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
         <source>English</source>
         <extracomment>Language name en</extracomment>
         <translation>Inglês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="225"/>
         <source>American English</source>
         <extracomment>Language name en_US</extracomment>
         <translation>Inglês Americano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="227"/>
         <source>English, Middle (1100-1500)</source>
         <extracomment>Language name enm</extracomment>
         <translation>Inglês, Médio (1100-1500)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="229"/>
         <source>Esperanto</source>
         <extracomment>Language name eo</extracomment>
         <translation>Esperanto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="231"/>
         <source>Spanish</source>
         <extracomment>Language name es</extracomment>
         <translation>Espanhol</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
         <source>Estonian</source>
         <extracomment>Language name et</extracomment>
         <translation>Estoniano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
         <source>Basque</source>
         <extracomment>Language name eu</extracomment>
         <translation>Basco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
         <source>Persian</source>
         <extracomment>Language name fa</extracomment>
         <translation>Persa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
         <source>Finnish</source>
         <extracomment>Language name fi</extracomment>
         <translation>Finlandês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="243"/>
         <source>French</source>
         <extracomment>Language name fr</extracomment>
         <translation>Francês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="245"/>
         <source>Frisian</source>
         <extracomment>Language name fy</extracomment>
         <translation>Frisão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="247"/>
         <source>Irish</source>
         <extracomment>Language name ga</extracomment>
         <translation>Irlandês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="249"/>
         <source>Gaelic (Scots)</source>
         <extracomment>Language name gd</extracomment>
         <translation>Gaulês (Escocês)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="251"/>
         <source>Geez</source>
         <extracomment>Language name gez</extracomment>
         <translation>ge&apos;ez</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
         <source>Gothic</source>
         <extracomment>Language name got</extracomment>
         <translation>Gótico</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
         <source>Manx</source>
         <extracomment>Language name gv</extracomment>
         <translation>Manx</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
         <source>Greek, Ancient (to 1453)</source>
         <extracomment>Language name grc</extracomment>
         <translation>Grego, Antigo (até 1453)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="262"/>
         <source>Hebrew</source>
         <extracomment>Language name he</extracomment>
         <translation>Hebraico</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
         <source>Hausa</source>
         <extracomment>Language name hau</extracomment>
         <translation>haússa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
         <source>Hawaiian</source>
         <extracomment>Language name haw</extracomment>
         <translation>Havaiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
         <source>Hindi</source>
         <extracomment>Language name hi</extracomment>
         <translation>Hindi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="271"/>
         <source>Croatian</source>
         <extracomment>Language name hr</extracomment>
         <translation>Croata</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="275"/>
         <source>Hungarian</source>
         <extracomment>Language name hu</extracomment>
         <translation>Húngaro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
         <source>Huave, San Mateo Del Mar</source>
         <extracomment>Language name huv</extracomment>
         <translation>Huave, San Mateo Del Mar</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
         <source>Armenian</source>
         <extracomment>Language name hy</extracomment>
         <translation>Armênio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
         <source>Indonesian</source>
         <extracomment>Language name id</extracomment>
         <translation>Indonésio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
         <source>Icelandic</source>
         <extracomment>Language name is</extracomment>
         <translation>Islândico</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
         <source>Italian</source>
         <extracomment>Language name it</extracomment>
         <translation>Italiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="291"/>
         <source>Itzu00e1</source>
         <extracomment>Language name itz</extracomment>
         <translation>itzá</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="293"/>
         <source>Ixil, San Juan Cotzal</source>
         <extracomment>Language name ixl</extracomment>
         <translation>Ixil, San Juan Cotzal</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
         <source>Japanese</source>
         <extracomment>Language name ja</extracomment>
         <translation>Japonês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
         <source>Jacalteco, Eastern</source>
         <extracomment>Language name jac</extracomment>
         <translation>Jacaltelco Oriental</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
         <source>Javanese, Caribbean</source>
         <extracomment>Language name jvn</extracomment>
         <translation>Javanês, Caribe</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="302"/>
         <source>Georgian</source>
         <extracomment>Language name ka</extracomment>
         <translation>Georgiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
         <source>Korean</source>
         <extracomment>Language name ko</extracomment>
         <translation>Coreano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="315"/>
         <source>Kurdish</source>
         <extracomment>Language name ku</extracomment>
         <translation>Curdo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
         <source>Kirghiz</source>
         <extracomment>Language name ky</extracomment>
         <translation>Quirguiz</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
         <source>Latin</source>
         <extracomment>Language name la</extracomment>
         <translation>Latim</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
         <source>Lacandon</source>
         <extracomment>Language name lac</extracomment>
         <translation>lacandão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
         <source>Lithuanian</source>
         <extracomment>Language name lt</extracomment>
         <translation>Lituano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="332"/>
         <source>Latvian</source>
         <extracomment>Language name lv</extracomment>
         <translation>Letão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="334"/>
         <source>Malagasy</source>
         <extracomment>Language name mg</extracomment>
         <translation>Malgaxe</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="337"/>
         <source>Maori</source>
         <extracomment>Language name mi</extracomment>
         <translation>Maori</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="339"/>
         <source>Mixe, Isthmus</source>
         <extracomment>Language name mir</extracomment>
         <translation>Mixe, Istmo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="341"/>
         <source>Mixtec, Coatzospan</source>
         <extracomment>Language name miz</extracomment>
         <translation>Mixtec, Coatzospan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="343"/>
         <source>Macedonian</source>
         <extracomment>Language name mk</extracomment>
         <translation>Macedoniano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="345"/>
         <source>Mixtec, Silacayoapan</source>
         <extracomment>Language name mks</extracomment>
         <translation>Mixtec, Silacayoapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="350"/>
         <source>More</source>
         <extracomment>Language name mos</extracomment>
         <translation>more</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
         <source>Malay</source>
         <extracomment>Language name ms</extracomment>
         <translation>Malaio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
         <source>Maltese</source>
         <extracomment>Language name mt</extracomment>
         <translation>Maltês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="375"/>
         <source>Low German; Low Saxon</source>
         <extracomment>Language name nds</extracomment>
         <translation>Baixo Alemão; Baixo Saxão</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="377"/>
         <source>Nepali</source>
         <extracomment>Language name ne</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="379"/>
         <source>Nahuatl, Guerrero</source>
         <extracomment>Language name ngu</extracomment>
         <translation>Nahuatl, Guerrero</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
         <source>Nahuatl, Northern Oaxaca</source>
         <extracomment>Language name nhy</extracomment>
         <translation>Nahuatl, Oaxaca Norte</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
         <source>Dutch</source>
         <extracomment>Language name nl</extracomment>
         <translation>Holandês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
         <source>Norwegian Nynorsk</source>
         <extracomment>Language name nn</extracomment>
         <translation>Novo Norueguês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
         <source>Norwegian</source>
         <extracomment>Language name no</extracomment>
         <translation>Norueguês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="397"/>
         <source>Otomi, Queru00e9taro</source>
         <extracomment>Language name otq</extracomment>
         <translation>Otomi, Querétaro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
         <source>Papiamento</source>
         <extracomment>Language name pap</extracomment>
         <translation>Papiamento</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
         <source>Polish</source>
         <extracomment>Language name pl</extracomment>
         <translation>Polonês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="411"/>
         <source>Persian (Dari)</source>
         <extracomment>Language name prs</extracomment>
         <translation>Dari Persa (Dari)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="415"/>
         <source>Portuguese</source>
         <extracomment>Language name pt</extracomment>
         <translation>Português</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
         <source>Brasilian Portuguese</source>
         <extracomment>Language name pt_BR</extracomment>
         <translation>Português do Brasil</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
         <source>Quichu00e9, West Central</source>
         <extracomment>Language name qut</extracomment>
         <translation>Quiché, Centro-Ocidental</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
         <source>Romanian</source>
         <extracomment>Language name ro</extracomment>
         <translation>Romeno</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
         <source>Russian</source>
         <extracomment>Language name ru</extracomment>
         <translation>Russo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="431"/>
         <source>Scots</source>
         <extracomment>Language name sco</extracomment>
         <translation>Escocês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="437"/>
         <source>Slovak</source>
         <extracomment>Language name sk</extracomment>
         <translation>Eslovaco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="439"/>
         <source>Slovenian</source>
         <extracomment>Language name sl</extracomment>
         <translation>Eslovênio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="443"/>
         <source>Somali</source>
         <extracomment>Language name so</extracomment>
         <translation>Somali</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
         <source>Albanian</source>
         <extracomment>Language name sq</extracomment>
         <translation>Albanês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="453"/>
         <source>Swedish</source>
         <extracomment>Language name sv</extracomment>
         <translation>Sueco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="455"/>
         <source>Swahili</source>
         <extracomment>Language name sw</extracomment>
         <translation>Suali</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="457"/>
         <source>Syriac</source>
         <extracomment>Language name syr</extracomment>
         <translation>Sírio</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="459"/>
         <source>Tamil</source>
         <extracomment>Language name ta</extracomment>
         <translation>Tâmil</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="463"/>
         <source>Thai</source>
         <extracomment>Language name th</extracomment>
         <translation>Tailandês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
         <source>Tagalog</source>
         <extracomment>Language name tl</extracomment>
         <translation>Filipino</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="470"/>
         <source>Tswana</source>
         <extracomment>Language name tn</extracomment>
         <translation>Tsuana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="472"/>
         <source>Turkish</source>
         <extracomment>Language name tr</extracomment>
         <translation>Turco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
         <source>Tektiteko</source>
         <extracomment>Language name ttc</extracomment>
         <translation>Tektiteko</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="479"/>
         <source>Tahitian</source>
         <extracomment>Language name ty</extracomment>
         <translation>Taitiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="481"/>
         <source>Tzotzil, Zinacantu00e1n</source>
         <extracomment>Language name tzz</extracomment>
         <translation>Tzotzil, Zinacantán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
         <source>Ukrainian</source>
         <extracomment>Language name uk</extracomment>
         <translation>Ucraniano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
         <source>Orya</source>
         <extracomment>Language name ury</extracomment>
         <translation>Orya</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
         <source>Uspanteco</source>
         <extracomment>Language name usp</extracomment>
         <translation>Uspanteco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="492"/>
         <source>Vietnamese</source>
         <extracomment>Language name vi</extracomment>
         <translation>Vietnamita</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="496"/>
         <source>Xhosa</source>
         <extracomment>Language name xh</extracomment>
         <translation>Xosa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="163"/>
         <source>Bavarian</source>
         <extracomment>Language name bar</extracomment>
         <translation>Bavário</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="326"/>
         <source>Lombard</source>
         <extracomment>Language name lmo</extracomment>
         <translation>Lombardo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="403"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
         <source>Uma</source>
         <extracomment>Language name ppk
 ----------
@@ -3646,442 +3864,422 @@ Language name ppk</extracomment>
         <translation>Uma (Sulawesi)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="448"/>
         <source>Sranan</source>
         <extracomment>Language name srn</extracomment>
         <translation>sranam tongo (taki-taki)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
         <source>Yiddish</source>
         <extracomment>Language name yi</extracomment>
         <translation>Iídiche</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
         <source>Zapotec, San Juan Guelavu00eda</source>
         <extracomment>Language name zab</extracomment>
         <translation>Zapotec, San Juan Guelavía</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="507"/>
         <source>Zapotec, Mitla</source>
         <extracomment>Language name zaw</extracomment>
         <translation>Zapotec, Mitla</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="509"/>
         <source>Chinese</source>
         <extracomment>Language name zh</extracomment>
         <translation>Chinês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="511"/>
         <source>Zapotec, Amatlu00e1n</source>
         <extracomment>Language name zpo</extracomment>
         <translation>Zapotec, Amatlán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
         <source>Zapotec, Zoogocho</source>
         <extracomment>Language name zpq</extracomment>
         <translation>Zapotec, Zoogocho</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="515"/>
         <source>Zapotec, Yalu00e1lag</source>
         <extracomment>Language name zpu</extracomment>
         <translation>Zapotec, Yalálag</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
         <source>Zapotec, Chichicapan</source>
         <extracomment>Language name zpv</extracomment>
         <translation>Zapotec, Chichicapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
         <source>Zapotec, Southern Rincon</source>
         <extracomment>Language name zsr</extracomment>
         <translation>Zapotec, Rincon Sul</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
         <source>Zapotec, Quioquitani-Quieru00ed</source>
         <extracomment>Language name ztq</extracomment>
         <translation>Zapotec, Quioquitani-Quierí</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
         <source>Zapotec, Yatee</source>
         <extracomment>Language name zty</extracomment>
         <translation>Zapotec, Yatee</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="525"/>
         <source>Zulu</source>
         <extracomment>Language name zu</extracomment>
         <translation>Zulu</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="314"/>
         <source>Footnotes</source>
         <translatorcomment>Notas de Rodapé</translatorcomment>
         <translation>Notas de rodapé</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="316"/>
         <source>Strong&apos;s numbers</source>
         <translation>Números de Strong</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="318"/>
         <source>Headings</source>
         <translation>Títulos</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="320"/>
         <source>Morphological tags</source>
         <translation>Marcações morfológicas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="322"/>
         <source>Lemmas</source>
         <translation>Lemas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="324"/>
         <source>Hebrew vowel points</source>
         <translation>Pontos da vogal hebraica</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="326"/>
         <source>Hebrew cantillation marks</source>
         <translation>sinais da crestomatia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="328"/>
         <source>Greek accents</source>
         <translation>Acentos Gregos</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="330"/>
         <source>Red letter words</source>
         <translation>Palavres com letras vermelhas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="332"/>
         <source>Textual variants</source>
         <translation>Variações Textuais</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="334"/>
         <source>Scripture cross-references</source>
         <translation>Referências-cruzadas das Escrituras</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="336"/>
         <source>Morph segmentation</source>
         <translation>segmentação dos morfemas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation>Exportar</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
         <source>Local</source>
         <translation>Local</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>Remoto</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Antigo testamento</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Moisés/Pentateuco/Torá</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>História</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Profetas</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>Novo testamento</translation>
+        <source>Remote FTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Evangelhos</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="32"/>
+        <source>Remote SFTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>Cartas/Epístolas</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="33"/>
+        <source>Remote HTTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Epístolas de Paulo</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="34"/>
+        <source>Remote HTTPS</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
         <source>HTML files</source>
         <translation>Arquivos HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="438"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>All files</source>
         <translation>Todos os arquivos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>Text files</source>
         <translation>Arquivos de texto</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="444"/>
         <source>Save file</source>
         <translation>Salvar Arquivo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="130"/>
         <source>Save document ...</source>
         <translation>Salvar documento...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
         <source>BibleTime bookmark files</source>
         <translation>Arquivos marcadores do BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="127"/>
         <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
         <source>unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="60"/>
         <source>New folder</source>
         <translation>Nova pasta</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
+        <location filename="../../src/util/tool.cpp" line="48"/>
         <source>The file already exists.</source>
         <translation>O arquivo já existe.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
+        <location filename="../../src/util/tool.cpp" line="49"/>
         <source>Do you want to overwrite it?</source>
         <translation>Vocë gostaria de sobrescrevê-lo?</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
+        <location filename="../../src/util/tool.cpp" line="69"/>
+        <location filename="../../src/util/tool.cpp" line="75"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>O arquivo não pode ser salvo.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
+        <location filename="../../src/util/tool.cpp" line="78"/>
         <source>Please check permissions etc.</source>
         <translation>Por favor verifique as permissões, etc.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
+        <location filename="../../src/util/tool.cpp" line="197"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Cuidado, esta obra contém material questionável / cultural!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
+        <location filename="../../src/util/tool.cpp" line="218"/>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
+        <location filename="../../src/util/tool.cpp" line="207"/>
         <source>Encrypted - needs unlock key</source>
         <translation>Encriptado - precisa da chave de destravamento</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
+        <location filename="../../src/util/tool.cpp" line="71"/>
+        <source>Error while writing to file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="72"/>
+        <source>Please check that enough disk space is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="77"/>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="231"/>
         <source>Double click for more information</source>
         <translation>Clique duplo para mais informações</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
+        <location filename="../../src/util/tool.cpp" line="213"/>
         <source>Updated version available!</source>
         <translation>Versão Atualizada disponível!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
+        <location filename="../../src/util/tool.cpp" line="226"/>
         <source>Installed version</source>
         <translation>Versão instalada</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="273"/>
         <source>Haitian Creole</source>
         <extracomment>Language name ht</extracomment>
         <translation>Crioulo Haitiano</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
         <source>Kekchu00ed</source>
         <comment>kek</comment>
         <extracomment>Language name kek</extracomment>
         <translation>Queqchi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="357"/>
         <source>(Multiple languages)</source>
         <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
         <translation>(Múltiplos Idiomas)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="359"/>
         <source>Mam, Central</source>
         <extracomment>Language name mvc</extracomment>
         <translation>Mam, Central</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
         <source>Mam, Todos Santos Cuchumatu00e1n</source>
         <extracomment>Language name mvj</extracomment>
         <translation>Todos Santos Cuchumatán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="363"/>
         <source>Mixe, Juquila</source>
         <extracomment>Language name mxq</extracomment>
         <translation>Mixe, Juquila</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="365"/>
         <source>Mixtec, Jamiltepec</source>
         <extracomment>Language name mxt</extracomment>
         <translation>Mixtec, Jamiltepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="367"/>
         <source>Burmese</source>
         <extracomment>Language name my</extracomment>
         <translation>Birmanês</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="370"/>
         <source>Norwegian Bokmu00e5l</source>
         <extracomment>Language name nb</extracomment>
         <translation>Norueguês Bokmål</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="372"/>
         <source>Nahuatl, Michoacu00e1n</source>
         <extracomment>Language name ncl</extracomment>
         <translation>Nahuatl Michoacán</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
         <source>Potawatomi</source>
         <extracomment>Language name pot</extracomment>
         <translation>Potawatomi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="468"/>
         <source>Klingon</source>
         <extracomment>Language name tlh</extracomment>
         <translation>Klingon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="498"/>
         <source>Mixtec, Diuxi-Tilantongo</source>
         <extracomment>Language name xtd</extracomment>
         <translation>Mixtec, Diuxi-Tilantongo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
         <source>Yoryba</source>
         <extracomment>Language name yo</extracomment>
         <translation>Yorubá</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="407"/>
         <source>Verb tense changed</source>
         <translation>Tempo Verbal mudado</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>Can&apos;t write file</source>
         <translation>Arquivo não pôde ser escrito</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>The Sword config file can&apos;t be written!</source>
         <translation>O arquivo de configuração Sword não pode ser escrito!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="39"/>
         <source>Export Bookmarks</source>
         <translation>Exportar Marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="50"/>
         <source>Import bookmarks</source>
         <translation>Importar marcadores</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
+        <location filename="../../src/util/tool.cpp" line="46"/>
         <source>Overwrite File?</source>
         <translation>Sobrescrever Arquivo?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="276"/>
         <source>Parsing Strong&apos;s Numbers</source>
         <translation>Analisar Números Strong</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="154"/>
         <source>This shortcut conflicts with the shortcut for the following actions:</source>
         <translation>Este atalho conflita com o atalho para as seguintes ações:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
         <source>Do you want to clear the conflicting shortcuts and continue?</source>
         <translation>Você quer limpar os atalhos em conflito e continuar?</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="23"/>
         <source>Indexed works</source>
         <translation>Obras Indexadas</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="24"/>
         <source>Unindexed works</source>
         <translation>Obrass não-indexadas</translation>
     </message>
@@ -4126,17 +4324,17 @@ Language name ppk</extracomment>
         <translation>Erro: Argumento de linha de comando ignorado: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="57"/>
         <source>CSS base template not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="74"/>
         <source>Default template &quot;%1&quot; not found!</source>
         <translation>Modelo parão &quot;%1&quot; não encontrado!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="113"/>
         <source>Replace</source>
         <translation>Substituir</translation>
     </message>
@@ -4144,91 +4342,91 @@ Language name ppk</extracomment>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="58"/>
         <source>OK</source>
         <comment>Dialog Button</comment>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="59"/>
         <source>Open</source>
         <comment>Dialog Button</comment>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="60"/>
         <source>Save</source>
         <comment>Dialog Button</comment>
         <translation>Salvar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="61"/>
         <source>Cancel</source>
         <comment>Dialog Button</comment>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="62"/>
         <source>Close</source>
         <comment>Dialog Button</comment>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="63"/>
         <source>Discard</source>
         <comment>Dialog Button</comment>
         <translation>Descartar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="64"/>
         <source>Apply</source>
         <comment>Dialog Button</comment>
         <translation>Aplicar</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="65"/>
         <source>Reset</source>
         <comment>Dialog Button</comment>
         <translation>reset</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="66"/>
         <source>Restore defaults</source>
         <comment>Dialog Button</comment>
         <translation>Restaurar Definições</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="67"/>
         <source>Help</source>
         <comment>Dialog Button</comment>
         <translation>Ajuda</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="68"/>
         <source>Save All</source>
         <comment>Dialog Button</comment>
         <translation>Salvar Tudo</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="69"/>
         <source>Yes</source>
         <comment>Dialog Button</comment>
         <translation>Sim</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="70"/>
         <source>Yes to all</source>
         <comment>Dialog Button</comment>
         <translation>Sim para todos</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="71"/>
         <source>No</source>
         <comment>Dialog Button</comment>
         <translation>Não</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="72"/>
         <source>No to all</source>
         <comment>Dialog Button</comment>
         <translation>Não para todos</translation>
@@ -4237,102 +4435,102 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchOptionsArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="97"/>
         <source>Search for:</source>
         <translation>Procurar por:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="104"/>
         <source>&amp;Search</source>
         <translation>&amp;Procurar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="106"/>
         <source>Start to search the text in the chosen works</source>
         <translation>Começar a busca do texto nas obras escolhidas</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="109"/>
         <source>Ch&amp;oose...</source>
         <translation>Esc&amp;olher...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="111"/>
         <source>Choose works for the search</source>
         <translation>Escolher obras para busca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="114"/>
         <source>S&amp;etup...</source>
         <translation>Con&amp;figurar...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="133"/>
         <source>All of the words (AND is added between the words)</source>
         <translation>Todas as palavras (AND é adicionado entre as palavras)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="137"/>
         <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
         <translation> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="148"/>
         <source>Scope:</source>
         <translation>Escopo:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="169"/>
         <source>The text you want to search for</source>
         <translation>O texto que você deseja pesquisar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="173"/>
         <source>Works:</source>
         <translation>Obras:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="346"/>
         <source>No search scope</source>
         <translation>Sem escopo de busca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="128"/>
         <source>All words</source>
         <translation>Todas as palavras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="116"/>
         <source>Configure predefined scopes for search</source>
         <translation>Configurar escopos pré-definidos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="130"/>
         <source>Some words</source>
         <translation>Algumas palavras</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
         <source>Free</source>
         <translation>Livre</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
         <source>Some of the words (OR is added between the words)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
         <source>Full lucene syntax</source>
         <translation>Sintaxe lucene completa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
         <source>Click the link to get help for search syntax</source>
         <translation>Clique no link para obter ajuda para a sintaxe de busca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="159"/>
         <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
         <translation>Escolha o escopo (livros/capítulos/versículos para buscar neles).&lt;br /&gt;Aplicável para Bíblias e comentários.</translation>
     </message>
@@ -4340,17 +4538,17 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchResultArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="85"/>
         <source>Text of the selected search result item</source>
         <translation>Texto do item selecionado do resultados de pesquisa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="88"/>
         <source>Select all</source>
         <translation>Selecionar tudo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="92"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -4358,242 +4556,242 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchSyntaxHelpDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="47"/>
         <source>Search Syntax Help</source>
         <translation>Busca Sintaxe Ajuda</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="94"/>
         <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
         <translation>Esta ajuda é principalmente para a opção &apos;Full syntax&apos;. As opções &apos;Todas as palavras&apos; e &apos;Algumas palavras&apos;tem sintaxe mais limitada;&lt;a href=&apos;#wildcards&apos;&gt;curingas&lt;/a&gt; e &lt;a href=&apos;#fields&apos;&gt;campos de texto&lt;/a&gt;são suporadas por elas. Algumas outras características de sintaxe podem retornar resultados estranhos ou errados. com Todas as palavras/Algumas palavras.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
         <source>Which words to find</source>
         <translation>Quais palavras procurar</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="101"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
         <source>Grouping and order</source>
         <translation>Agrupando e ordenando</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="103"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
         <source>Wildcards (partial words)</source>
         <translation>Wildcards (palavras parciais)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
         <source>Text fields (different parts of text)</source>
         <translation>Campos de texto (diferentes pates do texto)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="208"/>
         <source>Other syntax features</source>
         <translation>Outras características de sintaxe</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
         <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
         <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
         <translation>Os termos são separadas por espaços. &lt;strong&gt;  AND &lt;/strong&gt; (todas as palavras), &lt;strong&gt; OR &lt;/strong&gt; (algumas palavras) e &lt;strong&gt; NOT &lt;/strong&gt; (não a palavra seguinte) podem ser adicionados entre as palavras. Se nada for adicionado explicitamente OR é usado automaticamente. &quot;&lt;strong&gt;  + &lt;/Strong&gt; palavra&quot;, a palavra deve estar nos resultados, &quot;&lt;strong&gt; - &lt;/strong&gt; palavra&quot; significa que não deve estar nos resultados.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="119"/>
         <source>jesus AND god</source>
         <comment>Do not translate &quot;AND&quot;.</comment>
         <translation>jesus AND deus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="121"/>
         <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
         <translation>Localiza versículos com &apos;Jesus&apos; e  &apos;Deus&apos;, simultaneamente</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="123"/>
         <source>jesus OR god</source>
         <comment>Do not translate &quot;OR&quot;.</comment>
         <translation>jesus OR deus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="125"/>
         <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
         <translation>Localiza versículos tanto com &apos;Jesus&apos; quanto &apos;Deus&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="127"/>
         <source>jesus NOT god</source>
         <comment>Do not translate &quot;NOT&quot;.</comment>
         <translation>jesus NOT deus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="133"/>
         <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
         <translation>Localiza versículos com &apos;Jesus&apos;, mas não com &apos;Deus&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="131"/>
         <source>+jesus -god</source>
         <translation>+jesus -deus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
         <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
         <translation>Palavras podem ser agrupadas com &lt;strong&gt;parênteses&lt;/strong&gt;. Ordem estrita das palavras pode ser definida com &lt;strong&gt; aspas &lt;/strong&gt;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
         <source>(a AND b) OR c</source>
         <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
         <translation>(a AND b) OR c</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
         <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
         <translation>Localiza versículos com &apos;a&apos; AND &apos;b&apos; e versículos com &apos;c&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="145"/>
         <source>&quot;says lord&quot;</source>
         <translation>&quot;diz o senhor&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="149"/>
         <source>&quot;says the lord&quot;</source>
         <translation>&quot;&quot;disse o senhor</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="151"/>
         <source>Finds all verses with &apos;says the LORD&apos;</source>
         <translation>Localiza todos os versículos com &quot;disse o senhor&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
         <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
         <translation>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; casa qualquer sequência de 0 ou mais caracteres, enquanto  &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; casa qualquer caractere simples. Um curinga não pode ser usado no início da palavra.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="160"/>
         <source>a*</source>
         <translation>a*</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="162"/>
         <source>All words beginning with &apos;a&apos;</source>
         <translation>Todas as palavras qua começam com &apos;a&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="164"/>
         <source>a*a</source>
         <translation>a*a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="166"/>
         <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
         <translation>&apos;Assíria&apos;, &apos;aroma&apos;, &apos;abba&apos;, etc.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="168"/>
         <source>a?</source>
         <translation>a?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="170"/>
         <source>&apos;at&apos; and &apos;an&apos;</source>
         <translation>&apos;ar&apos; e &apos;ai&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="172"/>
         <source>a??a</source>
         <translation>a??a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="174"/>
         <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
         <translation>&apos;abba&apos;, &apos;área&apos;, &apos;�sia&apos;, etc.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
         <source>Available text fields:</source>
         <translation>Campos de texto disponíveis:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="181"/>
         <source>Searches headings</source>
         <translation>Busca em títulos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="183"/>
         <source>Searches footnotes</source>
         <translation>Busca em notas de rodapé</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="185"/>
         <source>Searches Strong&apos;s numbers</source>
         <translation>Busca de numeros Strong</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="187"/>
         <source>Searches morphology codes</source>
         <translation>Busca de códigos mofológicos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="189"/>
         <source>Examples:</source>
         <translation>Exemplos:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="191"/>
         <source>heading:Jesus</source>
         <comment>Do not translate &quot;heading:&quot;.</comment>
         <translation>heading:Jesus</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="193"/>
         <source>Finds headings with &apos;Jesus&apos;</source>
         <translation>Localiza títulos com &apos;Jesus&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="195"/>
         <source>footnote:Jesus AND footnote:said</source>
         <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
         <translation>footnote:Jesus AND footnote:disse</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
         <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
         <translation>Localiza notas de rodapé com &apos;Jesus&apos; e &apos;disse&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
         <source>strong:G846</source>
         <comment>Do not translate &quot;strong:&quot;.</comment>
         <translation>strong:G846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="202"/>
         <source>Finds verses with Strong&apos;s Greek number 846</source>
         <translation>Localiza versículos com o número grego 846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="204"/>
         <source>morph:&quot;N-NSF&quot;</source>
         <comment>Do not translate &quot;morph:&quot;.</comment>
         <translation>morph:&quot;N-NSF&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="206"/>
         <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
         <translation>Localiza versículos com códigos morfológicos &apos;N-NSF&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="210"/>
         <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
         <translation>BibleTime utiliza a máquina de busca CLucne. Você pode ler mais em &lt;a href=&apos;%1&apos;&gt;página web da sintaxe lucene&lt;/a&gt; (em navegador externo).</translation>
     </message>
@@ -4639,19 +4837,19 @@ Language name ppk</extracomment>
         <translation>Imprimir...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="231"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="241"/>
         <source>Copying search result</source>
         <translation>Copiando resultado da busca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="250"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="259"/>
         <source>Saving search result</source>
         <translation>Salvando resultado de busca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="268"/>
         <source>Printing search result</source>
         <translation>Imprimindo resultado de busca</translation>
     </message>
@@ -4737,42 +4935,42 @@ Language name ppk</extracomment>
 <context>
     <name>Search::CSearchDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="130"/>
         <source>Missing indices</source>
         <translation>�ndices perdidos</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="87"/>
         <source>Search</source>
         <translation>Busca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="131"/>
         <source>The following modules need to be indexed before they can be searched in:</source>
         <translation>Os seguintes módulos precisam ser indexados antes de poderem ser feitas buscas neles:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="132"/>
         <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
         <translation>O processo de indexação pode levar um longo tempo. Clique &quot;Sim&quot; para indexar os módulos e inici a busca, ou &quot;Não&quot; para cancelar a busca.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="236"/>
         <source>Drag any verse reference onto an open Bible window</source>
         <translation>Arraste qualquer versículo ou referência para uma janela de Bíblia aberta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="241"/>
         <source>&amp;Analyze results...</source>
         <translation>&amp;Analisar resultados...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="242"/>
         <source>Show a graphical analysis of the search result</source>
         <translation>Mostrar um gráfico analisando o resultado da busca</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="248"/>
         <source>&amp;Close</source>
         <translation>Fe&amp;char</translation>
     </message>
@@ -4813,19 +5011,19 @@ Language name ppk</extracomment>
         <translation>Imprimir...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="164"/>
         <source>Printing search result</source>
         <translation>Imprimindo resultado da procura</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="192"/>
         <source>Saving search result</source>
         <translation>Salvando resultado da procura</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="210"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="228"/>
         <source>Copying search result</source>
         <translation>Copiando resultado da procura</translation>
     </message>
@@ -4838,91 +5036,6 @@ Language name ppk</extracomment>
 <context>
     <name>StandardWorksTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation>Obras padrão são usadas quando nenhuma obra é especificada, por exemplo, quando um link de uma Bíblia ou de um dicionário é clicado.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>Bíblia:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>A Bíblia Padrão é usada quando um hiperlink dentro da Bíblia é clicada</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>Comentário:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>O comentário padrão é usado quando um hiperlink de um comentário é clicado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation>Léxico:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>O léxico normal é usado quando um hiperlink em um léxico é clicado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>Devociona diário:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>O devocional padrão será usado para mostrar uma curta inicialização do devocional </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>Léxico hebraico Strong:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>O léxico hebraico padrão é usado quando um hiperlink em um léxico hebraico é clicado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>Léxico grego Strong:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>O léxico grego padrão é usado quando um hiperlink em um léxico grego é clicado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>Léxico hebraico morfológico:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>O léxico padrão morfológico dos textos hebraicos, é usado quando um hiperlink de um tag morfológico de um texto hebraico é clicado</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation>Léxico morfológico Grego:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>O léxico padrão morfológico dos textos gregos é usado quando um hiperlink de um tag morfológica de um texto grego é clicado</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="62"/>
         <source></source>
         <translation></translation>
@@ -4931,113 +5044,97 @@ Language name ppk</extracomment>
 <context>
     <name>TextFiltersTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation>Inserir quebra de linha após cada versículo</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation> Mostrar número dos versículos</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation>Mostrar seção de títulos</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation>Mostrar referências-cruzadas das escrituras</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation>Mostrar acentos gregos</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation>Mostrar pontos Hebrew da vogal</translation>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
+        <source></source>
+        <translation></translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallProgress</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation>Mostrar sinais da cantilena hebraica</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="81"/>
+        <source>Failed</source>
+        <translation type="unfinished">Falhou</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation>Mostrar a segmentação dos morfemas</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="84"/>
+        <source>Completed</source>
+        <translation type="unfinished">Completado</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation>Usar variações textuais</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="90"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">Cancelado</translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallSources</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation>Filtros de controle a aparência do texto. Aqui você pode especificar configurações padrão para todos os filtros. Você pode substituir essas configurações em cada janela de visualização.</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installsources.cpp" line="63"/>
+        <source>Failed to refresh source %1</source>
+        <translation type="unfinished">Falhou ao atualizar fonte %1</translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source></source>
-        <translation></translation>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="59"/>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="62"/>
+        <source>The text you want to search for</source>
+        <translation type="unfinished">O texto que você deseja pesquisar</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation>Buscar texto</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="135"/>
+        <source>New Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation></translation>
+        <location filename="../../src/mobile/qml/main.qml" line="136"/>
+        <source>View Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation>Busca sensível a maiúsculas e minúsculas</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="137"/>
+        <source>Text Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translatorcomment>Termo de uso generalizado no português brasileiro</translatorcomment>
-        <translation>Case &amp;sensitive</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="138"/>
+        <source>User Interface Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation>Procurar a localização anterior do texto</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="141"/>
+        <source>Bookshelf Manager</source>
+        <translation type="unfinished">Gerenciador de livros</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation>A&amp;nterior</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="187"/>
+        <source>Single</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation>Procurar a próxima localização do texto</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="188"/>
+        <source>Tabbed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation>Próxi&amp;mo</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="189"/>
+        <source>Auto-tile</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation>Fechar a caixa de diálogo</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="190"/>
+        <source>Auto-tile horizontally</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation>Fe&amp;char</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="191"/>
+        <source>Auto-tile vertically</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/messages/bibletime_ui_ro.ts b/i18n/messages/bibletime_ui_ro.ts
deleted file mode 100644
index 4f8475a..0000000
--- a/i18n/messages/bibletime_ui_ro.ts
+++ /dev/null
@@ -1,5288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
-<context>
-    <name></name>
-    <message>
-        <source></source>
-        <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
-This file is distributed under the same license as the Bibetime package.</translatorcomment>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>BTAboutModuleDialog</name>
-    <message>
-        <location filename="../../src/frontend/btaboutmoduledialog.cpp" line="45"/>
-        <source>Information About %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BibleTime</name>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
-        <source>&amp;File</source>
-        <translation>&amp;FiÅŸier</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
-        <source>&amp;View</source>
-        <translation>&amp;Interfaţă</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
-        <source>&amp;Search</source>
-        <translation>&amp;Caută</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
-        <source>&amp;Window</source>
-        <translation>&amp;Fereastră</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
-        <source>Se&amp;ttings</source>
-        <translation>Se&amp;tări</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
-        <source>&amp;Help</source>
-        <translation>A&amp;jutor</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
-        <source>&amp;Show toolbar</source>
-        <translation>&amp;Arată bara de unelte</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
-        <source>&amp;Fullscreen mode</source>
-        <translation>&amp;Mod ecran plin</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
-        <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
-        <source>Information about the BibleTime program</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation type="unfinished">&amp;Salvează sesiunea</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>&amp;Încarcă sesiunea</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
-        <source>&amp;Delete session</source>
-        <translation>&amp;Åžterge sesiune</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
-        <source>&amp;Arrangement mode</source>
-        <translation>Mod de &amp;vizualizare</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
-        <source>&amp;Manual mode</source>
-        <translation>Vizualizare &amp;manuală</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
-        <source>Auto-tile &amp;vertically</source>
-        <translation>Vizualizare &amp;verticală</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
-        <source>Auto-tile &amp;horizontally</source>
-        <translation>Vizualizare &amp;orizontală</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
-        <source>Auto-&amp;cascade</source>
-        <translation>Supr&amp;apune ferestrele automat</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
-        <source>&amp;Cascade</source>
-        <translation>&amp;Suprapune ferestrele</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
-        <source>Tile &amp;vertically</source>
-        <translation>Vizualizare &amp;verticală</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
-        <source>Tile &amp;horizontally</source>
-        <translation>Vizualizare &amp;orizontală</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
-        <source>Cl&amp;ose all windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
-        <source>Close all open windows inside BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
-        <source>&amp;Handbook</source>
-        <translation>&amp;Manual</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
-        <source>&amp;Bible Study Howto</source>
-        <translation>&amp;Cum să studiezi Biblia</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
-        <source>Please enter a name for the new session.</source>
-        <translation>Te rog să introduci un nume pentru noua sesiune</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
-        <source>Quit BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
-        <source>Toggle fullscreen mode of the main window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
-        <source>Search in &amp;open works...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
-        <source>Search in standard &amp;Bible...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
-        <source>Save as &amp;new session...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
-        <source>Create and save a new session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
-        <source>Manually arrange the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
-        <source>Automatically tile the open windows vertically (arrange side by side)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
-        <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
-        <source>Auto-&amp;tile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
-        <source>Automatically tile the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
-        <source>Ta&amp;bbed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
-        <source>Automatically tab the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
-        <source>Automatically cascade the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
-        <source>Cascade the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
-        <source>&amp;Tile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
-        <source>Tile the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
-        <source>Vertically tile (arrange side by side) the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
-        <source>Horizontally tile (arrange on top of each other) the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
-        <source>Close &amp;window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
-        <source>Close the current open window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
-        <source>&amp;Configure BibleTime...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
-        <source>Set BibleTime&apos;s preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
-        <source>Bookshelf &amp;Manager...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
-        <source>Configure your bookshelf and install/update/remove/index works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
-        <source>Open BibleTime&apos;s handbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
-        <source>&amp;Tip of the day...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
-        <source>Show tips about BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
-        <source>Toggle visibility of the bookshelf window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
-        <source>Toggle visibility of the bookmarks window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
-        <source>Toggle visibility of the mag window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
-        <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
-        <source>Navigation toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
-        <source>Works toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
-        <source>Tools toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
-        <source>Format toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
-        <source>Show main toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
-        <source>Show navigation bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
-        <source>Show works toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
-        <source>Show tools toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
-        <source>Show formatting toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
-        <source>Show bookshelf</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
-        <source>Show bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
-        <source>Show mag</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
-        <source>Toolbars</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
-        <source>Show toolbars in text windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
-        <source>Show parallel text headers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
-        <source>O&amp;pen windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
-        <source>Show &quot;Whats this widget&quot; dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
-        <source>Whats this widget?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
-        <source>Search in all works that are currently open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
-        <source>Search in the standard Bible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
-        <source>New Session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
-        <source>Initializing the SWORD engine...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
-        <source>Creating BibleTime&apos;s user interface...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
-        <source>Initializing menu- and toolbars...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
-        <source>Unlock Work</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
-        <source>Enter the unlock key for %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
-        <source>Warning: Invalid unlock key!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
-        <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
-        <source>&amp;About BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
-        <source>Bookmarks</source>
-        <translation type="unfinished">Semne de carte</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
-        <source>Mag</source>
-        <translation type="unfinished">MAG</translation>
-    </message>
-</context>
-<context>
-    <name>BibleTimeApp</name>
-    <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
-        <source>Fatal error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtAboutDialog</name>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
-        <source>BibleTime is an easy to use but powerful Bible study tool.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="271"/>
-        <source>BibleTime is released under the GPL license. You can download and use the program for personal, private, public or commercial purposes without restrictions, but can give away or distribute the program only if you also distribute the corresponding source code.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="277"/>
-        <source>The complete legally binding license is below.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
-        <source>About BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
-        <source>&amp;BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
-        <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
-        <source>&amp;Contributors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
-        <source>The following people contributed to BibleTime:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
-        <source>documentation and translation manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
-        <source>project manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
-        <source>tester</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
-        <source>usability expert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="220"/>
-        <source>Some names may be missing, please email %1 if you notice errors or omissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="237"/>
-        <source>BibleTime makes use of the SWORD Project. The SWORD Project is the CrossWire Bible Society&apos;s free Bible software project. Its purpose is to create cross-platform open-source tools &amp;mdash; covered by the GNU General Public License &amp;mdash; that allow programmers and Bible societies to write new Bible software more quickly and easily.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="243"/>
-        <source>The SWORD Project: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="251"/>
-        <source>&amp;Qt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="254"/>
-        <source>Qt toolkit version %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="260"/>
-        <source>More info...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="265"/>
-        <source>&amp;License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
-        <source>designer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
-        <source>developer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
-        <source>project founder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
-        <source>packager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
-        <source>creator of The Sword Project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
-        <source>domain sponsor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
-        <source>howto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
-        <source>artist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
-        <source>documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
-        <source>The following people translated BibleTime into their language:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="231"/>
-        <source>&amp;SWORD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="235"/>
-        <source>SWORD library version %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="256"/>
-        <source>This program uses Qt version %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="258"/>
-        <source>Qt is a cross-platform application and UI framework, created with C++ language. It has been released under the LGPL license.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtBibleKeyWidget</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="unfinished">Uită-te prin toate intrările din listă. Apasă butonul stâng al mouse-ului şi mişcă mouse-ul pentru a duce respectivul obiect în sus sau în jos.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
-        <source>Next book</source>
-        <translation type="unfinished">Cartea următoare</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
-        <source>Previous book</source>
-        <translation type="unfinished">Cartea anterioară</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
-        <source>Next chapter</source>
-        <translation type="unfinished">Capitolul următor</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
-        <source>Previous chapter</source>
-        <translation type="unfinished">Capitolul anterior</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
-        <source>Next verse</source>
-        <translation type="unfinished">Versetul următor</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
-        <source>Previous verse</source>
-        <translation type="unfinished">Versetul anterior</translation>
-    </message>
-</context>
-<context>
-    <name>BtBookDropdownChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="64"/>
-        <source>Select book</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfDockWidget</name>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="150"/>
-        <source>Bookshelf</source>
-        <translation type="unfinished">Raft de cărţi</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="152"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="153"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="154"/>
-        <source>&amp;Plain text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="155"/>
-        <source>&amp;HTML</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="156"/>
-        <source>&amp;Unlock...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="157"/>
-        <source>&amp;About...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="159"/>
-        <source>There are currently no works installed. Please click the button below to install new works.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="161"/>
-        <source>&amp;Install works...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="173"/>
-        <source>Warning: Module locked!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="174"/>
-        <source>You are trying to access an encrypted module. Please provide an unlock key in the following dialog to open the module.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="223"/>
-        <source>&amp;Search in %1...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfGroupingMenu</name>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
-        <source>Category/Language</source>
-        <translation type="unfinished">Categorie/Limbă</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
-        <source>Category</source>
-        <translation type="unfinished">Categorie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
-        <source>Language/Category</source>
-        <translation type="unfinished">Limbă/Categorie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
-        <source>Language</source>
-        <translation type="unfinished">Limbă</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
-        <source>No grouping</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfModel</name>
-    <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
-        <source>Module</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfWidget</name>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
-        <source>Fi&amp;lter:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
-        <source>Grouping</source>
-        <translation type="unfinished">Grupare</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
-        <source>Change the grouping of items in the bookshelf.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category/Language</source>
-        <translation type="obsolete">Categorie/Limbă</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Categorie</translation>
-    </message>
-    <message>
-        <source>Language/Category</source>
-        <translation type="obsolete">Limbă/Categorie</translation>
-    </message>
-    <message>
-        <source>Language</source>
-        <translation type="obsolete">Limbă</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
-        <source>Show/hide works</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtChapterDropdownChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
-        <source>Select chapter</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtDisplaySettingsButton</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
-        <source>Use linebreaks after each verse</source>
-        <translation type="unfinished">Afişează versetele pe rânduri noi</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">Arată numerele versetelor</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
-        <source>Show headings</source>
-        <translation type="unfinished">Arată titluri</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
-        <source>Highlight words of Jesus</source>
-        <translation type="unfinished">Colorează cuvintele lui Iisus</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Arată vocalizarea ebraică</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Arată semnele ebraice de intonaţie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">Arată accentele greceşti</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
-        <source>Use alternative textual variant</source>
-        <translation type="unfinished">Foloseşte variantă textuală alternativă</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">Arată trimiterile biblice</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
-        <source>Show footnotes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">Arată segmentarea morfologică</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
-        <source>Display settings</source>
-        <translation type="unfinished">Setări de afişare</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
-        <source>Display settings: No options available</source>
-        <translation type="unfinished">Setări afişare: Nu sunt opţiuni disponibile</translation>
-    </message>
-</context>
-<context>
-    <name>BtEditBookmarkDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
-        <source>Edit Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtFontChooserWidget</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
-        <source>Font name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="98"/>
-        <source>Font style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="99"/>
-        <source>Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtFontSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
-        <source>&amp;Language:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
-        <source>The font selection below will apply to all texts in this language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
-        <source>Use custom font</source>
-        <translation type="unfinished">FoloseÅŸte fonturi predefinite</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
-        <source>Optionally specify a custom font for each language:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
-        <source>Fonts</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtIndexPage</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
-        <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
-        <source>Automatically delete orphaned indexes when BibleTime starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
-        <source>Delete the selected indexes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
-        <source>Delete</source>
-        <translation type="unfinished">Åžterge</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
-        <source>Create new indexes for the selected works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
-        <source>Work</source>
-        <translation type="unfinished">Modul</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
-        <source>Index size</source>
-        <translation type="unfinished">Mărime index</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
-        <source>%1 KiB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
-        <source>0 KiB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
-        <source>Search Indexes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
-        <source>Indexed Works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
-        <source>Unindexed Works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KiB</source>
-        <translation type="obsolete">KiB</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
-        <source>Create...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallModuleChooserDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="64"/>
-        <source>Install/Update works?</source>
-        <translation type="unfinished">Vrei să instalezi/actualizezi modulele?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="67"/>
-        <source>Do you really want to install these works?</source>
-        <translation type="unfinished">Eşti sigur că vrei să instalezi aceste module?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="68"/>
-        <source>Only one version of a work can be installed at the same time. Select only one if there are items marked with red.</source>
-        <translation type="unfinished">Doar un singur modul poate fi instalat deodată. Selectează doar un singur modul dacă sunt altele marcate cu roşu!</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallModuleChooserDialogModel</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
-        <source>Work</source>
-        <translation type="unfinished">Modul</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
-        <source>Installation source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
-        <source>Version</source>
-        <translation type="unfinished">Versiune</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPage</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="263"/>
-        <source>Install/Update</source>
-        <translation>Instalează/Actualizează</translation>
-    </message>
-    <message>
-        <source>Install and update works. Add remote or local sources, refresh them, select the works to be installed/updated and click Install.&lt;br/&gt;&lt;b&gt;WARNING:&lt;/b&gt; If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="obsolete">Instalare şi Actualizare de module. Adaugă biblioteci (locale [de pe calculator] sau de pe Internet), reînnoieşte-le, selectează modulele pe care le doreşti să le instalezi sau să le reactualizezi şi după-aceea apasă pe butonul de instalare.&lt;br/&gt;&lt;b&gt;ATENŢIE: Dacă trăieşti într-o ţară unde creştinii sunt persecutaţi, nu folosi prin BibleTime vreo bibliotecă de pe Internet pentru a nu risca detectarea!&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="265"/>
-        <source>WARNING!!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="266"/>
-        <source>If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="269"/>
-        <source>Select installation &amp;source:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="270"/>
-        <source>&amp;Add...</source>
-        <translation type="unfinished">Adaugă...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="271"/>
-        <source>Add new source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="272"/>
-        <source>&amp;Delete...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="273"/>
-        <source>Delete this source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="275"/>
-        <source>Select &amp;works to install:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="277"/>
-        <source>Install &amp;folder:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="278"/>
-        <source>The folder where the new works will be installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="279"/>
-        <source>Configure folders where works are installed and found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="280"/>
-        <source>&amp;Install...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="254"/>
-        <source>Start installation of %1 works from %2 sources:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="258"/>
-        <source>Start installation:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="313"/>
-        <source>Warning</source>
-        <translation type="unfinished">Atenţie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="313"/>
-        <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
-        <source>Delete Source?</source>
-        <translation type="unfinished">Vrei să ştergi sursa?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
-        <source>Do you really want to delete this source?</source>
-        <translation type="unfinished">Eşti sigur că vrei să ştergi sursa?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="281"/>
-        <source>Install or update selected works</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPageModel</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
-        <source>Work</source>
-        <translation type="unfinished">Modul</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
-        <source>Version</source>
-        <translation type="unfinished">Versiune</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
-        <source>Description</source>
-        <translation type="unfinished">Descriere:</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPageWorksWidget</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp" line="68"/>
-        <source>Refresh the list of works from this source</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPathDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
-        <source>Bookshelf Folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
-        <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
-        <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
-        <source>Configure bookshelf folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
-        <source>Configuration file for the folders is: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
-        <source>Folders where new works can be installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
-        <source>Read-only folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
-        <source>Nonexistent folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
-        <source>&amp;Add...</source>
-        <translation type="unfinished">Adaugă...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
-        <source>Add new folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
-        <source>&amp;Edit...</source>
-        <translation type="unfinished">Editează...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
-        <source>Edit the selected folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
-        <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
-        <source>Remove the selected folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
-        <source>This default folder in your home directory can&apos;t be removed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
-        <source>Choose Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
-        <source>Use Folder?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
-        <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallProgressDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
-        <source>Work</source>
-        <translation>Modul</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
-        <source>Progress</source>
-        <translation>Progres</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>OpreÅŸte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
-        <source>Stop All</source>
-        <translation>OpreÅŸte-le pe toate</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
-        <source>Completed</source>
-        <translation>Gata!</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
-        <source>Waiting for turn...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
-        <source>Preparing install...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
-        <source>Install Progress</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
-        <source>Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtLanguageSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
-        <source>Language for names of Bible books:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
-        <source>Languages</source>
-        <translation type="unfinished">Limbi</translation>
-    </message>
-</context>
-<context>
-    <name>BtModuleChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="76"/>
-        <source>Select a work [%1]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="79"/>
-        <source>Select an additional work</source>
-        <translation type="unfinished">Selectează încă un modul</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="102"/>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="130"/>
-        <source>NONE</source>
-        <translation type="unfinished">NIMIC</translation>
-    </message>
-</context>
-<context>
-    <name>BtModuleIndexDialog</name>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="33"/>
-        <source>Preparing to index modules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="33"/>
-        <source>Cancel</source>
-        <translation type="unfinished">Anulează</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="37"/>
-        <source>Creating indices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="67"/>
-        <source>Creating index for work: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtModuleManagerDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
-        <source>Bookshelf Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtOpenWorkAction</name>
-    <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
-        <source>&amp;Open work</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtOpenWorkActionMenu</name>
-    <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
-        <source>&amp;Grouping order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
-        <source>Sets the grouping order for the items in this menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtRefreshProgressDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="15"/>
-        <source>Refreshing source %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="16"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="17"/>
-        <source>Connecting...</source>
-        <translation type="unfinished">Se conectează</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="47"/>
-        <source>Warning</source>
-        <translation type="unfinished">Atenţie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="48"/>
-        <source>Failed to refresh source %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtRemovePage</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
-        <source>Select &amp;works to uninstall:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
-        <source>&amp;Remove...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
-        <source>Start removal of %1 works:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
-        <source>Start removal:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
-        <source>You selected the following work(s): </source>
-        <translation type="unfinished">Ai selectat următoarele module:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
-        <source>Do you really want to remove them from your system?</source>
-        <translation type="unfinished">EÅŸti sigur ca vrei sa le ÅŸtergi din calculator?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
-        <source>Remove the selected works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
-        <source>Remove Works?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtRemovePageTreeModel</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp" line="52"/>
-        <source>Work</source>
-        <translation type="unfinished">Modul</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp" line="55"/>
-        <source>Install path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtSearchModuleChooserDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
-        <source>Works to Search in</source>
-        <translation type="unfinished">Module în care să se caute:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
-        <source>Select the works which should be searched.</source>
-        <translation type="unfinished">Selectează modulele în care să se caute:</translation>
-    </message>
-</context>
-<context>
-    <name>BtShortcutsDialog</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="26"/>
-        <source>Configure shortcuts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="35"/>
-        <source>Select first or second shortcut and type the shortcut with keyboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="37"/>
-        <source>First shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="42"/>
-        <source>Second shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtShortcutsEditor</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="180"/>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="187"/>
-        <source>Select to change key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
-        <source>Action
-name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
-        <source>First
-shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
-        <source>Second
-shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="253"/>
-        <source>Shortcut for selected action name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="259"/>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="264"/>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="269"/>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="284"/>
-        <source>Default key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceArea</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">Modul</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="obsolete">Descriere:</translation>
-    </message>
-    <message>
-        <source>&amp;Add...</source>
-        <translation type="obsolete">Adaugă...</translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceAreaModel</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">Modul</translation>
-    </message>
-    <message>
-        <source>Version</source>
-        <translation type="obsolete">Versiune</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="obsolete">Descriere:</translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceWidget</name>
-    <message>
-        <source>Delete Source?</source>
-        <translation type="obsolete">Vrei să ştergi sursa?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete this source?</source>
-        <translation type="obsolete">Eşti sigur că vrei să ştergi sursa?</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Anulează</translation>
-    </message>
-    <message>
-        <source>Refreshing source</source>
-        <translation type="obsolete">Reînnoire sursă</translation>
-    </message>
-    <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Se conectează</translation>
-    </message>
-    <message>
-        <source>Refreshing...</source>
-        <translation type="obsolete">Reînnoire</translation>
-    </message>
-    <message>
-        <source>Remote:</source>
-        <translation type="obsolete">De pe Internet:</translation>
-    </message>
-    <message>
-        <source>Local:</source>
-        <translation type="obsolete">Local:</translation>
-    </message>
-    <message>
-        <source>Not a directory!</source>
-        <translation type="obsolete">Nu este director!</translation>
-    </message>
-    <message>
-        <source>Not readable!</source>
-        <translation type="obsolete">Nu se poate citi!</translation>
-    </message>
-    <message>
-        <source>Warning</source>
-        <translation type="obsolete">Atenţie</translation>
-    </message>
-</context>
-<context>
-    <name>BtTextFiltersTab</name>
-    <message>
-        <source>Insert line break after each verse</source>
-        <translation type="obsolete">Afişează versetele pe rânduri noi</translation>
-    </message>
-    <message>
-        <source>Show verse numbers</source>
-        <translation type="obsolete">Arată numerele versetelor</translation>
-    </message>
-    <message>
-        <source>Show section headings</source>
-        <translation type="obsolete">Arată titlurile secţiilor</translation>
-    </message>
-    <message>
-        <source>Show scripture cross-references</source>
-        <translation type="obsolete">Arată trimiterile biblice</translation>
-    </message>
-    <message>
-        <source>Show Greek accents</source>
-        <translation type="obsolete">Arată accentele greceşti</translation>
-    </message>
-    <message>
-        <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">Arată vocalizarea ebraică</translation>
-    </message>
-    <message>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">Arată semnele ebraice de intonaţie</translation>
-    </message>
-    <message>
-        <source>Show morph segmentation</source>
-        <translation type="obsolete">Arată segmentarea morfologică</translation>
-    </message>
-    <message>
-        <source>Use textual variants</source>
-        <translation type="obsolete">FoloseÅŸte variantele textuale</translation>
-    </message>
-</context>
-<context>
-    <name>BtTextWindowHeaderWidget</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
-        <source>Add/remove/replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
-        <source>Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtTipDialog</name>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
-        <source>Tip Of The Day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
-        <source>Show tips at startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
-        <source>Next Tip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
-        <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
-        <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
-        <source>To learn more about the BibleTime project please go to our web site.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
-        <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
-        <source>Select the icon again to stop the synchronization.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
-        <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
-        <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
-        <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
-        <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
-        <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
-        <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
-        <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
-        <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
-        <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtVerseDropdownChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="106"/>
-        <source>Select verse</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CAcceleratorSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
-        <source>Choose action group:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
-        <source>Main Window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
-        <source>All text windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
-        <source>Bible windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
-        <source>Commentary windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
-        <source>Lexicon windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
-        <source>Book windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
-        <source>
-   &quot;%1&quot; in the &quot;%2&quot; group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
-        <source>Shortcuts</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CBibleReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
-        <source>Next book</source>
-        <translation>Cartea următoare</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
-        <source>Previous book</source>
-        <translation>Cartea anterioară</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
-        <source>Next chapter</source>
-        <translation>Capitolul următor</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
-        <source>Previous chapter</source>
-        <translation>Capitolul anterior</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
-        <source>Next verse</source>
-        <translation>Versetul următor</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
-        <source>Previous verse</source>
-        <translation>Versetul anterior</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
-        <source>Copy chapter</source>
-        <translation>Copiază capitolul</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
-        <source>Save chapter as plain text</source>
-        <translation>Salvează capitolul ca text</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
-        <source>Save chapter as HTML</source>
-        <translation>Salvează capitolul ca HTML</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
-        <source>Print chapter</source>
-        <translation>Tipăreşte capitolul</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
-        <source>Text of reference</source>
-        <translation>Textul referinţei</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
-        <source>Reference with text</source>
-        <translation>Referinţă cu text</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
-        <source>Bible window</source>
-        <translation>Fereastra Bibliei</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
-        <source>Copy...</source>
-        <translation>Copiază ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
-        <source>Save...</source>
-        <translation>Salvează...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
-        <source>Print...</source>
-        <translation>Tipăreşte...</translation>
-    </message>
-    <message>
-        <source>Copy chapter to clipboard ...</source>
-        <translation type="obsolete">Copiază capitolul în clipboard ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
-        <source>Copying</source>
-        <translation>Copiez</translation>
-    </message>
-    <message>
-        <source>Saving chapter ...</source>
-        <translation type="obsolete">Salvez capitol...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
-        <source>Saving</source>
-        <translation>Salvez</translation>
-    </message>
-</context>
-<context>
-    <name>CBookReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
-        <source>Toggle tree view</source>
-        <translation>Afişează arborele...</translation>
-    </message>
-</context>
-<context>
-    <name>CBookmarkIndex</name>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
-        <source>Bookmarks</source>
-        <translation>Semne de carte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
-        <source>New folder</source>
-        <translation>Director nou</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
-        <source>Rename folder</source>
-        <translation>RedenumeÅŸte directorul</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
-        <source>Delete Items</source>
-        <translation>Şterge referinţe</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
-        <source>Do you really want to delete the selected items and child-items?</source>
-        <translation>Eşti sigur că vrei să ştergi referinţele selectate?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
-        <source>The work to which the bookmark points to is not installed.</source>
-        <translation>Modulul unde semnul de carte se află nu este instalat.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
-        <source>Print bookmarks...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
-        <source>Remove selected items...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
-        <source>Import to folder...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
-        <source>Edit bookmark...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
-        <source>Sort folder bookmarks...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
-        <source>Sort all bookmarks...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
-        <source>Export from folder...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
-        <source>Can drop only bookmarks or one folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
-        <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
-        <source>Copy</source>
-        <translation type="unfinished">Copiază</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
-        <source>Move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
-        <source>Drag references from text views to this view</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CCommentaryReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
-        <source>Next book</source>
-        <translation>Cartea următoare</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
-        <source>Previous book</source>
-        <translation>Cartea anterioară</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
-        <source>Next chapter</source>
-        <translation>Capitolul următor</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
-        <source>Previous chapter</source>
-        <translation>Capitolul anterior</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
-        <source>Next verse</source>
-        <translation>Versetul următor</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
-        <source>Previous verse</source>
-        <translation>Versetul anterior</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
-        <source>Synchronize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
-        <source>Synchronize the displayed entry of this work with the active Bible window</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CConfigurationDialog</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
-        <source>Configure BibleTime</source>
-        <translation>Configurează BibleTime</translation>
-    </message>
-</context>
-<context>
-    <name>CDisplaySettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
-        <source>Display templates</source>
-        <translation>Afişează şabloanele</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
-        <source>Available display styles:</source>
-        <translation>Stiluri de afiÅŸare disponibile:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
-        <source>Style preview</source>
-        <translation>Previzualizare font </translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
-        <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
-        <translation>Fiindcă atât de mult a iubit Dumnezeu lumea, că a dat pe singurul Lui Fiu, pentru ca oricine crede în El, să nu piară, ci să aibă viaţa veşnică.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
-        <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
-        <translation>Dumnezeu, în adevăr, n-a trimis pe Fiul Său în lume ca să judece lumea, ci ca lumea să fie mântuită prin El.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
-        <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
-        <translation>Oricine crede în El, nu este judecat; dar cine nu crede, a fost deja judecat, pentru că nu a crezut în Numele singurului Fiu al lui Dumnezeu.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
-        <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
-        <translation>Căci oricine face răul, urăşte lumina, şi nu vine la lumină, ca să nu i se descopere faptele.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
-        <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
-        <translation>Dar cine lucrează după adevăr, vine la lumină, pentru ca să i se arate faptele, fiindcă sînt făcute în Dumnezeu.``</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
-        <source>Display templates define how text is displayed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
-        <source>Show the BibleTime logo on startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
-        <source>Show startup logo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
-        <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
-        <source>Display</source>
-        <translation type="unfinished">Afişează opţiunile</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="193"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>CDisplayWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
-        <source>Back in history</source>
-        <translation>Navighează înapoi</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
-        <source>Forward in history</source>
-        <translation>Navighează înainte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
-        <source>Select all</source>
-        <translation type="unfinished">Selectează tot.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
-        <source>Copy</source>
-        <translation type="unfinished">Copiază</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
-        <source>Find...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
-        <source>Change location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
-        <source>Search with works of this window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
-        <source>Work chooser buttons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
-        <source>Text area header</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
-        <source>Navigation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
-        <source>Tool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CHTMLWriteDisplay</name>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
-        <source>Bold</source>
-        <translation>IngroÅŸat</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
-        <source>Italic</source>
-        <translation>ÃŽnclinat</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
-        <source>Underline</source>
-        <translation>Subliniat</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
-        <source>Left</source>
-        <translation>Stânga</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
-        <source>Center</source>
-        <translation>Centru</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
-        <source>Right</source>
-        <translation>Dreapta</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
-        <source>Font color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
-        <source>Align left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
-        <source>Align right</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CHTMLWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
-        <source>Module not writable</source>
-        <translation>Modul neinscriptibil.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
-        <source>Module is not writable.</source>
-        <translation>Modulul nu este inscriptibil.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
-        <source>Either the module may not be edited, or you do not have write permission.</source>
-        <translation>Fie modulul nu este editat, fie nu ai permisiune de scriere.</translation>
-    </message>
-</context>
-<context>
-    <name>CInputDialog</name>
-    <message>
-        <source>Clear</source>
-        <translation type="obsolete">Åžterge</translation>
-    </message>
-</context>
-<context>
-    <name>CKeyReferenceWidget</name>
-    <message>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="obsolete">Uită-te prin toate intrările din listă. Apasă butonul stâng al mouse-ului şi mişcă mouse-ul pentru a duce respectivul obiect în sus sau în jos.</translation>
-    </message>
-    <message>
-        <source>Next book</source>
-        <translation type="obsolete">Cartea următoare</translation>
-    </message>
-    <message>
-        <source>Previous book</source>
-        <translation type="obsolete">Cartea anterioară</translation>
-    </message>
-    <message>
-        <source>Next chapter</source>
-        <translation type="obsolete">Capitolul următor</translation>
-    </message>
-    <message>
-        <source>Previous chapter</source>
-        <translation type="obsolete">Capitolul anterior</translation>
-    </message>
-    <message>
-        <source>Next verse</source>
-        <translation type="obsolete">Versetul următor</translation>
-    </message>
-    <message>
-        <source>Previous verse</source>
-        <translation type="obsolete">Versetul anterior</translation>
-    </message>
-</context>
-<context>
-    <name>CLanguageSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/clanguagesettings.cpp" line="297"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>CLexiconKeyChooser</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="unfinished">Uită-te prin toate intrările din listă. Apasă butonul stâng al mouse-ului şi mişcă mouse-ul pentru a duce respectivul obiect în sus sau în jos.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
-        <source>Entries of the current work</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
-        <source>Next entry</source>
-        <translation type="unfinished">Intrarea următoare</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
-        <source>Previous entry</source>
-        <translation type="unfinished">Intrarea anterioară</translation>
-    </message>
-</context>
-<context>
-    <name>CLexiconReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
-        <source>Next entry</source>
-        <translation>Intrarea următoare</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
-        <source>Previous entry</source>
-        <translation>Intrarea anterioară</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
-        <source>Copy reference only</source>
-        <translation>Copiază doar referinţa</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
-        <source>Save entry as HTML</source>
-        <translation>Salvează intrarea ca HTML</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
-        <source>Print reference only</source>
-        <translation>Tipăreşte doar referinţa</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
-        <source>Strong&apos;s Search</source>
-        <translation>Căutarea Strong</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
-        <source>Entry with text</source>
-        <translation>Intrare cu text</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
-        <source>Entry as plain text</source>
-        <translation>Intrare ca text</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
-        <source>Lexicon window</source>
-        <translation>Fereastra Lexiconului</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
-        <source>Copy...</source>
-        <translation>Copiază ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
-        <source>Save...</source>
-        <translation>Salvează...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
-        <source>Print...</source>
-        <translation>Tipăreşte...</translation>
-    </message>
-    <message>
-        <source>Saving entry ...</source>
-        <translation type="obsolete">Salvez intrarea ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
-        <source>Saving</source>
-        <translation>Salvez</translation>
-    </message>
-</context>
-<context>
-    <name>CModuleIndexDialog</name>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Anulează</translation>
-    </message>
-</context>
-<context>
-    <name>CPlainWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
-        <source>Sync with active Bible</source>
-        <translation>Sincronizează cu Biblia activă</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
-        <source>Save text</source>
-        <translation>Salvează textul</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
-        <source>Delete current entry</source>
-        <translation>Şterge intrarea curentă</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
-        <source>Restore original text</source>
-        <translation>Restaurează textul original</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
-        <source>Module not writable</source>
-        <translation>Modul neinscriptibil.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
-        <source>Module is not writable.</source>
-        <translation>Modulul nu este inscriptibil.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
-        <source>Either the module may not be edited, or you do not have write permission.</source>
-        <translation>Fie modulul nu este editat, fie nu ai permisiune de scriere.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
-        <source>Synchronize (show the same verse) with the active Bible window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
-        <source>Delete current entry (no undo)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
-        <source>Restore original text, new text will be lost</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CSearchAnalysisScene</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>Save Search Analysis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
-        <source>BibleTime Search Analysis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
-        <source>Book</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
-        <source>Total hits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
-        <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CSwordModuleInfo</name>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
-        <source>Version</source>
-        <translation>Versiune</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
-        <source>unknown</source>
-        <translation>necunoscut</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
-        <source>Markup</source>
-        <translation>Marcare</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
-        <source>Location</source>
-        <translation>Locaţie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
-        <source>Language</source>
-        <translation>Limbă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
-        <source>Category</source>
-        <translation>Categorie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
-        <source>LCSH</source>
-        <translation>LCSH</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
-        <source>Writable</source>
-        <translation>Inscriptibil</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
-        <source>yes</source>
-        <translation>da</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
-        <source>no</source>
-        <translation>nu</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
-        <source>Unlock key</source>
-        <translation>Cod de descuiere</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
-        <source>Features</source>
-        <translation>Opţiuni</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
-        <source>Take care, this work contains cult / questionable material!</source>
-        <translation>Atenţie, acest modul conţine material sectant / chestionabil!</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
-        <source>About</source>
-        <translation>Despre</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
-        <source>Distribution license</source>
-        <translation>Licenţa de distribuţie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
-        <source>Distribution source</source>
-        <translation>Sursă distribuţie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
-        <source>Distribution notes</source>
-        <translation>Note distribuţie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
-        <source>Text source</source>
-        <translation>Sursă text</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
-        <source>Copyright notes</source>
-        <translation>Note drept de autor</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
-        <source>Copyright holder</source>
-        <translation>Deţinător drept de autor</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
-        <source>Copyright date</source>
-        <translation>Data drept de autor</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
-        <source>Copyright contact name</source>
-        <translation>Nume contact drept de autor</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
-        <source>Copyright contact address</source>
-        <translation>Adresă contact drept de autor</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
-        <source>Copyright contact email</source>
-        <translation>Email contact drept de autor</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
-        <source>Bibles</source>
-        <translation type="unfinished">Biblii</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
-        <source>Commentaries</source>
-        <translation type="unfinished">Comentarii</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
-        <source>Books</source>
-        <translation type="unfinished">Cărţi</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
-        <source>Cults/Unorthodox</source>
-        <translation type="unfinished">Secte/Neortodoxe</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
-        <source>Maps and Images</source>
-        <translation type="unfinished">Hărţi şi Imagini</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
-        <source>Daily Devotionals</source>
-        <translation type="unfinished">Devoţionale zilnice</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
-        <source>Lexicons and Dictionaries</source>
-        <translation type="unfinished">Lexicoane şi Dicţionare</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
-        <source>Glossaries</source>
-        <translation type="unfinished">Glosare</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CSwordSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
-        <source>Standard works</source>
-        <translation>Module standard</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
-        <source>Text filters</source>
-        <translation>Filtre text</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
-        <source>Desk</source>
-        <translation type="unfinished">Birou</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="359"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>CSwordSetupInstallSourcesDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
-        <source>Caption</source>
-        <translation type="unfinished">Legendă</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
-        <source>Type</source>
-        <translation type="unfinished">Tip</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
-        <source>Server</source>
-        <translation type="unfinished">Server</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
-        <source>Path</source>
-        <translation type="unfinished">Cale</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
-        <source>Get list...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
-        <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
-
-Do you want to continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
-        <source>Get source list from remote server?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
-        <source>Cancel</source>
-        <translation type="unfinished">Anulează</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
-        <source>Downloading List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
-        <source>Connecting...</source>
-        <translation type="unfinished">Se conectează</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
-        <source>Refreshing...</source>
-        <translation type="unfinished">Reînnoire</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
-        <source>Error</source>
-        <translation type="unfinished">Eroare</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
-        <source>Download a list of sources from CrossWire server and add sources</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <source>Please provide a caption.</source>
-        <translation type="unfinished">Te rog să introduci o legendă</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
-        <source>A source with this caption already exists. Please provide a different caption.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <source>Please provide a server name.</source>
-        <translation type="unfinished">Te rog să introduci un nume pentru server.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <source>Please provide a valid, readable path.</source>
-        <translation type="unfinished">Te rog să precizezi o cale validă şi citeaţă.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
-        <source>Please provide a path.</source>
-        <translation type="unfinished">Te rog să precizezi o cale.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
-        <source>New  Installation Source</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>Să salvez textul înainte de închidere?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>Doreşti să salvezi textul schimbat?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InfoDisplay::CInfoDisplay</name>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
-        <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
-        <source>Abbreviation</source>
-        <translation>Abreviere</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
-        <source>Cross references</source>
-        <translation>Trimiteri</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
-        <source>Footnote</source>
-        <translation>Note de subsol</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
-        <source>Strongs</source>
-        <translation>Numere Strong</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
-        <source>Morphology</source>
-        <translation>Analiză morfologică</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
-        <source>Word lookup</source>
-        <translation>Căutare cuvinte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
-        <source>Copy</source>
-        <translation>Copiază</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
-        <source>Select all</source>
-        <translation type="unfinished">Selectează tot.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
-        <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
-        <translation>&lt;small&gt;Aceasta este zona MAG. Atunci când te duci cu mouse-ul deasupra unor link-uri sau alte obiecte ce conţin anumite date conţinutul acestora apare in această zonă. Pentru ca ceea ce este scris în MAG să rămână în zona respectivă, trebuie să te duci repede cu mouse-ul deasupra MAG-ului sau să ţii SHIFT apăsat.&lt;/small&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>QCoreApplication</name>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
-        <source>Indexing aborted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <source>An internal error occurred while building the index: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
-        <source>An internal error occurred while building the index.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
-        <source>Search aborted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
-        <source>An internal error occurred while executing your search.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="126"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="240"/>
-        <source>Commentaries</source>
-        <translation>Comentarii</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="127"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="246"/>
-        <source>Cults/Unorthodox</source>
-        <translation>Secte/Neortodoxe</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="128"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="245"/>
-        <source>Maps and Images</source>
-        <translation>Hărţi şi Imagini</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="129"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="244"/>
-        <source>Daily Devotionals</source>
-        <translation>Devoţionale zilnice</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="130"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="242"/>
-        <source>Lexicons and Dictionaries</source>
-        <translation>Lexicoane şi Dicţionare</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
-        <source>Bibles</source>
-        <translation>Biblii</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="132"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="243"/>
-        <source>Glossaries</source>
-        <translation>Glosare</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="133"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="241"/>
-        <source>Books</source>
-        <translation>Cărţi</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
-        <source>Added text</source>
-        <translation>Text adăugat</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
-        <source>Names of languages</source>
-        <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
-        <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
-        <source>Afrikaans</source>
-        <extracomment>Language name af</extracomment>
-        <translation>Afrikaans</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
-        <source>Amuzgo, Guerrero</source>
-        <extracomment>Language name amu</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
-        <source>English, Old (ca.450-1100)</source>
-        <extracomment>Language name ang</extracomment>
-        <translation>Engleză veche (~450-1100)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
-        <source>Arabic</source>
-        <extracomment>Language name ar</extracomment>
-        <translation>Arabă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
-        <source>Azerbaijani</source>
-        <extracomment>Language name az</extracomment>
-        <translation>Azerbaidjană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
-        <source>Azerbaijani, South</source>
-        <extracomment>Language name azb</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
-        <source>Belarusian</source>
-        <extracomment>Language name be</extracomment>
-        <translation>Belarusă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
-        <source>Bulgarian</source>
-        <extracomment>Language name bg</extracomment>
-        <translation>Bulgară</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
-        <source>Breton</source>
-        <extracomment>Language name br</extracomment>
-        <translation>Bretonă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
-        <source>Bosnian</source>
-        <extracomment>Language name bs</extracomment>
-        <translation>Bosniacă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
-        <source>Catalan</source>
-        <extracomment>Language name ca</extracomment>
-        <translation>Catalană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
-        <source>Chinantec, Comaltepec</source>
-        <extracomment>Language name cco</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
-        <source>Cebuano</source>
-        <extracomment>Language name ceb</extracomment>
-        <translation>Sebuană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
-        <source>Chamorro</source>
-        <extracomment>Language name ch</extracomment>
-        <translation>Chamorro</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
-        <source>Chontal, Highland Oaxaca</source>
-        <extracomment>Language name chd</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
-        <source>Chinantec, Quiotepec</source>
-        <extracomment>Language name chq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
-        <source>Chinantec, Ozumacu00edn</source>
-        <extracomment>Language name chz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
-        <source>Cakchiquel, Western</source>
-        <extracomment>Language name ckw</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
-        <source>Chinantec, Lalana</source>
-        <extracomment>Language name cnl</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
-        <source>Chinantec, Tepetotutla</source>
-        <extracomment>Language name cnt</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
-        <source>Coptic</source>
-        <extracomment>Language name cop</extracomment>
-        <translation>Coptică</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
-        <source>Czech</source>
-        <extracomment>Language name cs</extracomment>
-        <translation>Cehă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
-        <source>Chinantec, Sochiapan</source>
-        <extracomment>Language name cso</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
-        <source>Chol, Tila</source>
-        <extracomment>Language name cti</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
-        <source>Chatino, Western Highland</source>
-        <extracomment>Language name ctp</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
-        <source>Church Slavic</source>
-        <extracomment>Language name cu</extracomment>
-        <translation>Slavonă bisericească</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
-        <source>Welsh</source>
-        <extracomment>Language name cy</extracomment>
-        <translation>Galeză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
-        <source>Danish</source>
-        <extracomment>Language name da</extracomment>
-        <translation>Daneză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
-        <source>German</source>
-        <extracomment>Language name de</extracomment>
-        <translation>Germană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
-        <source>Duruma</source>
-        <extracomment>Language name dug</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
-        <source>Greek, Modern (1453-)</source>
-        <extracomment>Language name el</extracomment>
-        <translation>Greacă Modernă (1453-)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
-        <source>English</source>
-        <extracomment>Language name en</extracomment>
-        <translation>Engleză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
-        <source>American English</source>
-        <extracomment>Language name en_US</extracomment>
-        <translation>Engleză americană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
-        <source>English, Middle (1100-1500)</source>
-        <extracomment>Language name enm</extracomment>
-        <translation>Engleză Evul Mediu (1100-1500)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
-        <source>Esperanto</source>
-        <extracomment>Language name eo</extracomment>
-        <translation>Esperanto</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
-        <source>Spanish</source>
-        <extracomment>Language name es</extracomment>
-        <translation>Spaniolă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
-        <source>Estonian</source>
-        <extracomment>Language name et</extracomment>
-        <translation>Estoniană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
-        <source>Basque</source>
-        <extracomment>Language name eu</extracomment>
-        <translation>Bască</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
-        <source>Persian</source>
-        <extracomment>Language name fa</extracomment>
-        <translation>Persiană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
-        <source>Finnish</source>
-        <extracomment>Language name fi</extracomment>
-        <translation>Finlandeză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
-        <source>French</source>
-        <extracomment>Language name fr</extracomment>
-        <translation>Franceză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
-        <source>Frisian</source>
-        <extracomment>Language name fy</extracomment>
-        <translation>Frizonă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
-        <source>Irish</source>
-        <extracomment>Language name ga</extracomment>
-        <translation>Irlandeză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
-        <source>Gaelic (Scots)</source>
-        <extracomment>Language name gd</extracomment>
-        <translation>Galeză Scoţiană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
-        <source>Geez</source>
-        <extracomment>Language name gez</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
-        <source>Gothic</source>
-        <extracomment>Language name got</extracomment>
-        <translation>Gotică</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
-        <source>Manx</source>
-        <extracomment>Language name gv</extracomment>
-        <translation>Manx</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
-        <source>Greek, Ancient (to 1453)</source>
-        <extracomment>Language name grc</extracomment>
-        <translation>Greacă Veche (până la 1453)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
-        <source>Hebrew</source>
-        <extracomment>Language name he</extracomment>
-        <translation>Ebraică</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
-        <source>Hausa</source>
-        <extracomment>Language name hau</extracomment>
-        <translation>Hausa</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
-        <source>Hawaiian</source>
-        <extracomment>Language name haw</extracomment>
-        <translation>Hawaiană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
-        <source>Hindi</source>
-        <extracomment>Language name hi</extracomment>
-        <translation>Hidusă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
-        <source>Croatian</source>
-        <extracomment>Language name hr</extracomment>
-        <translation>Croată</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
-        <source>Hungarian</source>
-        <extracomment>Language name hu</extracomment>
-        <translation>Maghiară</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
-        <source>Huave, San Mateo Del Mar</source>
-        <extracomment>Language name huv</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
-        <source>Armenian</source>
-        <extracomment>Language name hy</extracomment>
-        <translation>Armeană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
-        <source>Indonesian</source>
-        <extracomment>Language name id</extracomment>
-        <translation>Indoneziană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
-        <source>Icelandic</source>
-        <extracomment>Language name is</extracomment>
-        <translation>Islandeză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
-        <source>Italian</source>
-        <extracomment>Language name it</extracomment>
-        <translation>Italiană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
-        <source>Itzu00e1</source>
-        <extracomment>Language name itz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
-        <source>Ixil, San Juan Cotzal</source>
-        <extracomment>Language name ixl</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
-        <source>Japanese</source>
-        <extracomment>Language name ja</extracomment>
-        <translation>Japoneză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
-        <source>Jacalteco, Eastern</source>
-        <extracomment>Language name jac</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
-        <source>Javanese, Caribbean</source>
-        <extracomment>Language name jvn</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
-        <source>Georgian</source>
-        <extracomment>Language name ka</extracomment>
-        <translation>Georgiană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
-        <source>Korean</source>
-        <extracomment>Language name ko</extracomment>
-        <translation>Coreană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
-        <source>Kurdish</source>
-        <extracomment>Language name ku</extracomment>
-        <translation>Kurdă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
-        <source>Kirghiz</source>
-        <extracomment>Language name ky</extracomment>
-        <translation>Kirghiză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
-        <source>Latin</source>
-        <extracomment>Language name la</extracomment>
-        <translation>Latină</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
-        <source>Lacandon</source>
-        <extracomment>Language name lac</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
-        <source>Lithuanian</source>
-        <extracomment>Language name lt</extracomment>
-        <translation>Lituană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
-        <source>Latvian</source>
-        <extracomment>Language name lv</extracomment>
-        <translation>Letonă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
-        <source>Malagasy</source>
-        <extracomment>Language name mg</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
-        <source>Maori</source>
-        <extracomment>Language name mi</extracomment>
-        <translation>Maoră</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
-        <source>Mixe, Isthmus</source>
-        <extracomment>Language name mir</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
-        <source>Mixtec, Coatzospan</source>
-        <extracomment>Language name miz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
-        <source>Macedonian</source>
-        <extracomment>Language name mk</extracomment>
-        <translation>Macedoneană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
-        <source>Mixtec, Silacayoapan</source>
-        <extracomment>Language name mks</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
-        <source>More</source>
-        <extracomment>Language name mos</extracomment>
-        <translation>Maoră</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
-        <source>Malay</source>
-        <extracomment>Language name ms</extracomment>
-        <translation>Malaeziană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
-        <source>Maltese</source>
-        <extracomment>Language name mt</extracomment>
-        <translation>Malteză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
-        <source>Low German; Low Saxon</source>
-        <extracomment>Language name nds</extracomment>
-        <translation>Germană, Saxonă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
-        <source>Nepali</source>
-        <extracomment>Language name ne</extracomment>
-        <translation>Nepaleză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
-        <source>Nahuatl, Guerrero</source>
-        <extracomment>Language name ngu</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
-        <source>Nahuatl, Northern Oaxaca</source>
-        <extracomment>Language name nhy</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
-        <source>Dutch</source>
-        <extracomment>Language name nl</extracomment>
-        <translation>Olandeză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
-        <source>Norwegian Nynorsk</source>
-        <extracomment>Language name nn</extracomment>
-        <translation>Norvegiană Nyorsk</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
-        <source>Norwegian</source>
-        <extracomment>Language name no</extracomment>
-        <translation>Norvegiană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
-        <source>Otomi, Queru00e9taro</source>
-        <extracomment>Language name otq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
-        <source>Papiamento</source>
-        <extracomment>Language name pap</extracomment>
-        <translation>Creolă Spaniolă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
-        <source>Polish</source>
-        <extracomment>Language name pl</extracomment>
-        <translation>Poloneză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
-        <source>Persian (Dari)</source>
-        <extracomment>Language name prs</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
-        <source>Portuguese</source>
-        <extracomment>Language name pt</extracomment>
-        <translation>Portugheză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
-        <source>Brasilian Portuguese</source>
-        <extracomment>Language name pt_BR</extracomment>
-        <translation>Portugheză braziliană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
-        <source>Quichu00e9, West Central</source>
-        <extracomment>Language name qut</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
-        <source>Romanian</source>
-        <extracomment>Language name ro</extracomment>
-        <translation>Română</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
-        <source>Russian</source>
-        <extracomment>Language name ru</extracomment>
-        <translation>Rusă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
-        <source>Scots</source>
-        <extracomment>Language name sco</extracomment>
-        <translation>Scoţiană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
-        <source>Slovak</source>
-        <extracomment>Language name sk</extracomment>
-        <translation>Slovacă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
-        <source>Slovenian</source>
-        <extracomment>Language name sl</extracomment>
-        <translation>Slovenă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
-        <source>Somali</source>
-        <extracomment>Language name so</extracomment>
-        <translation>Somaleză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
-        <source>Albanian</source>
-        <extracomment>Language name sq</extracomment>
-        <translation>Albaneză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
-        <source>Swedish</source>
-        <extracomment>Language name sv</extracomment>
-        <translation>Suedeză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
-        <source>Swahili</source>
-        <extracomment>Language name sw</extracomment>
-        <translation>Swahili</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
-        <source>Syriac</source>
-        <extracomment>Language name syr</extracomment>
-        <translation>Siriacă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
-        <source>Tamil</source>
-        <extracomment>Language name ta</extracomment>
-        <translation>Tamil</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
-        <source>Thai</source>
-        <extracomment>Language name th</extracomment>
-        <translation>Tailandeză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
-        <source>Tagalog</source>
-        <extracomment>Language name tl</extracomment>
-        <translation>Filipineză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
-        <source>Tswana</source>
-        <extracomment>Language name tn</extracomment>
-        <translation>Tswana</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
-        <source>Turkish</source>
-        <extracomment>Language name tr</extracomment>
-        <translation>Turcă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
-        <source>Tektiteko</source>
-        <extracomment>Language name ttc</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
-        <source>Tahitian</source>
-        <extracomment>Language name ty</extracomment>
-        <translation>Tahitiană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
-        <source>Tzotzil, Zinacantu00e1n</source>
-        <extracomment>Language name tzz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
-        <source>Ukrainian</source>
-        <extracomment>Language name uk</extracomment>
-        <translation>Ucraineană</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
-        <source>Orya</source>
-        <extracomment>Language name ury</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
-        <source>Uspanteco</source>
-        <extracomment>Language name usp</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
-        <source>Vietnamese</source>
-        <extracomment>Language name vi</extracomment>
-        <translation>Vietnameză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
-        <source>Xhosa</source>
-        <extracomment>Language name xh</extracomment>
-        <translation>Xhosa</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
-        <source>Bavarian</source>
-        <extracomment>Language name bar</extracomment>
-        <translation>Bavareză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
-        <source>Lombard</source>
-        <extracomment>Language name lmo</extracomment>
-        <translation>Lombardă</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
-        <source>Uma</source>
-        <extracomment>Language name ppk
-----------
-Language name ppk</extracomment>
-        <translation>Uma</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
-        <source>Sranan</source>
-        <extracomment>Language name srn</extracomment>
-        <translation>Sranan</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
-        <source>Yiddish</source>
-        <extracomment>Language name yi</extracomment>
-        <translation>Yiddish</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
-        <source>Zapotec, San Juan Guelavu00eda</source>
-        <extracomment>Language name zab</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
-        <source>Zapotec, Mitla</source>
-        <extracomment>Language name zaw</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
-        <source>Chinese</source>
-        <extracomment>Language name zh</extracomment>
-        <translation>Chineză</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
-        <source>Zapotec, Amatlu00e1n</source>
-        <extracomment>Language name zpo</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
-        <source>Zapotec, Zoogocho</source>
-        <extracomment>Language name zpq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
-        <source>Zapotec, Yalu00e1lag</source>
-        <extracomment>Language name zpu</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
-        <source>Zapotec, Chichicapan</source>
-        <extracomment>Language name zpv</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
-        <source>Zapotec, Southern Rincon</source>
-        <extracomment>Language name zsr</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
-        <source>Zapotec, Quioquitani-Quieru00ed</source>
-        <extracomment>Language name ztq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
-        <source>Zapotec, Yatee</source>
-        <extracomment>Language name zty</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
-        <source>Zulu</source>
-        <extracomment>Language name zu</extracomment>
-        <translation>Zulu</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
-        <source>Footnotes</source>
-        <translation>Note de subsol</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
-        <source>Strong&apos;s numbers</source>
-        <translation>Numere Strong</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
-        <source>Headings</source>
-        <translation>Titluri</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
-        <source>Morphological tags</source>
-        <translation>Etichete morfologice</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
-        <source>Lemmas</source>
-        <translation>Comentarii auxiliare</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
-        <source>Hebrew vowel points</source>
-        <translation>Vocalizare ebraică</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
-        <source>Hebrew cantillation marks</source>
-        <translation>Semne ebraice de intonaţie</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
-        <source>Greek accents</source>
-        <translation>Accente greceÅŸti</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
-        <source>Red letter words</source>
-        <translation>Cuvinte colorate în roşu</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
-        <source>Textual variants</source>
-        <translation>Variante textuale</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
-        <source>Scripture cross-references</source>
-        <translation>Trimiteri biblice</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
-        <source>Morph segmentation</source>
-        <translation>Segmentare morfologică</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation>Exportă</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
-        <source>Local</source>
-        <translation>Locală</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>De pe Internet</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Vechiul Testament</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Moise/Pentateuc/Tora</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>Istorice</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Profeţi</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>Noul Testament</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Evanghelii</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>Scrisori/Epistole</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Epistolele lui Pavel</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <source>HTML files</source>
-        <translation>FiÅŸiere HTML</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
-        <source>All files</source>
-        <translation>Toate fiÅŸierele</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
-        <source>Text files</source>
-        <translation>FiÅŸiere text</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
-        <source>Save file</source>
-        <translation>Salvează fişierul</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
-        <source>Save document ...</source>
-        <translation>Salvează documentul ...</translation>
-    </message>
-    <message>
-        <source>Print keys</source>
-        <translation type="obsolete">Taste de tipărire</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <source>BibleTime bookmark files</source>
-        <translation>BibleTime - FiÅŸierele semnelor de carte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
-        <source>unknown</source>
-        <translation>necunoscut</translation>
-    </message>
-    <message>
-        <source>Change description ...</source>
-        <translation type="obsolete">Schimbă descrierea ...</translation>
-    </message>
-    <message>
-        <source>Enter a new description for the chosen bookmark.</source>
-        <translation type="obsolete">Adaugă o nouă descriere pentru semnul de carte ales.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
-        <source>New folder</source>
-        <translation>Director nou</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
-        <source>The file already exists.</source>
-        <translation>Fişierul există deja.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
-        <source>Do you want to overwrite it?</source>
-        <translation>Vrei să-l suprascri?</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
-        <source>Error</source>
-        <translation>Eroare</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>FiÅŸierul nu a putut fi salvat.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
-        <source>Please check permissions etc.</source>
-        <translation>Te rog verifică permisiunile etc.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
-        <source>Take care, this work contains cult / questionable material!</source>
-        <translation>Atenţie, acest modul conţine material sectant / chestionabil!</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
-        <source>Version</source>
-        <translation>Versiune</translation>
-    </message>
-    <message>
-        <source>Settings Migration</source>
-        <translation type="obsolete">\&quot;Migrarea\&quot; setărilor </translation>
-    </message>
-    <message>
-        <source>It appears you have a BibleTime configuration from KDE 3 stored in %1, and you have not migrated it to this version.  Would you like to import it?</source>
-        <translation type="obsolete">Se pare că ai deja o configurare de KDE 3 pentru BibleTime. Ea se află în %1, însă nu este folosită pentru această versiune. Vrei să o imporţi?</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
-        <source>Encrypted - needs unlock key</source>
-        <translation>Codată - este nevoie de o cheie pentru a o putea folosi</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
-        <source>Double click for more information</source>
-        <translation>Dublu-clic pentru mai multe informaţii</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
-        <source>Updated version available!</source>
-        <translation>O versiune nouă este disponibilă!</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
-        <source>Installed version</source>
-        <translation>Versiune instalată</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
-        <source>Haitian Creole</source>
-        <extracomment>Language name ht</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
-        <source>Kekchu00ed</source>
-        <comment>kek</comment>
-        <extracomment>Language name kek</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
-        <source>(Multiple languages)</source>
-        <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
-        <source>Mam, Central</source>
-        <extracomment>Language name mvc</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
-        <source>Mam, Todos Santos Cuchumatu00e1n</source>
-        <extracomment>Language name mvj</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
-        <source>Mixe, Juquila</source>
-        <extracomment>Language name mxq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
-        <source>Mixtec, Jamiltepec</source>
-        <extracomment>Language name mxt</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
-        <source>Burmese</source>
-        <extracomment>Language name my</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
-        <source>Norwegian Bokmu00e5l</source>
-        <extracomment>Language name nb</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
-        <source>Nahuatl, Michoacu00e1n</source>
-        <extracomment>Language name ncl</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
-        <source>Potawatomi</source>
-        <extracomment>Language name pot</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
-        <source>Klingon</source>
-        <extracomment>Language name tlh</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
-        <source>Mixtec, Diuxi-Tilantongo</source>
-        <extracomment>Language name xtd</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
-        <source>Yoryba</source>
-        <extracomment>Language name yo</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
-        <source>Verb tense changed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
-        <source>Can&apos;t write file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
-        <source>The Sword config file can&apos;t be written!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
-        <source>Export Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
-        <source>Import bookmarks</source>
-        <translation type="unfinished">Importă semne de carte</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
-        <source>Overwrite File?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
-        <source>Parsing Strong&apos;s Numbers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
-        <source>This shortcut conflicts with the shortcut for the following actions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
-        <source>Do you want to clear the conflicting shortcuts and continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
-        <source>Indexed works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
-        <source>Unindexed works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="44"/>
-        <source>Show this help message and exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="47"/>
-        <source>Output BibleTime version and exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="50"/>
-        <source>Open a clean session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="53"/>
-        <source>Open the default Bible with the reference &lt;ref&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="56"/>
-        <source>For command-line arguments parsed by the Qt toolkit, see %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="103"/>
-        <source>Error: %1 expects an argument.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="106"/>
-        <source>See --help for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="111"/>
-        <source>Error: Invalid command-line argument: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
-        <source>CSS base template not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
-        <source>Default template &quot;%1&quot; not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
-        <source>Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPushButton</name>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
-        <source>OK</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
-        <source>Open</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
-        <source>Save</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
-        <source>Cancel</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished">Anulează</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
-        <source>Close</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
-        <source>Discard</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished">Aruncă</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
-        <source>Apply</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
-        <source>Reset</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
-        <source>Restore defaults</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
-        <source>Help</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
-        <source>Save All</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
-        <source>Yes</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
-        <source>Yes to all</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
-        <source>No</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
-        <source>No to all</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::BtSearchOptionsArea</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
-        <source>Search for:</source>
-        <translation type="unfinished">Caută:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
-        <source>&amp;Search</source>
-        <translation type="unfinished">&amp;Caută</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
-        <source>Start to search the text in the chosen works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
-        <source>Ch&amp;oose...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
-        <source>Choose works for the search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
-        <source>S&amp;etup...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
-        <source>All of the words (AND is added between the words)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
-        <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
-        <source>Scope:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
-        <source>The text you want to search for</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
-        <source>Works:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
-        <source>No search scope</source>
-        <translation type="unfinished">Nici un domeniu de căutare</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
-        <source>All words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
-        <source>Configure predefined scopes for search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
-        <source>Some words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
-        <source>Free</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
-        <source>Some of the words (OR is added between the words)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
-        <source>Full lucene syntax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
-        <source>Click the link to get help for search syntax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
-        <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::BtSearchResultArea</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
-        <source>Text of the selected search result item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
-        <source>Select all</source>
-        <translation type="unfinished">Selectează tot.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
-        <source>Copy</source>
-        <translation type="unfinished">Copiază</translation>
-    </message>
-</context>
-<context>
-    <name>Search::BtSearchSyntaxHelpDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
-        <source>Search Syntax Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
-        <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
-        <source>Which words to find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
-        <source>Grouping and order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
-        <source>Wildcards (partial words)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
-        <source>Text fields (different parts of text)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
-        <source>Other syntax features</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
-        <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
-        <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
-        <source>jesus AND god</source>
-        <comment>Do not translate &quot;AND&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
-        <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
-        <source>jesus OR god</source>
-        <comment>Do not translate &quot;OR&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
-        <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
-        <source>jesus NOT god</source>
-        <comment>Do not translate &quot;NOT&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
-        <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
-        <source>+jesus -god</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
-        <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
-        <source>(a AND b) OR c</source>
-        <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
-        <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
-        <source>&quot;says lord&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
-        <source>&quot;says the lord&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
-        <source>Finds all verses with &apos;says the LORD&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
-        <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
-        <source>a*</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
-        <source>All words beginning with &apos;a&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
-        <source>a*a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
-        <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
-        <source>a?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
-        <source>&apos;at&apos; and &apos;an&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
-        <source>a??a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
-        <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
-        <source>Available text fields:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
-        <source>Searches headings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
-        <source>Searches footnotes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
-        <source>Searches Strong&apos;s numbers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
-        <source>Searches morphology codes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
-        <source>Examples:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
-        <source>heading:Jesus</source>
-        <comment>Do not translate &quot;heading:&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
-        <source>Finds headings with &apos;Jesus&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
-        <source>footnote:Jesus AND footnote:said</source>
-        <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
-        <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
-        <source>strong:G846</source>
-        <comment>Do not translate &quot;strong:&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
-        <source>Finds verses with Strong&apos;s Greek number 846</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
-        <source>morph:&quot;N-NSF&quot;</source>
-        <comment>Do not translate &quot;morph:&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
-        <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
-        <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::CModuleResultView</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="50"/>
-        <source>Work</source>
-        <translation>Modul</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="50"/>
-        <source>Hits</source>
-        <translation>Hits</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="64"/>
-        <source>Copy...</source>
-        <translation>Copiază ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="66"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="76"/>
-        <source>Reference only</source>
-        <translation>Doar referinţele</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="69"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="79"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="86"/>
-        <source>Reference with text</source>
-        <translation>Referinţă cu text</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="74"/>
-        <source>Save...</source>
-        <translation>Salvează...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="84"/>
-        <source>Print...</source>
-        <translation>Tipăreşte...</translation>
-    </message>
-    <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Copiază rezultatele căutării...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
-        <source>Copying search result</source>
-        <translation>Copiez rezultatele căutării</translation>
-    </message>
-    <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Salvează rezultatele căutării...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
-        <source>Saving search result</source>
-        <translation>Salvez rezultatele căutării</translation>
-    </message>
-    <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Tipăreşte rezultatele căutării...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
-        <source>Printing search result</source>
-        <translation>Tipăresc rezultatele căutarii</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="49"/>
-        <source>Works chosen for the search and the number of the hits in each work</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::CRangeChooserDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="136"/>
-        <source>S&amp;earch range:</source>
-        <translation>Locuri de căutar&amp;e:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="137"/>
-        <source>Select a scope from the list to edit the searchranges</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="148"/>
-        <source>&amp;Name:</source>
-        <translation>&amp;Nume:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="151"/>
-        <source>Edi&amp;t current range:</source>
-        <translation>Edi&amp;tează raza de acţiune a căutarii actuale</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="152"/>
-        <source>Change the search ranges of the selected searchscope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="157"/>
-        <source>Parsed search range:</source>
-        <translation>Raza de căutare analizată:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="171"/>
-        <source>New range</source>
-        <translation>Loc nou de căutare</translation>
-    </message>
-    <message>
-        <source>&lt;invalid name of search range&gt;</source>
-        <translation type="obsolete">&lt;rază de căutare invalidă&gt;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="140"/>
-        <source>&amp;Add new scope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="141"/>
-        <source>Add a new search scope. First enter an appropriate name, then edit the search ranges.</source>
-        <translation type="unfinished">Adaugă un nou domeniu de căutare. Mai întâi introdu un nume potrivit, apoi editează razele de căutare.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="145"/>
-        <source>Delete current &amp;scope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="146"/>
-        <source>Delete the selected search scope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="149"/>
-        <source>Change the name of the selected search scope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="obsolete">Schimbă razele de acţiune ale domeniilor de căutare selectate. Aruncă o privire asupra domeniilor de căutare predefinite pentru a vedea cum sunt construite aceste raze de acţiune.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="158"/>
-        <source>The search ranges which will be used for the search, parsed to the canonical form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="134"/>
-        <source>Setup Search Scopes</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::CSearchDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
-        <source>Missing indices</source>
-        <translation>Indici lipsa</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
-        <source>Search</source>
-        <translation>Caută</translation>
-    </message>
-    <message>
-        <source>One or more works need indexing before they can be searched.
-This could take a long time. Proceed with indexing?</source>
-        <translation type="obsolete">Unul sau mai multe module trebuie să fie indexate înainte de a putea fi căutate. Acest proces poate dura ceva timp. Doriţi începerea indexării?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
-        <source>The following modules need to be indexed before they can be searched in:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
-        <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
-        <source>Drag any verse reference onto an open Bible window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
-        <source>&amp;Analyze results...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
-        <source>Show a graphical analysis of the search result</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::CSearchResultView</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="39"/>
-        <source>Results</source>
-        <translation>Rezultate</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="47"/>
-        <source>Copy...</source>
-        <translation>Copiază ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="50"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="64"/>
-        <source>Reference only</source>
-        <translation>Doar referinţele</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="54"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="68"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="76"/>
-        <source>Reference with text</source>
-        <translation>Referinţă cu text</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="61"/>
-        <source>Save...</source>
-        <translation>Salvează...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="73"/>
-        <source>Print...</source>
-        <translation>Tipăreşte...</translation>
-    </message>
-    <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Tipăreşte rezultatele căutării...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
-        <source>Printing search result</source>
-        <translation>Tipăresc rezultatele căutarii</translation>
-    </message>
-    <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Salvează rezultatele căutării...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
-        <source>Saving search result</source>
-        <translation>Salvez rezultatele căutării</translation>
-    </message>
-    <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Copiază rezultatele căutării...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
-        <source>Copying search result</source>
-        <translation>Copiez rezultatele căutării</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="38"/>
-        <source>Search result of the selected work</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StandardWorksTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="62"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>TextFiltersTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation type="unfinished">Afişează versetele pe rânduri noi</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">Arată numerele versetelor</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation type="unfinished">Arată titlurile secţiilor</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">Arată trimiterile biblice</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">Arată accentele greceşti</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Arată vocalizarea ebraică</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Arată semnele ebraice de intonaţie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">Arată segmentarea morfologică</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation type="unfinished">FoloseÅŸte variantele textuale</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>findTextDialog</name>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/messages/bibletime_ui_ru.ts b/i18n/messages/bibletime_ui_ru.ts
index cacaa99..55f6100 100644
--- a/i18n/messages/bibletime_ui_ru.ts
+++ b/i18n/messages/bibletime_ui_ru.ts
@@ -6,7 +6,7 @@
     <message>
         <source></source>
         <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
 This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
@@ -22,452 +22,457 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTime</name>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
+        <location filename="../../src/bibletime_init.cpp" line="741"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&amp;Search</source>
         <translation>&amp;Пои�к</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&amp;Window</source>
         <translation>&amp;Окно</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&amp;ttings</source>
         <translation>&amp;У�тановки</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощь</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&amp;Show toolbar</source>
         <translation>&amp;Показать панель</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&amp;Fullscreen mode</source>
         <translation>&amp;Полно�кранный режим</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&amp;Quit</source>
         <translation>&amp;Выход</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
+        <location filename="../../src/bibletime_init.cpp" line="251"/>
         <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
         <translation>Открыть по�обие по изучению Библии.&lt;br/&gt;Это по�обие поможет изучать Библию лучше.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
+        <location filename="../../src/bibletime_init.cpp" line="256"/>
         <source>Information about the BibleTime program</source>
         <translation>Информаци� о программе BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation>Сохранить &amp;�е��ию</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>&amp;Загрузить �е��ию</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&amp;Delete session</source>
         <translation>&amp;Удалить �е��ию</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&amp;Arrangement mode</source>
         <translation>&amp;Режим ра�положени�</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&amp;Manual mode</source>
         <translation>Вручну&amp;ю</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &amp;vertically</source>
         <translation>�вто по &amp;вертикали</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &amp;horizontally</source>
         <translation>�вто по &amp;горизонтали</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&amp;cascade</source>
         <translation>�вто &amp;ка�кад</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&amp;Cascade</source>
         <translation>&amp;Ка�кад</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &amp;vertically</source>
         <translation>По &amp;вертикали</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &amp;horizontally</source>
         <translation>По &amp;горизонтали</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&amp;ose all windows</source>
         <translation>Зак&amp;рыть в�е окна</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
+        <location filename="../../src/bibletime_init.cpp" line="224"/>
         <source>Close all open windows inside BibleTime</source>
         <translation>Закрыть в�е открытые окна внутри BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
+        <location filename="../../src/bibletime_init.cpp" line="241"/>
         <source>&amp;Handbook</source>
         <translation>&amp;Руковод�тво</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&amp;Bible Study Howto</source>
         <translation>&amp;Как изучать Библию</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
+        <location filename="../../src/bibletime_slots.cpp" line="533"/>
         <source>Please enter a name for the new session.</source>
         <translation>Пожалуй�та, введите название дл� новой �е��ии.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
+        <location filename="../../src/bibletime_slots.cpp" line="541"/>
+        <source>Session already exists</source>
+        <translation>Се��и� уже �уще�твует</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_slots.cpp" line="542"/>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation>Се��и� � именем &quot;%1&quot; уже �уще�твует. Дайте другое им�.</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="107"/>
         <source>Quit BibleTime</source>
         <translation>Выйти из BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
+        <location filename="../../src/bibletime_init.cpp" line="114"/>
         <source>Toggle fullscreen mode of the main window</source>
         <translation>Переключить полно�кранный режим главного окна</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
+        <location filename="../../src/bibletime_init.cpp" line="123"/>
         <source>Search in &amp;open works...</source>
         <translation>И�кать в &amp;открытых книгах...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &amp;Bible...</source>
         <translation>И�кать в �тандартной &amp;Библии...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &amp;new session...</source>
         <translation>Сохранить как &amp;новую �е��ию...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
+        <location filename="../../src/bibletime_init.cpp" line="140"/>
         <source>Create and save a new session</source>
         <translation>Создать и �охранить новую �е��ию</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
+        <location filename="../../src/bibletime_init.cpp" line="147"/>
         <source>Manually arrange the open windows</source>
         <translation>Выровн�ть открытые окна вручную</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
+        <location filename="../../src/bibletime_init.cpp" line="154"/>
         <source>Automatically tile the open windows vertically (arrange side by side)</source>
         <translation>�втоматиче�ки выровн�ть открытые окна плиткой по вертикали</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
+        <location filename="../../src/bibletime_init.cpp" line="161"/>
         <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
         <translation>�втоматиче�ки выровн�ть открытые окна плиткой по горизонтали</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
+        <location filename="../../src/bibletime_init.cpp" line="165"/>
         <source>Auto-&amp;tile</source>
         <translation>�вто &amp;плиткой</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
+        <location filename="../../src/bibletime_init.cpp" line="168"/>
         <source>Automatically tile the open windows</source>
         <translation>�втоматиче�ки выравнивать плиткой открытые окна</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
+        <location filename="../../src/bibletime_init.cpp" line="172"/>
         <source>Ta&amp;bbed</source>
         <translation>Вкла&amp;дками</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
+        <location filename="../../src/bibletime_init.cpp" line="175"/>
         <source>Automatically tab the open windows</source>
         <translation>�втоматиче�ки ра�полагать открытые окна вкладками</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
+        <location filename="../../src/bibletime_init.cpp" line="182"/>
         <source>Automatically cascade the open windows</source>
         <translation>�втоматиче�ки ра�полагать открытые окна ка�кадом</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
+        <location filename="../../src/bibletime_init.cpp" line="189"/>
         <source>Cascade the open windows</source>
         <translation>Ра�положить открытые окна ка�кадом</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
+        <location filename="../../src/bibletime_init.cpp" line="193"/>
         <source>&amp;Tile</source>
         <translation>&amp;Плитка</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
+        <location filename="../../src/bibletime_init.cpp" line="196"/>
         <source>Tile the open windows</source>
         <translation>Ра�положить открытые окна плиткой</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
+        <location filename="../../src/bibletime_init.cpp" line="203"/>
         <source>Vertically tile (arrange side by side) the open windows</source>
         <translation>Ра�полагать открытые окна плиткой по вертикали</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
+        <location filename="../../src/bibletime_init.cpp" line="210"/>
         <source>Horizontally tile (arrange on top of each other) the open windows</source>
         <translation>Ра�полагать открытые окна плиткой по горизонтали</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
+        <location filename="../../src/bibletime_init.cpp" line="214"/>
         <source>Close &amp;window</source>
         <translation>Закрыть &amp;окно</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
+        <location filename="../../src/bibletime_init.cpp" line="217"/>
         <source>Close the current open window</source>
         <translation>Закрыть текущее открытое окно</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
+        <location filename="../../src/bibletime_init.cpp" line="228"/>
         <source>&amp;Configure BibleTime...</source>
         <translation>&amp;�а�троить BibleTime...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime&apos;s preferences</source>
         <translation>Задать предпочтени� BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
+        <location filename="../../src/bibletime_init.cpp" line="234"/>
         <source>Bookshelf &amp;Manager...</source>
         <translation>Менеджер &amp;Библиотеки...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
+        <location filename="../../src/bibletime_init.cpp" line="237"/>
         <source>Configure your bookshelf and install/update/remove/index works</source>
         <translation>�а�троить библиотеку и у�тановить/обновить/удалить/индек�ировать книги</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
+        <location filename="../../src/bibletime_init.cpp" line="244"/>
         <source>Open BibleTime&apos;s handbook</source>
         <translation>Открыть руковод�тво по BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&amp;Tip of the day...</source>
         <translation>&amp;Совет дн�...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
+        <location filename="../../src/bibletime_init.cpp" line="263"/>
         <source>Show tips about BibleTime</source>
         <translation>Показывать �оветы о BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
+        <location filename="../../src/bibletime_init.cpp" line="402"/>
         <source>Toggle visibility of the bookshelf window</source>
         <translation>Переключить отображение окна библиотеки</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
+        <location filename="../../src/bibletime_init.cpp" line="406"/>
         <source>Toggle visibility of the bookmarks window</source>
         <translation>Переключить отображение окна закладок</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
+        <location filename="../../src/bibletime_init.cpp" line="410"/>
         <source>Toggle visibility of the mag window</source>
         <translation>Переключить отображение окна лупы</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
+        <location filename="../../src/bibletime_init.cpp" line="735"/>
         <source>Main toolbar</source>
         <translation>Главна� панель</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
+        <location filename="../../src/bibletime_init.cpp" line="736"/>
         <source>Navigation toolbar</source>
         <translation>�авигационна� панель</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
+        <location filename="../../src/bibletime_init.cpp" line="737"/>
         <source>Works toolbar</source>
         <translation>Панель книг</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
+        <location filename="../../src/bibletime_init.cpp" line="738"/>
         <source>Tools toolbar</source>
         <translation>Панель ин�трументов</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
+        <location filename="../../src/bibletime_init.cpp" line="739"/>
         <source>Format toolbar</source>
         <translation>Панель форматировани�</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
+        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <source>Sw&amp;itch session</source>
+        <translation>П&amp;ереключить �е��ию</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="777"/>
         <source>Show main toolbar</source>
         <translation>Показывать главную панель</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
+        <location filename="../../src/bibletime_init.cpp" line="780"/>
         <source>Show navigation bar</source>
         <translation>Показывать навигационную панель</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
+        <location filename="../../src/bibletime_init.cpp" line="783"/>
         <source>Show works toolbar</source>
         <translation>Показывать панель книг</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
+        <location filename="../../src/bibletime_init.cpp" line="786"/>
         <source>Show tools toolbar</source>
         <translation>Показывать панель ин�трументов</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
+        <location filename="../../src/bibletime_init.cpp" line="789"/>
         <source>Show formatting toolbar</source>
         <translation>Показывать панель форматировани�</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
+        <location filename="../../src/bibletime_init.cpp" line="792"/>
         <source>Show bookshelf</source>
         <translation>Показывать библиотеку</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
+        <location filename="../../src/bibletime_init.cpp" line="795"/>
         <source>Show bookmarks</source>
         <translation>Показывать закладки</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
+        <location filename="../../src/bibletime_init.cpp" line="798"/>
         <source>Show mag</source>
         <translation>Показывать лупу</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
+        <location filename="../../src/bibletime_init.cpp" line="743"/>
         <source>Toolbars</source>
         <translation>Панели</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <location filename="../../src/bibletime_init.cpp" line="774"/>
         <source>Show toolbars in text windows</source>
         <translation>Показывать панели в тек�товых окнах</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
+        <location filename="../../src/bibletime_init.cpp" line="801"/>
         <source>Show parallel text headers</source>
         <translation>Показывать заголовки при параллельном про�мотре</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
+        <location filename="../../src/bibletime_init.cpp" line="747"/>
         <source>O&amp;pen windows</source>
         <translation>О&amp;ткрытые окна</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show &quot;Whats this widget&quot; dialog</source>
         <translation>Показывать окно &quot;Что �то за виджет&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
+        <location filename="../../src/bibletime_init.cpp" line="954"/>
         <source>Whats this widget?</source>
         <translation>Что �то за виджет?</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
+        <location filename="../../src/bibletime_init.cpp" line="126"/>
         <source>Search in all works that are currently open</source>
         <translation>И�кать во в�ех открытых на данный момент книгах</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
+        <location filename="../../src/bibletime_init.cpp" line="133"/>
         <source>Search in the standard Bible</source>
         <translation>И�кать в �тандартной Библии</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
+        <location filename="../../src/bibletime_slots.cpp" line="532"/>
         <source>New Session</source>
         <translation>�ова� Се��и�</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
+        <location filename="../../src/bibletime.cpp" line="77"/>
         <source>Initializing the SWORD engine...</source>
         <translation>Инициализаци� движка SWORD...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
+        <location filename="../../src/bibletime.cpp" line="85"/>
         <source>Creating BibleTime&apos;s user interface...</source>
         <translation>Создание пользователь�кого интерфей�а&lt;br/&gt;BibleTime...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
+        <location filename="../../src/bibletime.cpp" line="92"/>
         <source>Initializing menu- and toolbars...</source>
         <translation>Создание меню и панелей...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Unlock Work</source>
         <translation>Разблокировать Книгу</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Enter the unlock key for %1.</source>
         <translation>Введите ключ разблокировки дл� %1.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
+        <location filename="../../src/bibletime.cpp" line="214"/>
         <source>Warning: Invalid unlock key!</source>
         <translation>Предупреждение: �еправильный ключ разблокировки!</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
+        <location filename="../../src/bibletime.cpp" line="215"/>
         <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
         <translation>Введенный вами ключ разблокировки не �оответ�твует данному модулю. Пожалуй�та, попробуйте еще раз.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
+        <location filename="../../src/bibletime_init.cpp" line="255"/>
         <source>&amp;About BibleTime</source>
         <translation>&amp;О BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
+        <location filename="../../src/bibletime_init.cpp" line="733"/>
         <source>Bookmarks</source>
         <translation>Закладки</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
+        <location filename="../../src/bibletime_init.cpp" line="734"/>
         <source>Mag</source>
         <translation>Лупа</translation>
     </message>
@@ -475,7 +480,8 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTimeApp</name>
     <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
+        <location filename="../../src/bibletimeapp.cpp" line="59"/>
+        <location filename="../../src/mobile/bibletimeapp.cpp" line="63"/>
         <source>Fatal error!</source>
         <translation>Критиче�ка� ошибка!</translation>
     </message>
@@ -483,7 +489,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtAboutDialog</name>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
         <source>BibleTime is an easy to use but powerful Bible study tool.</source>
         <translation>BibleTime - �то про�той в и�пользовании, но мощный ин�трумент дл� изучени� Библии.</translation>
     </message>
@@ -498,52 +504,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Полный тек�т лицензии приведен ниже.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="109"/>
         <source>About BibleTime</source>
         <translation>О BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="121"/>
         <source>&amp;BibleTime</source>
         <translation>&amp;BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="126"/>
         <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
         <translation>Мы ищем разработчиков и переводчиков. Е�ли вы желаете при�оединить�� к нашей команде, пришлите, пожалуй�та, �ообщение на %1.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation>(c)1999-2013, Команда BibleTime</translation>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="130"/>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished">(c)1999-2014, Команда BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="137"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Содей�твующие</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="148"/>
         <source>The following people contributed to BibleTime:</source>
-        <translation>Следующие люди �одей�твовали BibleTime:</translation>
+        <translation>Следующие люди учав�твуют в разработке BibleTime:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="150"/>
         <source>documentation and translation manager</source>
         <translation>менеджер по документации и переводам</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="172"/>
         <source>project manager</source>
         <translation>менеджер проекта</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>tester</source>
         <translation>те�тер</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>usability expert</source>
         <translation>�к�перт по функционально�ти</translation>
     </message>
@@ -583,52 +589,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>&amp;Лицензи�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
         <source>designer</source>
         <translation>дизайнер</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="139"/>
         <source>developer</source>
         <translation>разработчик</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
         <source>project founder</source>
         <translation>о�нователь проекта</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="157"/>
         <source>packager</source>
         <translation>�борщик</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="158"/>
         <source>creator of The Sword Project</source>
         <translation>�оздатель Проекта SWORD</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
         <source>domain sponsor</source>
         <translation>доменный �пон�ор</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
         <source>howto</source>
         <translation>по�обие</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="141"/>
         <source>artist</source>
         <translation>художник</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="173"/>
         <source>documentation</source>
         <translation>документаци�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="188"/>
         <source>The following people translated BibleTime into their language:</source>
         <translation>Следующие люди перевели BibleTime на �вой �зык:</translation>
     </message>
@@ -656,37 +662,37 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBibleKeyWidget</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="110"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Прокручивает через �лементы �пи�ка. �ажмите кнопку и двигайте указателем, чтобы увеличить или уменьшить �лементы.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
         <source>Next book</source>
         <translation>Следующа� книга</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
         <source>Previous book</source>
         <translation>Предыдуща� книга</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="117"/>
         <source>Next chapter</source>
         <translation>Следующа� глава</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
         <source>Previous chapter</source>
         <translation>Предыдуща� глава</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="122"/>
         <source>Next verse</source>
         <translation>Следующий �тих</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
         <source>Previous verse</source>
         <translation>Предыдущий �тих</translation>
     </message>
@@ -765,27 +771,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfGroupingMenu</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
         <source>Category/Language</source>
         <translation>Категори�/Язык</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
         <source>Category</source>
         <translation>Категори�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
         <source>Language/Category</source>
         <translation>Язык/Категори�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="105"/>
         <source>Language</source>
         <translation>Язык</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="108"/>
         <source>No grouping</source>
         <translation>Без группировки</translation>
     </message>
@@ -793,7 +799,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfModel</name>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
+        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="78"/>
         <source>Module</source>
         <translation>Модуль</translation>
     </message>
@@ -801,31 +807,23 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfWidget</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="157"/>
         <source>Fi&amp;lter:</source>
         <translation>&amp;Фильтр:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="158"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
         <source>Grouping</source>
         <translation>Группировка</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="159"/>
         <source>Change the grouping of items in the bookshelf.</source>
         <translation>Изменить группировку �лементов в библиотеке.</translation>
     </message>
     <message>
-        <source>Category</source>
-        <translation type="obsolete">Категори�</translation>
-    </message>
-    <message>
-        <source>Language</source>
-        <translation type="obsolete">Язык</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
         <source>Show/hide works</source>
         <translation>Показать/�крыть книги</translation>
     </message>
@@ -839,69 +837,130 @@ This file is distributed under the same license as the Bibetime package.</transl
     </message>
 </context>
 <context>
+    <name>BtConfig</name>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="46"/>
+        <source>Old testament</source>
+        <translation>Ветхий Завет</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="47"/>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation>П�тикнижие Мои�еево</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="48"/>
+        <source>History</source>
+        <translation>И�ториче�кие книги</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="49"/>
+        <source>Prophets</source>
+        <translation>Пророче�кие книги</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="50"/>
+        <source>New testament</source>
+        <translation>�овый Завет</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="51"/>
+        <source>Gospels</source>
+        <translation>Евангели�</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="52"/>
+        <source>Letters/Epistles</source>
+        <translation>По�лани�</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="53"/>
+        <source>Paul&apos;s Epistles</source>
+        <translation>По�лани� ап. Павла</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="89"/>
+        <source>Error loading configuration!</source>
+        <translation>Ошибка при загрузке конфигурации!</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="90"/>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation>�е удало�ь загрузить конфигурацию BibleTime, кажет��, имеюща��� конфигураци� �оответ�твует более новой вер�ии. Это могло быть вызвано у�тановкой более ранней вер�ии BibleTime. Е�ли вы продолжите, информаци� может быть &lt;b&gt;потер�на&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Вы хотите продолжить и загрузить файл конфигурации? �ажмите &quot;�ет&quot; чтобы выйти из BibleTime немедленно.</translation>
+    </message>
+</context>
+<context>
+    <name>BtConfigCore</name>
+    <message>
+        <location filename="../../src/backend/config/btconfigcore.cpp" line="62"/>
+        <source>Default Session</source>
+        <translation>Се��и� по-умолчанию</translation>
+    </message>
+</context>
+<context>
     <name>BtDisplaySettingsButton</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="103"/>
         <source>Use linebreaks after each verse</source>
         <translation>Каждый �тих � новой �троки</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
         <source>Show verse numbers</source>
         <translation>Показывать номера �тихов</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
         <source>Show headings</source>
         <translation>Показывать заглави�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
         <source>Highlight words of Jesus</source>
         <translation>Выдел�ть �лова Ии�у�а Хри�та</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
         <source>Show Hebrew vowel points</source>
         <translation>Показывать точки еврей�ких гла�ных</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
         <source>Show Hebrew cantillation marks</source>
         <translation>Показывать знаки еврей�кой кантил�ции</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
         <source>Show Greek accents</source>
         <translation>Показывать грече�кие ударени�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
         <source>Use alternative textual variant</source>
         <translation>И�пользовать альтернативный тек�туальный вариант</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
         <source>Show scripture cross-references</source>
         <translation>Показать перекрё�тные ��ылки</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
         <source>Show footnotes</source>
         <translation>Показывать �но�ки</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
         <source>Show morph segmentation</source>
         <translation>Показывать морфологиче�кое деление</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="120"/>
         <source>Display settings</source>
         <translation>�а�тройки отображени�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="123"/>
         <source>Display settings: No options available</source>
         <translation>�а�тройки отображени�: нет до�тупных опций</translation>
     </message>
@@ -909,27 +968,45 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtEditBookmarkDialog</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="71"/>
         <source>Edit Bookmark</source>
         <translation>Редактировать Закладку</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
         <source>Location:</source>
         <translation>Ме�то:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
         <source>Title:</source>
         <translation>�азвание:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
         <source>Description:</source>
         <translation>Опи�ание:</translation>
     </message>
 </context>
 <context>
+    <name>BtFindWidget</name>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="28"/>
+        <source>Previous</source>
+        <translation>Предыдущий</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="29"/>
+        <source>Next</source>
+        <translation>Следующий</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="74"/>
+        <source>Match case</source>
+        <translation>Учитывать реги�тр</translation>
+    </message>
+</context>
+<context>
     <name>BtFontChooserWidget</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
@@ -950,27 +1027,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="151"/>
         <source>&amp;Language:</source>
         <translation>&amp;Язык:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
         <source>The font selection below will apply to all texts in this language</source>
         <translation>Выбранный ниже шрифт будет применен ко в�ем тек�там �того �зыка</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
         <source>Use custom font</source>
         <translation>И�пользовать о�обый шрифт</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
         <source>Optionally specify a custom font for each language:</source>
         <translation>Опционально указать о�обый шрифт дл� каждого �зыка:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="150"/>
         <source>Fonts</source>
         <translation>Шрифты</translation>
     </message>
@@ -978,71 +1055,67 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtIndexPage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="124"/>
         <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
         <translation>Е�ли выбрано, индек�ы дл� от�ут�твующих книг будут удалены при �тарте программы</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
         <source>Automatically delete orphaned indexes when BibleTime starts</source>
         <translation>�втоматиче�ки удал�ть одинокие индек�ы на �тарте BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="127"/>
         <source>Delete the selected indexes</source>
         <translation>Удалить выбранные индек�ы</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="130"/>
         <source>Create new indexes for the selected works</source>
         <translation>Создать новые индек�ы дл� выбранных книг</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Work</source>
         <translation>Книга</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Index size</source>
         <translation>Размер индек�а</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="107"/>
         <source>%1 KiB</source>
         <translation>%1 КБ</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="114"/>
         <source>0 KiB</source>
         <translation>0 КБ</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="122"/>
         <source>Search Indexes</source>
         <translation>Пои�ковые индек�ы</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="91"/>
         <source>Indexed Works</source>
         <translation>Индек�ированные Книги</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="96"/>
         <source>Unindexed Works</source>
         <translation>�еиндек�ированные Книги</translation>
     </message>
     <message>
-        <source>KiB</source>
-        <translation type="obsolete">КБ</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
         <source>Create...</source>
         <translation>Создать Индек�...</translation>
     </message>
@@ -1068,17 +1141,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallModuleChooserDialogModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="88"/>
         <source>Work</source>
         <translation>Книга</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="89"/>
         <source>Installation source</source>
         <translation>И�точник у�тановки</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="90"/>
         <source>Version</source>
         <translation>Вер�и�</translation>
     </message>
@@ -1171,12 +1244,12 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Целева� папка не �уще�твует или не до�тупна дл� запи�и. У�тановка не продолжит��, пока �то не будет и�правлено.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="388"/>
         <source>Delete Source?</source>
         <translation>Удалить И�точник?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="389"/>
         <source>Do you really want to delete this source?</source>
         <translation>Вы дей�твительно хотите удалить и�точник?</translation>
     </message>
@@ -1189,17 +1262,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPageModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="75"/>
         <source>Work</source>
         <translation>Книги</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="76"/>
         <source>Version</source>
         <translation>Вер�и�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="77"/>
         <source>Description</source>
         <translation>Опи�ание</translation>
     </message>
@@ -1215,99 +1288,99 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPathDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="35"/>
         <source>Bookshelf Folders</source>
         <translation>Папки Библиотеки</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
         <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
         <translation>Книги могут быть у�тановлены в одну или более папок. По�ле на�тройки зде�ь, вы �можете выбрать их в окне У�тановки.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="45"/>
         <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
         <translation>BibleTime и библиотека SWORD �одержат книги из в�ех �тих папок. Е�ли удалить папку зде�ь, она о�танет�� �о в�ем �одержимым на ди�ке.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="48"/>
         <source>Configure bookshelf folders</source>
         <translation>�а�троить папки библиотеки</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="53"/>
         <source>Configuration file for the folders is: </source>
         <translation>Файл конфигурации дл� папки: </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="61"/>
         <source>Folders where new works can be installed</source>
         <translation>Папки куда могут быть у�тановлены новые книги</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
         <source>Read-only folders</source>
         <translation>Папки только дл� чтени�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="66"/>
         <source>Nonexistent folders</source>
         <translation>�е�уще�твующие папки</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="80"/>
         <source>&amp;Add...</source>
         <translation>&amp;Добавить...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="81"/>
         <source>Add new folder</source>
         <translation>Добавить новую папку</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="86"/>
         <source>&amp;Edit...</source>
         <translation>&amp;Редактировать...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="87"/>
         <source>Edit the selected folder</source>
         <translation>Редактировать выбранную папку</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="92"/>
         <source>&amp;Remove</source>
         <translation>&amp;Удалить</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="93"/>
         <source>Remove the selected folder</source>
         <translation>Удалить выбранную папку</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="167"/>
         <source>This default folder in your home directory can&apos;t be removed</source>
         <translation>Эта папка по-умолчанию в домашней директории не может быть удалена</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="194"/>
         <source>Choose Folder</source>
         <translation>Выберите Папку</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>Use Folder?</source>
         <translation>И�пользовать Папку?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
         <translation>Эта папка не до�тупна дл� запи�и, BibleTime не может у�тановить книги �юда. Вы хотите и�пользовать �ледующую папку вме�то предыдущего значени�?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
         <translation>Эта папка не до�тупна дл� запи�и, BibleTime не может у�тановить книги �юда. Вы дей�твительно хотите добавить ее в библиотеку?</translation>
     </message>
@@ -1315,52 +1388,42 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallProgressDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Work</source>
         <translation>Книги</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Progress</source>
         <translation>Прогре��</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>О�тановить</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="60"/>
         <source>Stop All</source>
         <translation>О�тановить В�е</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Completed</source>
         <translation>Завершено</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>Отменено</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="55"/>
         <source>Waiting for turn...</source>
         <translation>Ожидание...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="113"/>
         <source>Preparing install...</source>
         <translation>Подготовка к у�тановке...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="37"/>
         <source>Install Progress</source>
         <translation>Прогре�� У�тановки</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Failed</source>
         <translation>�е Выполнено</translation>
     </message>
@@ -1368,17 +1431,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
         <source>Language for names of Bible books:</source>
         <translation>Язык дл� имен книг Библии:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation>Язык который может быть и�пользован дл� названий библей�ких книг</translation>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="136"/>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation>Языки дл� имен библей�ких книг. Перевод вз�т из библиотеки Sword.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="133"/>
         <source>Languages</source>
         <translation>Языки</translation>
     </message>
@@ -1428,7 +1491,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtModuleManagerDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="57"/>
         <source>Bookshelf Manager</source>
         <translation>Менеджер Книг</translation>
     </message>
@@ -1436,7 +1499,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkAction</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="103"/>
         <source>&amp;Open work</source>
         <translation>&amp;Открыть книгу</translation>
     </message>
@@ -1444,12 +1507,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkActionMenu</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="42"/>
         <source>&amp;Grouping order</source>
         <translation>Пор�док &amp;группировки</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="43"/>
         <source>Sets the grouping order for the items in this menu.</source>
         <translation>Задать пор�док группировки дл� �лементов в �том меню.</translation>
     </message>
@@ -1485,47 +1548,47 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtRemovePage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="100"/>
         <source>Select &amp;works to uninstall:</source>
         <translation>Выберите &amp;книги дл� удалени�:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&amp;Remove...</source>
         <translation>&amp;Удалить...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="98"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="111"/>
         <source>Start removal of %1 works:</source>
         <translation>�ачать удаление %1 книги:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="114"/>
         <source>Start removal:</source>
         <translation>�ачать удаление:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="145"/>
         <source>You selected the following work(s): </source>
         <translation>Вы выбрали �ледующие книги: </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="149"/>
         <source>Do you really want to remove them from your system?</source>
         <translation>Вы дей�твительно хотите удалить их из �и�темы?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
         <source>Remove the selected works</source>
         <translation>Удалить выбранные книги</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="151"/>
         <source>Remove Works?</source>
         <translation>Удалить Книги?</translation>
     </message>
@@ -1546,12 +1609,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtSearchModuleChooserDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="47"/>
         <source>Works to Search in</source>
         <translation>Книги дл� Пои�ка</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="49"/>
         <source>Select the works which should be searched.</source>
         <translation>Выберите книги, в которых будет произведен пои�к.</translation>
     </message>
@@ -1635,81 +1698,165 @@ shortcut</source>
     </message>
 </context>
 <context>
-    <name>BtSourceArea</name>
+    <name>BtStandardWorksTab</name>
     <message>
-        <source>Work</source>
-        <translation type="obsolete">Книга</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="169"/>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation>Стандартные книги и�пользуют��, когда не указана конкретна� книга, к примеру, нажатие на ��ылку в Библии или лек�иконе.</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceAreaModel</name>
     <message>
-        <source>Work</source>
-        <translation type="obsolete">Книга</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
+        <translation>Библи�:</translation>
     </message>
     <message>
-        <source>Version</source>
-        <translation type="obsolete">Вер�и�</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="174"/>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation>Стандартна� Библи� и�пользует��, когда нажата ��ылка на Библию</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</source>
+        <translation>Комментарий:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="178"/>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation>Стандартный комментарий и�пользует��, когда нажата ��ылка на комментарии</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
+        <translation>Лек�икон:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="182"/>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation>Стандартный лек�икон и�пользует��, когда нажата ��ылка на лек�икон</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</source>
+        <translation>�а�тавлени�:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="186"/>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation>И�пользует�� дл� короткого на�тавлени� при �тарте программы</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation>Еврей�кий лек�икон Стронга:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="190"/>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation>Стандартный лек�икон и�пользует��, когда нажата ��ылка на Еврей�кий лек�икон</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation>Грече�кий лек�икон Стронга:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="194"/>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation>Стандартный лек�икон и�пользует��, когда нажата ��ылка на Грече�кий лек�икон</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</source>
+        <translation>Еврей�кий морфологиче�кий лек�икон:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="198"/>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation>Стандартный морфологиче�кий лек�икон и�пользует��, когда нажата ��ылка на морфологиче�кий т�г в Еврей�ком тек�те</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</source>
+        <translation>Грече�кий морфологиче�кий лек�икон:</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="202"/>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation>Стандартный морфологиче�кий лек�икон и�пользует��, когда нажата ��ылка на морфологиче�кий т�г в Грече�ком тек�те</translation>
     </message>
 </context>
 <context>
     <name>BtTextFiltersTab</name>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="74"/>
         <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="obsolete">Фильтры вли�ют на пред�тавление тек�та. Зде�ь вы можете указать на�тройки по-умолчанию дл� фильтров. Вы можете отдельно указать �ти на�тройки дл� каждого окна.</translation>
+        <translation>Фильтры вли�ют на пред�тавление тек�та. Зде�ь вы можете указать на�тройки по-умолчанию дл� фильтров. Вы можете отдельно указать �ти на�тройки дл� каждого окна.</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="78"/>
         <source>Insert line break after each verse</source>
-        <translation type="obsolete">В�тавл�ть перено� �троки по�ле каждого �тиха</translation>
+        <translation>В�тавл�ть перено� �троки по�ле каждого �тиха</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
         <source>Show verse numbers</source>
-        <translation type="obsolete">Показывать номера �тихов</translation>
+        <translation>Показывать номера �тихов</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
         <source>Show section headings</source>
-        <translation type="obsolete">Показывать подзаголовки</translation>
+        <translation>Показывать подзаголовки</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
+        <source>Show scripture cross-references</source>
+        <translation>Показывать перекре�тные ��ылки</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="82"/>
         <source>Show Greek accents</source>
-        <translation type="obsolete">Показывать грече�кие ударени�</translation>
+        <translation>Показывать грече�кие ударени�</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="83"/>
         <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">Показывать точки еврей�ких гла�ных</translation>
+        <translation>Показывать точки еврей�ких гла�ных</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="84"/>
         <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">Показывать знаки еврей�кой кантил�ции</translation>
+        <translation>Показывать знаки еврей�кой кантил�ции</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="85"/>
         <source>Show morph segmentation</source>
-        <translation type="obsolete">Показывать морфологиче�кое деление</translation>
+        <translation>Показывать морфологиче�кое деление</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="86"/>
         <source>Use textual variants</source>
-        <translation type="obsolete">И�пользовать тек�туальные варианты</translation>
+        <translation>И�пользовать тек�туальные варианты</translation>
     </message>
 </context>
 <context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
         <source>Add/remove/replace</source>
         <translation>Добавить/удалить/заменить</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
         <source>Replace</source>
         <translation>Заменит</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
@@ -1717,87 +1864,87 @@ shortcut</source>
 <context>
     <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="69"/>
         <source>Tip Of The Day</source>
         <translation>Совет Дн�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="83"/>
         <source>Show tips at startup</source>
         <translation>Показывать �оветы при запу�ке</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="94"/>
         <source>Next Tip</source>
         <translation>Следующий</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
         <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
         <translation>Что бы добавить не�колько книг Библии дл� параллельного про�мотра в активное окно Библии, нажмите �ту иконку и выберите другую Библию.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
         <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
         <translation>Что бы добавить не�колько книг комментариев дл� параллельного про�мотра в активное окно комментариев, нажмите �ту иконку и выберите другой комментарий.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="134"/>
         <source>To learn more about the BibleTime project please go to our web site.</source>
         <translation>Что бы узнать больше о проекте BibleTime по�етите наш �айт.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="137"/>
         <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
         <translation>Что бы �инхронизировать окно комментари� и Библии, активируйте �ту иконку в окне комментари�.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
         <source>Select the icon again to stop the synchronization.</source>
         <translation>�ажмите иконку �нова, что бы о�тановить �инхронизацию.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="142"/>
         <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
         <translation>Что бы �оздать закладку перет�ните любую ��ылку на �тих из Библии или комментари� в окно Закладок. Е�ли вы отпу�тите указатель, �трелка будет указывать позицию закладки. В других модул�х будет ��ылка в левом верхнем углу, которую можно и�пользовать дл� �оздани� закладок.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="147"/>
         <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
         <translation>Что бы изменить им� и опи�ание закладки, нажмите правой кнопкой мыши на закладке и выберите Редактировать Закладку. Отредактировав закладку опи�ание можно увидеть, навед� кур�ор на закладку.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="151"/>
         <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
         <translation>Что бы загрузить не�колько и�точников у�тановки модулей, прейдите в Менеджер Библиотеки, нажмите кнопку Добавить и затем кнопку Получить Спи�ок.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="154"/>
         <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
         <translation>Что бы получить больше информации о книге, в окне Библиотеки нажмите правой кнопкой мышки на книге а затем нажмите О Книге.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="157"/>
         <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
         <translation>Окна Библиотеки, Закладок и Лупы могут быть перемещены в другое положение путем перета�кивани� их за заголовок вверху каждого окна. Они могут быть помещены влево, вправо, �верху или �низу Окна Книг. Они могут быть помещены �верху друг друга и �вернуты во вкладки, так что каждое окно будет до�тупно. Им можно мен�ть размер путем перет�гивани� за край между окном и другим окном.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="163"/>
         <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
         <translation>Вы можете делать пои�к номеров Стронга в книге. Откройте книгу, �одержащую номера Стронга, и наведите кур�ором на �лово. �ажмите правой кнопкой мышки на �лове и выберите Пои�к по �омерам Стронга. По�вит�� диалог пои�ка, в котором вы �можете увидеть, где и�пользуют�� �лова � таким же номером Стронга.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="178"/>
         <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
         <translation>Можно �охран�ть открытые окна как �е��ию. Така� �е��и� позже может быть во��тановлена. Можно �охранить �только �е��ий, �колько вам угодно. Эти возможно�ти до�тупны из меню Окно.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="168"/>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
         <translation>Вы можете �охран�ть �об�твенные заметки к любому �тиху. Дл� �того нужно у�тановить Личный Комментарий (Personal Commentary). Откройте Менеджер Библиотеки, выберите и�точник Crosswire и по�мотрите в Комментари�х на �нглий�ком Языке. Когда он будет у�тановлен, в окне Библиотеки нажмите правой кнопкой на Личном Комментарии. И�пользуйте меню Редактировать Про�той Тек�т или Редактировать  HTML что бы открыть модуль дл� запи�и.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
         <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
         <translation>Вы можете видеть информацию об интере�ующем номере Стронга в окне Лупа, навед� кур�ор на �лово. И�пользуйте Библию, котора� �одержит номера Стронга, также необходимо у�тановить лек�иконы StrongsGreek и StrongsHebrew из и�точника Crosswire.</translation>
     </message>
@@ -1813,49 +1960,49 @@ shortcut</source>
 <context>
     <name>CAcceleratorSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="128"/>
         <source>Choose action group:</source>
         <translation>Выберите группу дей�твий:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="130"/>
         <source>Main Window</source>
         <translation>Главное Окно</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
         <source>All text windows</source>
         <translation>В�е тек�товые окна</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="132"/>
         <source>Bible windows</source>
         <translation>Окна Библии</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
         <source>Commentary windows</source>
         <translation>Окна комментариев</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="134"/>
         <source>Lexicon windows</source>
         <translation>Окна лек�иконов</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
         <source>Book windows</source>
         <translation>Окна книг</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
         <source>
    &quot;%1&quot; in the &quot;%2&quot; group</source>
         <translation>
    &quot;%1&quot; в &quot;%2&quot; группах</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
         <source>Shortcuts</source>
         <translation>Сочетани� клавиш</translation>
     </message>
@@ -1863,103 +2010,95 @@ shortcut</source>
 <context>
     <name>CBibleReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="64"/>
         <source>Next book</source>
         <translation>Следующа� книга</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="68"/>
         <source>Previous book</source>
         <translation>Предыдуща� книга</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="72"/>
         <source>Next chapter</source>
         <translation>Следующа� глава</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="76"/>
         <source>Previous chapter</source>
         <translation>Предыдуща� глава</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="80"/>
         <source>Next verse</source>
         <translation>Следующий �тих</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="84"/>
         <source>Previous verse</source>
         <translation>Предыдущий �тих</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="89"/>
         <source>Copy chapter</source>
         <translation>Копировать главу</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="92"/>
         <source>Save chapter as plain text</source>
         <translation>Сохранить главу как про�той тек�т</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="95"/>
         <source>Save chapter as HTML</source>
         <translation>Сохранить главу как HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="98"/>
         <source>Print chapter</source>
         <translation>Печатать главу</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="110"/>
         <source>Text of reference</source>
         <translation>Тек�т ��ылки</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
         <source>Reference with text</source>
         <translation>С�ылка � тек�том</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="253"/>
         <source>Bible window</source>
         <translation>Окно Библии</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="263"/>
         <source>Copy...</source>
         <translation>Копировать...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="274"/>
         <source>Save...</source>
         <translation>Сохранить...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="287"/>
         <source>Print...</source>
         <translation>Печать...</translation>
     </message>
     <message>
-        <source>Copy chapter to clipboard ...</source>
-        <translation type="obsolete">Копировать главу в буфер обмена ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="371"/>
         <source>Copying</source>
         <translation>Копирование</translation>
     </message>
     <message>
-        <source>Saving chapter ...</source>
-        <translation type="obsolete">Сохранение главы ...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="390"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="408"/>
         <source>Saving</source>
         <translation>Сохранение</translation>
     </message>
@@ -1967,7 +2106,7 @@ shortcut</source>
 <context>
     <name>CBookReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
+        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="70"/>
         <source>Toggle tree view</source>
         <translation>Переключить дерево</translation>
     </message>
@@ -1975,136 +2114,136 @@ shortcut</source>
 <context>
     <name>CBookmarkIndex</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
         <source>Bookmarks</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="92"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="583"/>
         <source>New folder</source>
         <translation>�ова� директори�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
         <source>Rename folder</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
         <source>Delete Items</source>
         <translation>Удалить �лементы</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="704"/>
         <source>Do you really want to delete the selected items and child-items?</source>
         <translation>Вы уверенны, что хотите удалить выбранные �лементы и в�е, подчиненные им?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="814"/>
         <source>The work to which the bookmark points to is not installed.</source>
         <translation>Книга, на которую указывает закладка, не у�тановлена.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
         <source>Print bookmarks...</source>
         <translation>Ра�печатать закладки...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="103"/>
         <source>Remove selected items...</source>
         <translation>Удалить выделенные �лементы...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
         <source>Import to folder...</source>
         <translation>Импорт в папку...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
         <source>Edit bookmark...</source>
         <translation>Редактировать закладку...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
         <source>Sort folder bookmarks...</source>
         <translation>Сортировать закладки в папке...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
         <source>Sort all bookmarks...</source>
         <translation>Сортировать в�е закладки...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="100"/>
         <source>Export from folder...</source>
         <translation>Эк�портировать из папки...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="393"/>
         <source>Can drop only bookmarks or one folder</source>
         <translation>Можно кидать только закладки или папку</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="398"/>
         <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
         <translation>�ельз� кидать папку в �аму �еб� или подпапку</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="406"/>
         <source>Move</source>
         <translation>Переме�тить</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="467"/>
         <source>Drag references from text views to this view</source>
-        <translation>Перет�гивать ��ылки из тек�товых окон в �то</translation>
+        <translation>Перета�кивайте �юда ��ылки из окон тек�тов</translation>
     </message>
 </context>
 <context>
     <name>CCommentaryReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="31"/>
         <source>Next book</source>
         <translation>Следующа� книга</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="35"/>
         <source>Previous book</source>
         <translation>Предыдуща� книга</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="39"/>
         <source>Next chapter</source>
         <translation>Следующа� глава</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="43"/>
         <source>Previous chapter</source>
         <translation>Предыдуща� глава</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="47"/>
         <source>Next verse</source>
         <translation>Следующий �тих</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="51"/>
         <source>Previous verse</source>
         <translation>Предыдущий �тих</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="56"/>
         <source>Synchronize</source>
         <translation>Синхронизировать</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="59"/>
         <source>Synchronize the displayed entry of this work with the active Bible window</source>
         <translation>Синхронизировать текущее ме�то �той книги � окном активной Библии</translation>
     </message>
@@ -2112,7 +2251,7 @@ shortcut</source>
 <context>
     <name>CConfigurationDialog</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="41"/>
         <source>Configure BibleTime</source>
         <translation>�а�троить BibleTime</translation>
     </message>
@@ -2120,67 +2259,67 @@ shortcut</source>
 <context>
     <name>CDisplaySettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
         <source>Display templates</source>
         <translation>�а�тройки отображени�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
         <source>Available display styles:</source>
         <translation>До�тупные �тили отображени�:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="113"/>
         <source>Style preview</source>
         <translation>Предпро�мотр �тилей</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="131"/>
         <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
         <translation>Ибо так возлюбил Бог мир, что отдал Сына Своего Единородного, дабы в��кий верующий в �его, не погиб, но имел жизнь вечную.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="138"/>
         <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
         <translation>Ибо не по�лал Бог Сына Своего в мир, чтобы �удить мир, но чтобы мир �па�ен был чрез �его.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="145"/>
         <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
         <translation>Верующий в �его не �удит��, а неверующий уже о�ужден, потому что не уверовал во им� Единородного Сына Божи�.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="155"/>
         <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
         <translation>ибо в��кий, делающий злое, ненавидит �вет и не идет к �вету, чтобы не обличили�ь дела его, потому что они злы.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="160"/>
         <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
         <translation>а по�тупающий по правде идет к �вету, дабы �вны были дела его, потому что они в Боге �оделаны.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="106"/>
         <source>Display templates define how text is displayed.</source>
         <translation>Шаблоны отображени� определ�ют, как тек�т будет показан на �кране.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="110"/>
         <source>Show the BibleTime logo on startup</source>
         <translation>Показывать за�тавку BibleTime при загрузке</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
         <source>Show startup logo</source>
         <translation>Показывать за�тавку при запу�ке</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="150"/>
         <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
         <translation>Суд же �о�тоит в том, что �вет пришел в мир; но люди более возлюбили тьму, нежели �вет, потому что дела их были злы.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="101"/>
         <source>Display</source>
         <translation>Внешний вид</translation>
     </message>
@@ -2193,147 +2332,124 @@ shortcut</source>
 <context>
     <name>CDisplayWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="215"/>
         <source>Back in history</source>
         <translation>�азад к и�тории</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="223"/>
         <source>Forward in history</source>
         <translation>Вперед</translation>
     </message>
     <message>
-        <source>Zoom in</source>
-        <translation type="obsolete">Приблизить</translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation type="obsolete">Отдалить</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="192"/>
         <source>Select all</source>
         <translation>Выделить в�ё</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="196"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="200"/>
         <source>Find...</source>
         <translation>�айти...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="204"/>
         <source>Change location</source>
         <translation>Сменить ме�то</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="209"/>
         <source>Search with works of this window</source>
         <translation>И�кать в книгах �того окна</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="393"/>
         <source>Work chooser buttons</source>
         <translation>Кнопки выбора книг</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="403"/>
         <source>Text area header</source>
         <translation>Заголовок зоны тек�та</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="453"/>
         <source>Navigation</source>
         <translation>�авигаци�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="459"/>
         <source>Tool</source>
         <translation>Ин�трументы</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="465"/>
         <source>Format</source>
         <translation>Формат</translation>
     </message>
 </context>
 <context>
-    <name>CFontChooser</name>
-    <message>
-        <source>Size:</source>
-        <translation type="obsolete">Размер:</translation>
-    </message>
-    <message>
-        <source>Font name:</source>
-        <translation type="obsolete">Им� шрифта:</translation>
-    </message>
-    <message>
-        <source>Font style:</source>
-        <translation type="obsolete">Стиль шрифта:</translation>
-    </message>
-</context>
-<context>
     <name>CHTMLWriteDisplay</name>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
         <source>Bold</source>
         <translation>Полужирный</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="60"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="67"/>
         <source>Italic</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="79"/>
         <source>Underline</source>
         <translation>Подчёркнутый</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="84"/>
         <source>Left</source>
         <translation>По левому краю</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="94"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="99"/>
         <source>Center</source>
         <translation>По центру</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="104"/>
         <source>Right</source>
         <translation>По правому краю</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="231"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="243"/>
         <source>Font size</source>
         <translation>Размер шрифта</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="255"/>
         <source>Font color</source>
         <translation>Цвет шрифта</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="89"/>
         <source>Align left</source>
         <translation>Выровн�ть �лева</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="109"/>
         <source>Align right</source>
         <translation>Выровн�ть �права</translation>
     </message>
@@ -2341,50 +2457,23 @@ shortcut</source>
 <context>
     <name>CHTMLWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="122"/>
         <source>Module not writable</source>
         <translation>
             </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="124"/>
         <source>Module is not writable.</source>
         <translation>Модуль не до�тупен дл� запи�и.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="125"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Либо модуль не редактируем, либо у ва� нет разрешени� на запи�ь.</translation>
     </message>
 </context>
 <context>
-    <name>CKeyReferenceWidget</name>
-    <message>
-        <source>Next book</source>
-        <translation type="obsolete">Следующа� книга</translation>
-    </message>
-    <message>
-        <source>Previous book</source>
-        <translation type="obsolete">Предыдуща� книга</translation>
-    </message>
-    <message>
-        <source>Next chapter</source>
-        <translation type="obsolete">Следующа� глава</translation>
-    </message>
-    <message>
-        <source>Previous chapter</source>
-        <translation type="obsolete">Предыдуща� глава</translation>
-    </message>
-    <message>
-        <source>Next verse</source>
-        <translation type="obsolete">Следующий �тих</translation>
-    </message>
-    <message>
-        <source>Previous verse</source>
-        <translation type="obsolete">Предыдущий �тих</translation>
-    </message>
-</context>
-<context>
     <name>CLanguageSettingsPage</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/clanguagesettings.cpp" line="297"/>
@@ -2395,22 +2484,22 @@ shortcut</source>
 <context>
     <name>CLexiconKeyChooser</name>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Прокручивает через �лементы �пи�ка. �ажмите кнопку и двигайте указателем, чтобы увеличить или уменьшить �лементы.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
         <source>Entries of the current work</source>
         <translation>Запи�и текущей книги</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Следующа� запи�ь</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="49"/>
         <source>Previous entry</source>
         <translation>Предыдуща� запи�ь</translation>
     </message>
@@ -2418,74 +2507,70 @@ shortcut</source>
 <context>
     <name>CLexiconReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Следующа� запи�ь</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="51"/>
         <source>Previous entry</source>
         <translation>Предыдуща� запи�ь</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="55"/>
         <source>Copy reference only</source>
         <translation>Копировать только ��ылку</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
         <source>Save entry as HTML</source>
         <translation>Сохранить запи�ь как HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
         <source>Print reference only</source>
         <translation>Печатать только ��ылку</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
         <source>Strong&apos;s Search</source>
         <translation>Пои�к по номеру Стронга</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
         <source>Entry with text</source>
         <translation>Запи�ь � тек�том</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="134"/>
         <source>Entry as plain text</source>
         <translation>Запи�ь как про�той тек�т</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="265"/>
         <source>Lexicon window</source>
         <translation>Окно �ловар�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="272"/>
         <source>Copy...</source>
         <translation>Копировать...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="281"/>
         <source>Save...</source>
         <translation>Сохранить...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="297"/>
         <source>Print...</source>
         <translation>Печать...</translation>
     </message>
     <message>
-        <source>Saving entry ...</source>
-        <translation type="obsolete">Сохранение запи�ь...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="340"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="364"/>
         <source>Saving</source>
         <translation>Сохранение</translation>
     </message>
@@ -2493,92 +2578,113 @@ shortcut</source>
 <context>
     <name>CPlainWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="235"/>
         <source>Sync with active Bible</source>
         <translation>Синхронизировать � активной Библией</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="245"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="249"/>
         <source>Save text</source>
         <translation>Сохранить тек�т</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="254"/>
         <source>Delete current entry</source>
         <translation>Удалить текущую запи�ь</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="263"/>
         <source>Restore original text</source>
         <translation>Во��тановить оригинальный тек�т</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="163"/>
         <source>Module not writable</source>
         <translation>
             </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="165"/>
         <source>Module is not writable.</source>
         <translation>Модуль не до�тупен дл� запи�и.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="166"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Либо модуль не может быть изменен, либо у ва� нет разрешени� на запи�ь.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="240"/>
         <source>Synchronize (show the same verse) with the active Bible window</source>
         <translation>Синхронизировать (показывать одинаковые �тихи) � активным окном Библии</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="258"/>
         <source>Delete current entry (no undo)</source>
         <translation>Удалить текущее ме�то (нельз� отменить)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="267"/>
         <source>Restore original text, new text will be lost</source>
         <translation>Во��тановить и�ходный тек�т, новый тек�т будет потер�н</translation>
     </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save Text?</source>
+        <translation>Сохранить Тек�т?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <source>Save text before closing?</source>
+        <translation>Сохранить тек�т перед закрытием?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save changed text?</source>
+        <translation>Сохранить измененный тек�т?</translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="232"/>
         <source>Save Search Analysis</source>
         <translation>Сохранить �нализ Пои�ка</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation>Файлы HTML (*.html;*.HTML;*.HTM;*.htm)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="243"/>
         <source>BibleTime Search Analysis</source>
         <translation>�нализ Пои�ка в BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation>Тек�т пои�ка:</translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="234"/>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
+        <translation>файлы XHTML (*.html *.HTML *.HTM *.htm);;В�е файлы (*)</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="259"/>
+        <source>Search text:</source>
+        <translation>И�комый тек�т:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="263"/>
+        <source>Results by work and book</source>
+        <translation>Результаты по книгам</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="265"/>
         <source>Book</source>
         <translation>Книга</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="293"/>
         <source>Total hits</source>
         <translation>В�его �овпадений</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="303"/>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
         <translation>Создано &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</translation>
     </message>
@@ -2586,168 +2692,168 @@ shortcut</source>
 <context>
     <name>CSwordModuleInfo</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="763"/>
         <source>Version</source>
         <translation>Вер�и�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="766"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="774"/>
         <source>unknown</source>
         <translation>неизве�тно</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="771"/>
         <source>Markup</source>
         <translation>Разметка</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
         <source>Location</source>
         <translation>Размещение</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="782"/>
         <source>Language</source>
         <translation>Язык</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="787"/>
         <source>Category</source>
         <translation>Категори�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="792"/>
         <source>LCSH</source>
         <translation>LCSH</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="796"/>
         <source>Writable</source>
         <translation>До�тупный дл� запи�и</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>yes</source>
         <translation>да</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>no</source>
         <translation>нет</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="801"/>
         <source>Unlock key</source>
         <translation>Ключ разблокировки</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="822"/>
         <source>Features</source>
         <translation>Специальные возможно�ти</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="830"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Будьте о�торожны, модуль �одержит конфе��иональный или �порный материал!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="834"/>
         <source>About</source>
         <translation>О Модуле</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="856"/>
         <source>Distribution license</source>
         <translation>Лицензи� ра�про�транени�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="857"/>
         <source>Distribution source</source>
         <translation>И�точник ра�про�транени�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="858"/>
         <source>Distribution notes</source>
         <translation>Комментарии ра�про�транени�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="859"/>
         <source>Text source</source>
         <translation>И�точник тек�та</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="860"/>
         <source>Copyright notes</source>
         <translation>Примечани� об автор�ком праве</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
         <source>Copyright holder</source>
         <translation>Правообладатель</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
         <source>Copyright date</source>
         <translation>Дата автор�кого права</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
         <source>Copyright contact name</source>
         <translation>Контактное лицо по автор�кому праву</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
         <source>Copyright contact address</source>
         <translation>Контактный адре� по автор�кому праву</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
         <source>Copyright contact email</source>
         <translation>Контактный e-mail по автор�кому праву</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="956"/>
         <source>Bibles</source>
         <translation>Тек�ты Библии</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="958"/>
         <source>Commentaries</source>
         <translation>Комментарии</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="960"/>
         <source>Books</source>
         <translation>Книги</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="962"/>
         <source>Cults/Unorthodox</source>
         <translation>�еобщеприн�тые</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="964"/>
         <source>Maps and Images</source>
         <translation>Карты и Изображени�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="966"/>
         <source>Daily Devotionals</source>
         <translation>�а�тавлени�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="968"/>
         <source>Lexicons and Dictionaries</source>
         <translation>Лек�иконы и Словари</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="970"/>
         <source>Glossaries</source>
         <translation>Гло��арии</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="972"/>
         <source>Unknown</source>
         <translation>�еизве�тный</translation>
     </message>
@@ -2755,17 +2861,17 @@ shortcut</source>
 <context>
     <name>CSwordSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="43"/>
         <source>Standard works</source>
         <translation>Модули по-умолчанию</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="44"/>
         <source>Text filters</source>
         <translation>Тек�товые фильтры</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="41"/>
         <source>Desk</source>
         <translation>Профили</translation>
     </message>
@@ -2778,32 +2884,32 @@ shortcut</source>
 <context>
     <name>CSwordSetupInstallSourcesDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="47"/>
         <source>Caption</source>
         <translation>Заголовок</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="68"/>
         <source>Path</source>
         <translation>Путь</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="91"/>
         <source>Get list...</source>
         <translation>Получить Спи�ок...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="160"/>
         <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
 
 Do you want to continue?</source>
@@ -2812,145 +2918,126 @@ Do you want to continue?</source>
 Вы хотите продолжить?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
         <source>Get source list from remote server?</source>
         <translation>Загрузить �пи�ок и�точников � �ервера?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="167"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="168"/>
         <source>Downloading List</source>
         <translation>Загрузить Спи�ок</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="178"/>
         <source>Connecting...</source>
         <translation>Соединение...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="197"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="198"/>
         <source>Refreshing...</source>
         <translation>Обновление...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="92"/>
         <source>Download a list of sources from CrossWire server and add sources</source>
         <translation>Загрузить и добавить �пи�ок и�точников � �ервера Crosswire</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
         <source>Please provide a caption.</source>
         <translation>Пожалуй�та, укажите заголовок.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
         <source>A source with this caption already exists. Please provide a different caption.</source>
         <translation>И�точник � таким именем уже �уще�твует. Пожалуй�та, укажите другое им�.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
         <source>Please provide a server name.</source>
         <translation>Пожалуй�та, укажите им� �ервера.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
         <source>Please provide a valid, readable path.</source>
         <translation>Укажите правильный, читабельный путь.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Please provide a path.</source>
         <translation>Укажите путь.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="39"/>
         <source>New  Installation Source</source>
         <translation>�овый И�точник У�тановки</translation>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>Сохранить тек�т перед закрытием?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>Сохранить измененный тек�т?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>Сохранить Тек�т?</translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="178"/>
         <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
         <translation>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Вер�и�: %3&lt;/p&gt;&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="194"/>
         <source>Abbreviation</source>
         <translation>Сокращени�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="203"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="290"/>
         <source>Cross references</source>
         <translation>Перекре�тные ��ылки</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="343"/>
         <source>Footnote</source>
         <translation>Сно�ки</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="374"/>
         <source>Strongs</source>
         <translation>�омера Стронга</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="451"/>
         <source>Morphology</source>
         <translation>Морфологиче�кие т�ги</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="472"/>
         <source>Word lookup</source>
         <translation>Пои�к �лова</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="60"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
         <source>Select all</source>
         <translation>Выделить в�ё</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="80"/>
         <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
         <translation>&lt;small&gt;Это зона про�мотра Лупой. Переме�тите кур�ор на ��ылку или другой �лемент и �одержимое по�вит�� зде�ь по�ле небольшой задержки. Бы�тро переме�тите указатель в окно Лупы или зажмите Shift чтобы удержать �одержимое окна.&lt;/small&gt;</translation>
     </message>
@@ -2958,28 +3045,28 @@ Do you want to continue?</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="412"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="422"/>
         <source>Indexing aborted</source>
         <translation>Индек�аци� отменена</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="413"/>
         <source>An internal error occurred while building the index: %1</source>
         <translation>Внутренн�� ошибка во врем� индек�ации: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="423"/>
         <source>An internal error occurred while building the index.</source>
         <translation>Произошла внутренн�� ошибка во врем� �оздани� индек�а.</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="522"/>
         <source>Search aborted</source>
         <translation>Пои�к отменен</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="523"/>
         <source>An internal error occurred while executing your search.</source>
         <translation>Произошла внутренн�� ошибка во врем� выполнени� пои�ка.</translation>
     </message>
@@ -3020,7 +3107,7 @@ Do you want to continue?</source>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="122"/>
         <source>Bibles</source>
         <translation>Тек�ты Библии</translation>
     </message>
@@ -3037,740 +3124,740 @@ Do you want to continue?</source>
         <translation>Книги</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="390"/>
         <source>Added text</source>
         <translation>Добавленный тек�т</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="143"/>
         <source>Names of languages</source>
         <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
         <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="148"/>
         <source>Afrikaans</source>
         <extracomment>Language name af</extracomment>
         <translation>�фрикан�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="151"/>
         <source>Amuzgo, Guerrero</source>
         <extracomment>Language name amu</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="153"/>
         <source>English, Old (ca.450-1100)</source>
         <extracomment>Language name ang</extracomment>
         <translation>�нглий�кий, ранний (450-1100)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="155"/>
         <source>Arabic</source>
         <extracomment>Language name ar</extracomment>
         <translation>�раб�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="158"/>
         <source>Azerbaijani</source>
         <extracomment>Language name az</extracomment>
         <translation>�зербайджан�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="160"/>
         <source>Azerbaijani, South</source>
         <extracomment>Language name azb</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="165"/>
         <source>Belarusian</source>
         <extracomment>Language name be</extracomment>
         <translation>Белору��кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="167"/>
         <source>Bulgarian</source>
         <extracomment>Language name bg</extracomment>
         <translation>Болгар�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="173"/>
         <source>Breton</source>
         <extracomment>Language name br</extracomment>
         <translation>Бретон�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="175"/>
         <source>Bosnian</source>
         <extracomment>Language name bs</extracomment>
         <translation>Бо�ний�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="177"/>
         <source>Catalan</source>
         <extracomment>Language name ca</extracomment>
         <translation>Каталон�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="180"/>
         <source>Chinantec, Comaltepec</source>
         <extracomment>Language name cco</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="182"/>
         <source>Cebuano</source>
         <extracomment>Language name ceb</extracomment>
         <translation>Цебуано</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
         <source>Chamorro</source>
         <extracomment>Language name ch</extracomment>
         <translation>Чаморро</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
         <source>Chontal, Highland Oaxaca</source>
         <extracomment>Language name chd</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
         <source>Chinantec, Quiotepec</source>
         <extracomment>Language name chq</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="190"/>
         <source>Chinantec, Ozumacu00edn</source>
         <extracomment>Language name chz</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="193"/>
         <source>Cakchiquel, Western</source>
         <extracomment>Language name ckw</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="195"/>
         <source>Chinantec, Lalana</source>
         <extracomment>Language name cnl</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="197"/>
         <source>Chinantec, Tepetotutla</source>
         <extracomment>Language name cnt</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="199"/>
         <source>Coptic</source>
         <extracomment>Language name cop</extracomment>
         <translation>Копт�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
         <source>Czech</source>
         <extracomment>Language name cs</extracomment>
         <translation>Чеш�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
         <source>Chinantec, Sochiapan</source>
         <extracomment>Language name cso</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
         <source>Chol, Tila</source>
         <extracomment>Language name cti</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
         <source>Chatino, Western Highland</source>
         <extracomment>Language name ctp</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
         <source>Church Slavic</source>
         <extracomment>Language name cu</extracomment>
         <translation>Церковно�лав�н�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="212"/>
         <source>Welsh</source>
         <extracomment>Language name cy</extracomment>
         <translation>У�ль�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
         <source>Danish</source>
         <extracomment>Language name da</extracomment>
         <translation>Дат�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
         <source>German</source>
         <extracomment>Language name de</extracomment>
         <translation>�емецкий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
         <source>Duruma</source>
         <extracomment>Language name dug</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="221"/>
         <source>Greek, Modern (1453-)</source>
         <extracomment>Language name el</extracomment>
         <translation>Грече�кий, �овременный (1453-)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
         <source>English</source>
         <extracomment>Language name en</extracomment>
         <translation>�нглий�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="225"/>
         <source>American English</source>
         <extracomment>Language name en_US</extracomment>
         <translation>�нглий�кий (СШ�)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="227"/>
         <source>English, Middle (1100-1500)</source>
         <extracomment>Language name enm</extracomment>
         <translation>�нглий�кий, �редневековый (1100-1500)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="229"/>
         <source>Esperanto</source>
         <extracomment>Language name eo</extracomment>
         <translation>Э�перанто</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="231"/>
         <source>Spanish</source>
         <extracomment>Language name es</extracomment>
         <translation>И�пан�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
         <source>Estonian</source>
         <extracomment>Language name et</extracomment>
         <translation>Э�тон�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
         <source>Basque</source>
         <extracomment>Language name eu</extracomment>
         <translation>Ба�к�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
         <source>Persian</source>
         <extracomment>Language name fa</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
         <source>Finnish</source>
         <extracomment>Language name fi</extracomment>
         <translation>Фин�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="243"/>
         <source>French</source>
         <extracomment>Language name fr</extracomment>
         <translation>Француз�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="245"/>
         <source>Frisian</source>
         <extracomment>Language name fy</extracomment>
         <translation>Фриз�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="247"/>
         <source>Irish</source>
         <extracomment>Language name ga</extracomment>
         <translation>Ирланд�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="249"/>
         <source>Gaelic (Scots)</source>
         <extracomment>Language name gd</extracomment>
         <translation>Г�ль�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="251"/>
         <source>Geez</source>
         <extracomment>Language name gez</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
         <source>Gothic</source>
         <extracomment>Language name got</extracomment>
         <translation>Гот�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
         <source>Manx</source>
         <extracomment>Language name gv</extracomment>
         <translation>Манк�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
         <source>Greek, Ancient (to 1453)</source>
         <extracomment>Language name grc</extracomment>
         <translation>Грече�кий, древний (до 1453)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="262"/>
         <source>Hebrew</source>
         <extracomment>Language name he</extracomment>
         <translation>Еврей�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
         <source>Hausa</source>
         <extracomment>Language name hau</extracomment>
         <translation>Хау�а</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
         <source>Hawaiian</source>
         <extracomment>Language name haw</extracomment>
         <translation>Гавай�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
         <source>Hindi</source>
         <extracomment>Language name hi</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="271"/>
         <source>Croatian</source>
         <extracomment>Language name hr</extracomment>
         <translation>Хорват�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="275"/>
         <source>Hungarian</source>
         <extracomment>Language name hu</extracomment>
         <translation>Венгер�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
         <source>Huave, San Mateo Del Mar</source>
         <extracomment>Language name huv</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
         <source>Armenian</source>
         <extracomment>Language name hy</extracomment>
         <translation>�рм�н�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
         <source>Indonesian</source>
         <extracomment>Language name id</extracomment>
         <translation>Индонезий�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
         <source>Icelandic</source>
         <extracomment>Language name is</extracomment>
         <translation>И�ланд�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
         <source>Italian</source>
         <extracomment>Language name it</extracomment>
         <translation>Италь�н�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="291"/>
         <source>Itzu00e1</source>
         <extracomment>Language name itz</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="293"/>
         <source>Ixil, San Juan Cotzal</source>
         <extracomment>Language name ixl</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
         <source>Japanese</source>
         <extracomment>Language name ja</extracomment>
         <translation>Япон�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
         <source>Jacalteco, Eastern</source>
         <extracomment>Language name jac</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
         <source>Javanese, Caribbean</source>
         <extracomment>Language name jvn</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="302"/>
         <source>Georgian</source>
         <extracomment>Language name ka</extracomment>
         <translation>Грузин�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
         <source>Korean</source>
         <extracomment>Language name ko</extracomment>
         <translation>Корей�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="315"/>
         <source>Kurdish</source>
         <extracomment>Language name ku</extracomment>
         <translation>Курд�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
         <source>Kirghiz</source>
         <extracomment>Language name ky</extracomment>
         <translation>Киргиз�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
         <source>Latin</source>
         <extracomment>Language name la</extracomment>
         <translation>Латин�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
         <source>Lacandon</source>
         <extracomment>Language name lac</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
         <source>Lithuanian</source>
         <extracomment>Language name lt</extracomment>
         <translation>Литов�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="332"/>
         <source>Latvian</source>
         <extracomment>Language name lv</extracomment>
         <translation>Латыш�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="334"/>
         <source>Malagasy</source>
         <extracomment>Language name mg</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="337"/>
         <source>Maori</source>
         <extracomment>Language name mi</extracomment>
         <translation>Маори</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="339"/>
         <source>Mixe, Isthmus</source>
         <extracomment>Language name mir</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="341"/>
         <source>Mixtec, Coatzospan</source>
         <extracomment>Language name miz</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="343"/>
         <source>Macedonian</source>
         <extracomment>Language name mk</extracomment>
         <translation>Македон�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="345"/>
         <source>Mixtec, Silacayoapan</source>
         <extracomment>Language name mks</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="350"/>
         <source>More</source>
         <extracomment>Language name mos</extracomment>
         <translation>Больше</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
         <source>Malay</source>
         <extracomment>Language name ms</extracomment>
         <translation>Малай�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
         <source>Maltese</source>
         <extracomment>Language name mt</extracomment>
         <translation>Мальтий�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="375"/>
         <source>Low German; Low Saxon</source>
         <extracomment>Language name nds</extracomment>
         <translation>Германо-�ак�он�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="377"/>
         <source>Nepali</source>
         <extracomment>Language name ne</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="379"/>
         <source>Nahuatl, Guerrero</source>
         <extracomment>Language name ngu</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
         <source>Nahuatl, Northern Oaxaca</source>
         <extracomment>Language name nhy</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
         <source>Dutch</source>
         <extracomment>Language name nl</extracomment>
         <translation>Голланд�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
         <source>Norwegian Nynorsk</source>
         <extracomment>Language name nn</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
         <source>Norwegian</source>
         <extracomment>Language name no</extracomment>
         <translation>�орвеж�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="397"/>
         <source>Otomi, Queru00e9taro</source>
         <extracomment>Language name otq</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
         <source>Papiamento</source>
         <extracomment>Language name pap</extracomment>
         <translation>Папьементо</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
         <source>Polish</source>
         <extracomment>Language name pl</extracomment>
         <translation>Поль�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="411"/>
         <source>Persian (Dari)</source>
         <extracomment>Language name prs</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="415"/>
         <source>Portuguese</source>
         <extracomment>Language name pt</extracomment>
         <translation>Португаль�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
         <source>Brasilian Portuguese</source>
         <extracomment>Language name pt_BR</extracomment>
         <translation>Бразиль�кий португаль�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
         <source>Quichu00e9, West Central</source>
         <extracomment>Language name qut</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
         <source>Romanian</source>
         <extracomment>Language name ro</extracomment>
         <translation>Румын�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
         <source>Russian</source>
         <extracomment>Language name ru</extracomment>
         <translation>Ру��кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="431"/>
         <source>Scots</source>
         <extracomment>Language name sco</extracomment>
         <translation>Шотланд�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="437"/>
         <source>Slovak</source>
         <extracomment>Language name sk</extracomment>
         <translation>Словак�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="439"/>
         <source>Slovenian</source>
         <extracomment>Language name sl</extracomment>
         <translation>Словен�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="443"/>
         <source>Somali</source>
         <extracomment>Language name so</extracomment>
         <translation>Сомалий�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
         <source>Albanian</source>
         <extracomment>Language name sq</extracomment>
         <translation>�лбан�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="453"/>
         <source>Swedish</source>
         <extracomment>Language name sv</extracomment>
         <translation>Швед�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="455"/>
         <source>Swahili</source>
         <extracomment>Language name sw</extracomment>
         <translation>Свахили</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="457"/>
         <source>Syriac</source>
         <extracomment>Language name syr</extracomment>
         <translation>Сирий�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="459"/>
         <source>Tamil</source>
         <extracomment>Language name ta</extracomment>
         <translation>Тамиль�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="463"/>
         <source>Thai</source>
         <extracomment>Language name th</extracomment>
         <translation>Тай�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
         <source>Tagalog</source>
         <extracomment>Language name tl</extracomment>
         <translation>Тагалог�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="470"/>
         <source>Tswana</source>
         <extracomment>Language name tn</extracomment>
         <translation>Т�ван�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="472"/>
         <source>Turkish</source>
         <extracomment>Language name tr</extracomment>
         <translation>Турецкий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
         <source>Tektiteko</source>
         <extracomment>Language name ttc</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="479"/>
         <source>Tahitian</source>
         <extracomment>Language name ty</extracomment>
         <translation>Таит�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="481"/>
         <source>Tzotzil, Zinacantu00e1n</source>
         <extracomment>Language name tzz</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
         <source>Ukrainian</source>
         <extracomment>Language name uk</extracomment>
         <translation>Украин�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
         <source>Orya</source>
         <extracomment>Language name ury</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
         <source>Uspanteco</source>
         <extracomment>Language name usp</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="492"/>
         <source>Vietnamese</source>
         <extracomment>Language name vi</extracomment>
         <translation>Вьетнам�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="496"/>
         <source>Xhosa</source>
         <extracomment>Language name xh</extracomment>
         <translation>Хо��кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="163"/>
         <source>Bavarian</source>
         <extracomment>Language name bar</extracomment>
         <translation>Бавар�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="326"/>
         <source>Lombard</source>
         <extracomment>Language name lmo</extracomment>
         <translation>Лобмард�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="403"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
         <source>Uma</source>
         <extracomment>Language name ppk
 ----------
@@ -3778,453 +3865,421 @@ Language name ppk</extracomment>
         <translation>Ума </translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="448"/>
         <source>Sranan</source>
         <extracomment>Language name srn</extracomment>
         <translation>Тонго (Суринам)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
         <source>Yiddish</source>
         <extracomment>Language name yi</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
         <source>Zapotec, San Juan Guelavu00eda</source>
         <extracomment>Language name zab</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="507"/>
         <source>Zapotec, Mitla</source>
         <extracomment>Language name zaw</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="509"/>
         <source>Chinese</source>
         <extracomment>Language name zh</extracomment>
         <translation>Китай�кий</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="511"/>
         <source>Zapotec, Amatlu00e1n</source>
         <extracomment>Language name zpo</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
         <source>Zapotec, Zoogocho</source>
         <extracomment>Language name zpq</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="515"/>
         <source>Zapotec, Yalu00e1lag</source>
         <extracomment>Language name zpu</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
         <source>Zapotec, Chichicapan</source>
         <extracomment>Language name zpv</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
         <source>Zapotec, Southern Rincon</source>
         <extracomment>Language name zsr</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
         <source>Zapotec, Quioquitani-Quieru00ed</source>
         <extracomment>Language name ztq</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
         <source>Zapotec, Yatee</source>
         <extracomment>Language name zty</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="525"/>
         <source>Zulu</source>
         <extracomment>Language name zu</extracomment>
         <translation>Зулу</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="314"/>
         <source>Footnotes</source>
         <translation>Сно�ки</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="316"/>
         <source>Strong&apos;s numbers</source>
         <translation>�омера Стронга</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="318"/>
         <source>Headings</source>
         <translation>Заголовки</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="320"/>
         <source>Morphological tags</source>
         <translation>Морфологиче�кие т�ги</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="322"/>
         <source>Lemmas</source>
         <translation>Леммы</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="324"/>
         <source>Hebrew vowel points</source>
         <translation>Точки еврей�ких гла�ных</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="326"/>
         <source>Hebrew cantillation marks</source>
         <translation>Показывать знаки еврей�кой кантил�ции</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="328"/>
         <source>Greek accents</source>
         <translation>Грече�кие ударени�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="330"/>
         <source>Red letter words</source>
         <translation>Выделение �лов кра�ным</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="332"/>
         <source>Textual variants</source>
         <translation>Тек�туальные варианты</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="334"/>
         <source>Scripture cross-references</source>
         <translation>Перекре�тные ��ылки Пи�ани�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="336"/>
         <source>Morph segmentation</source>
         <translation>Морфологиче�кое деление</translation>
     </message>
     <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation></translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
         <source>Local</source>
         <translation>Локальный</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>Удаленный</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Ветхий Завет</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>П�тикнижие Мои�еево</translation>
+        <source>Remote FTP</source>
+        <translation>Удаленный FTP</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>И�ториче�кие книги</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="32"/>
+        <source>Remote SFTP</source>
+        <translation>Удаленный SFTP</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Пророче�кие книги</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="33"/>
+        <source>Remote HTTP</source>
+        <translation>Удаленный HTTP</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>�овый Завет</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="34"/>
+        <source>Remote HTTPS</source>
+        <translation>Удаленный HTTPS</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Евангели�</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>По�лани�</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>По�лани� ап. Павла</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
         <source>HTML files</source>
         <translation>Файлы HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="438"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>All files</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>Text files</source>
         <translation>Тек�товые файлы</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="444"/>
         <source>Save file</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="130"/>
         <source>Save document ...</source>
         <translation>Сохранить документ ...</translation>
     </message>
     <message>
-        <source>Print keys</source>
-        <translation type="obsolete">Печатать ключи</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
         <source>BibleTime bookmark files</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="127"/>
         <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
         <source>unknown</source>
         <translation>неизве�тно</translation>
     </message>
     <message>
-        <source>Change description ...</source>
-        <translation type="obsolete">Изменить опи�ание ...</translation>
-    </message>
-    <message>
-        <source>Enter a new description for the chosen bookmark.</source>
-        <translation type="obsolete">Введите новое опи�ание дл� выбранной закладки.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="60"/>
         <source>New folder</source>
         <translation>�ова� директори�</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
+        <location filename="../../src/util/tool.cpp" line="48"/>
         <source>The file already exists.</source>
         <translation>Файл уже �уще�твует.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
+        <location filename="../../src/util/tool.cpp" line="49"/>
         <source>Do you want to overwrite it?</source>
         <translation>Хотите перезапи�ать файл?</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
+        <location filename="../../src/util/tool.cpp" line="69"/>
+        <location filename="../../src/util/tool.cpp" line="75"/>
         <source>Error</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>Файл невозможно �охранить.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
+        <location filename="../../src/util/tool.cpp" line="78"/>
         <source>Please check permissions etc.</source>
         <translation>Пожалуй�та, проверьте права до�тупа и т.д.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
+        <location filename="../../src/util/tool.cpp" line="197"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Будьте о�торожны, модуль �одержит конфе��иональный или �порный материал!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
+        <location filename="../../src/util/tool.cpp" line="218"/>
         <source>Version</source>
         <translation>Вер�и�</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
+        <location filename="../../src/util/tool.cpp" line="207"/>
         <source>Encrypted - needs unlock key</source>
         <translation>Зашифрован - нужен ключ разбокировки</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
+        <location filename="../../src/util/tool.cpp" line="71"/>
+        <source>Error while writing to file.</source>
+        <translation>Ошибка при запи�и файла.</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="72"/>
+        <source>Please check that enough disk space is available.</source>
+        <translation>Убедите�ь, что до�таточно �вободного ме�та на ди�ке.</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="77"/>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation>Файл не может быть открыт на чтение.</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="231"/>
         <source>Double click for more information</source>
         <translation>Двойной клик дл� дополнительной информации</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
+        <location filename="../../src/util/tool.cpp" line="213"/>
         <source>Updated version available!</source>
         <translation>До�тупна обновленна� вер�и�!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
+        <location filename="../../src/util/tool.cpp" line="226"/>
         <source>Installed version</source>
         <translation>У�тановленна� вер�и�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="273"/>
         <source>Haitian Creole</source>
         <extracomment>Language name ht</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
         <source>Kekchu00ed</source>
         <comment>kek</comment>
         <extracomment>Language name kek</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="357"/>
         <source>(Multiple languages)</source>
         <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="359"/>
         <source>Mam, Central</source>
         <extracomment>Language name mvc</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
         <source>Mam, Todos Santos Cuchumatu00e1n</source>
         <extracomment>Language name mvj</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="363"/>
         <source>Mixe, Juquila</source>
         <extracomment>Language name mxq</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="365"/>
         <source>Mixtec, Jamiltepec</source>
         <extracomment>Language name mxt</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="367"/>
         <source>Burmese</source>
         <extracomment>Language name my</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="370"/>
         <source>Norwegian Bokmu00e5l</source>
         <extracomment>Language name nb</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="372"/>
         <source>Nahuatl, Michoacu00e1n</source>
         <extracomment>Language name ncl</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
         <source>Potawatomi</source>
         <extracomment>Language name pot</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="468"/>
         <source>Klingon</source>
         <extracomment>Language name tlh</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="498"/>
         <source>Mixtec, Diuxi-Tilantongo</source>
         <extracomment>Language name xtd</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
         <source>Yoryba</source>
         <extracomment>Language name yo</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="407"/>
         <source>Verb tense changed</source>
         <translation>Слове�ное выражение изменило�ь</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>Can&apos;t write file</source>
         <translation>�е могу запи�ать в файл</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>The Sword config file can&apos;t be written!</source>
         <translation>Файл конфигурации SWORD не может быть запи�ан!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="39"/>
         <source>Export Bookmarks</source>
         <translation>Эк�порт Закладок</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="50"/>
         <source>Import bookmarks</source>
         <translation>Импорт закладок</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
+        <location filename="../../src/util/tool.cpp" line="46"/>
         <source>Overwrite File?</source>
         <translation>Перезапи�ать Файл?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="276"/>
         <source>Parsing Strong&apos;s Numbers</source>
         <translation>Обработка �омеров Стронга</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="154"/>
         <source>This shortcut conflicts with the shortcut for the following actions:</source>
         <translation>Сочетание конфликтует � �очетанием дл� �ледующего дей�тви�:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
         <source>Do you want to clear the conflicting shortcuts and continue?</source>
         <translation>Вы хотите убрать конфликтующие �очетани� и продолжить?</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="23"/>
         <source>Indexed works</source>
         <translation>Индек�ированные книги</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="24"/>
         <source>Unindexed works</source>
         <translation>�е индек�ированные книги</translation>
     </message>
@@ -4269,17 +4324,17 @@ Language name ppk</extracomment>
         <translation>Ошибка: неправильный аргумент: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="57"/>
         <source>CSS base template not found!</source>
-        <translation type="unfinished"></translation>
+        <translation>О�новной шаблон CSS не найден!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="74"/>
         <source>Default template &quot;%1&quot; not found!</source>
         <translation>Стандартный шаблон &quot;%1&quot; не найден!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="113"/>
         <source>Replace</source>
         <translation>Замена</translation>
     </message>
@@ -4287,91 +4342,91 @@ Language name ppk</extracomment>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="58"/>
         <source>OK</source>
         <comment>Dialog Button</comment>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="59"/>
         <source>Open</source>
         <comment>Dialog Button</comment>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="60"/>
         <source>Save</source>
         <comment>Dialog Button</comment>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="61"/>
         <source>Cancel</source>
         <comment>Dialog Button</comment>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="62"/>
         <source>Close</source>
         <comment>Dialog Button</comment>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="63"/>
         <source>Discard</source>
         <comment>Dialog Button</comment>
         <translation>Сбро�ить</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="64"/>
         <source>Apply</source>
         <comment>Dialog Button</comment>
         <translation>Применить</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="65"/>
         <source>Reset</source>
         <comment>Dialog Button</comment>
         <translation>Сбро�ить</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="66"/>
         <source>Restore defaults</source>
         <comment>Dialog Button</comment>
         <translation>Во��тановить �тандартные на�тройки</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="67"/>
         <source>Help</source>
         <comment>Dialog Button</comment>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="68"/>
         <source>Save All</source>
         <comment>Dialog Button</comment>
         <translation>Сохранить в�е</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="69"/>
         <source>Yes</source>
         <comment>Dialog Button</comment>
         <translation>Да</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="70"/>
         <source>Yes to all</source>
         <comment>Dialog Button</comment>
         <translation>Да дл� в�ех</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="71"/>
         <source>No</source>
         <comment>Dialog Button</comment>
         <translation>�ет</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="72"/>
         <source>No to all</source>
         <comment>Dialog Button</comment>
         <translation>�ет дл� в�ех</translation>
@@ -4380,106 +4435,102 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchOptionsArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="97"/>
         <source>Search for:</source>
         <translation>И�кать:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="104"/>
         <source>&amp;Search</source>
         <translation>&amp;Пои�к</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="106"/>
         <source>Start to search the text in the chosen works</source>
         <translation>�ачать пои�к тек�та в выбранных книгах</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="109"/>
         <source>Ch&amp;oose...</source>
         <translation>Вы&amp;брать...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="111"/>
         <source>Choose works for the search</source>
         <translation>Выбрать книги пои�ка</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="114"/>
         <source>S&amp;etup...</source>
         <translation>�&amp;а�тройка...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="133"/>
         <source>All of the words (AND is added between the words)</source>
         <translation>В�е �лова (AND будет добавлено между �ловами)</translation>
     </message>
     <message>
-        <source>(&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
-        <translation type="obsolete">(&lt;a href=&apos;syntax_help&apos;&gt;ве�ь �интак�и�&lt;/a&gt;)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="148"/>
         <source>Scope:</source>
         <translation>Диапазон:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="169"/>
         <source>The text you want to search for</source>
         <translation>Вы хотите найти �ледующий тек�т</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="173"/>
         <source>Works:</source>
         <translation>Книги:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="346"/>
         <source>No search scope</source>
         <translation>�ет диапазона пои�ка</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="128"/>
         <source>All words</source>
         <translation>В�е �лова</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="116"/>
         <source>Configure predefined scopes for search</source>
         <translation>�а�троить предопределенные диапазоны пои�ка</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="130"/>
         <source>Some words</source>
         <translation>�е�колько �лов</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
         <source>Free</source>
         <translation>Свободный</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
         <source>Some of the words (OR is added between the words)</source>
         <translation>�е�колько �лов (OR будет добавлено между �ловами)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
         <source>Full lucene syntax</source>
         <translation>Ве�ь �интак�и� lucene</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="137"/>
         <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
         <translation> (&lt;a href=&apos;syntax_help&apos;&gt;�интак�и�&lt;/a&gt;)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
         <source>Click the link to get help for search syntax</source>
         <translation>�ажмите на ��ылку дл� получени� �правки по пои�ковому �интак�и�у</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="159"/>
         <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
         <translation>Выберите диапазон (книги/главы/�тихи дл� пои�ка) .&lt;br/&gt;Применимо к Библи�м и комментари�м.</translation>
     </message>
@@ -4487,17 +4538,17 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchResultArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="85"/>
         <source>Text of the selected search result item</source>
         <translation>Тек�т выбранного результата пои�ка</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="88"/>
         <source>Select all</source>
         <translation>Выделить в�ё</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="92"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
@@ -4505,242 +4556,242 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchSyntaxHelpDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="47"/>
         <source>Search Syntax Help</source>
         <translation>Справка по Пои�ковому Синтак�и�у</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="94"/>
         <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
         <translation>В о�новном �та �правка дл� опции &apos;Ве�ь �интак�и�&apos;. Опции &apos;В�е �лова&apos; и &apos;�е�колько �лов&apos; более ограничены в �интак�и�е; &lt;a href=&apos;#wildcards&apos;&gt;шаблоны&lt;/a&gt; и &lt;a href=&apos;#fields&apos;&gt;пол�&lt;/a&gt; не поддерживают��. И�пользование других возможно�тей �интак�и�а можжет приве�ти к �транным или неправильным результатам при пои�ке по В�ем/�е�кольким �ловам.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
         <source>Which words to find</source>
         <translation>Какие �лова и�кать</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="101"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
         <source>Grouping and order</source>
         <translation>Группировка и пор�док</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="103"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
         <source>Wildcards (partial words)</source>
         <translation>Шаблоны (по ча�ти �лова)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
         <source>Text fields (different parts of text)</source>
         <translation>Пол� (разные ча�ти тек�та)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="208"/>
         <source>Other syntax features</source>
         <translation>Другие возможно�ти �интак�и�а</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
         <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
         <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
         <translation>Пои�ковые выражени� раздел�ют�� пробелами. &lt;strong&gt;AND&lt;/strong&gt; (в�е �лова), &lt;strong&gt;OR&lt;/strong&gt; (не�колько �лов) и &lt;strong&gt;NOT&lt;/strong&gt; (без �ледующего �лова) могут быть добавлены между �ловами. Е�ли не указанно �вно то и�пользует�� &lt;strong&gt;OR&lt;/strong&gt;. Знак &lt;strong&gt;+&lt;/strong&gt; означает, что �лово должно при�ут�твовать в результатах, &lt;strong&gt;-&lt;/strong&gt; означает, что �лово должно от�ут�твовать в результатах.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="119"/>
         <source>jesus AND god</source>
         <comment>Do not translate &quot;AND&quot;.</comment>
         <translation>Ии�у� AND Бог</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="121"/>
         <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
         <translation>�айдет �тихи, �одержащие оба �лова &apos;Ии�у�&apos; и &apos;Бог&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="123"/>
         <source>jesus OR god</source>
         <comment>Do not translate &quot;OR&quot;.</comment>
         <translation>Ии�у� OR Бог</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="125"/>
         <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
         <translation>�айдет �тихи, �одержащие �лова &apos;Ии�у�&apos; или &apos;Бог&apos; или оба �лова</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="127"/>
         <source>jesus NOT god</source>
         <comment>Do not translate &quot;NOT&quot;.</comment>
         <translation>Ии�у� NOT Бог</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="133"/>
         <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
         <translation>�айдет �тихи, �одержащие �лово &apos;Ии�у�&apos;, но без �лова &apos;Бог&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="131"/>
         <source>+jesus -god</source>
         <translation>+Ии�у� -Бог</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
         <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
         <translation>Слова могут быть �группированы &lt;strong&gt;круглыми �кобками&lt;/strong&gt;.Строгий пор�док �лов можно определить &lt;strong&gt;кавычками&lt;/strong&gt;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
         <source>(a AND b) OR c</source>
         <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
         <translation>(а AND б) OR в</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
         <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
         <translation>�айдет �тихи � обоими �ловами &apos;а&apos; и &apos;б&apos;, и �тихи � &apos;в&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="145"/>
         <source>&quot;says lord&quot;</source>
         <translation>&quot;говор�т то�подь&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="149"/>
         <source>&quot;says the lord&quot;</source>
         <translation>&quot;говор�т Го�подь&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="151"/>
         <source>Finds all verses with &apos;says the LORD&apos;</source>
         <translation>�айдет �тихи � &apos;говор�т Го�подь&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
         <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
         <translation>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; �оответ�твует по�ледовательно�ти из 0 или более �имволов, а &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; �оответ�твует одному любому �имволу. Шаблоны нельз� и�пользовать в начале �лова.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="160"/>
         <source>a*</source>
         <translation>а*</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="162"/>
         <source>All words beginning with &apos;a&apos;</source>
         <translation>В�е �лова начинающие�� � &apos;а&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="164"/>
         <source>a*a</source>
         <translation>а*а</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="166"/>
         <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
         <translation>&apos;��ура&apos;, &apos;аромата&apos;, агнца&apos; и т.д.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="168"/>
         <source>a?</source>
         <translation>а?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="170"/>
         <source>&apos;at&apos; and &apos;an&apos;</source>
         <translation>&apos;�р&apos; и &apos;аз&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="172"/>
         <source>a??a</source>
         <translation>а??а</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="174"/>
         <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
         <translation>&apos;�лва&apos;, &apos;�нна&apos;, &apos;�вва&apos; и т.д.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
         <source>Available text fields:</source>
         <translation>Допу�тимые пол�:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="181"/>
         <source>Searches headings</source>
         <translation>Ищет по заголовкам</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="183"/>
         <source>Searches footnotes</source>
         <translation>Ищет по �но�кам</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="185"/>
         <source>Searches Strong&apos;s numbers</source>
         <translation>Ищет по номерам Стронга</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="187"/>
         <source>Searches morphology codes</source>
         <translation>Ищет по морфологиче�ким кодам</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="189"/>
         <source>Examples:</source>
         <translation>Примеры:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="191"/>
         <source>heading:Jesus</source>
         <comment>Do not translate &quot;heading:&quot;.</comment>
         <translation>heading:Ии�у�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="193"/>
         <source>Finds headings with &apos;Jesus&apos;</source>
         <translation>�айдет заголовки, �одержащие &apos;Ии�у�&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="195"/>
         <source>footnote:Jesus AND footnote:said</source>
         <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
         <translation>footnote:Ии�у� AND footnote:�казал</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
         <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
         <translation>�айдет �но�ки, �одержащие &apos;Ии�у�&apos; и &apos;�казал&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
         <source>strong:G846</source>
         <comment>Do not translate &quot;strong:&quot;.</comment>
         <translation>strong:G846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="202"/>
         <source>Finds verses with Strong&apos;s Greek number 846</source>
         <translation>�айдет �тихи, �одержащие Грече�кий номер Стронга 846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="204"/>
         <source>morph:&quot;N-NSF&quot;</source>
         <comment>Do not translate &quot;morph:&quot;.</comment>
         <translation>morph:&quot;N-NSF&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="206"/>
         <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
         <translation>�айдет �тихи, � морфологиче�ким кодом &apos;N-NSF&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="210"/>
         <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
         <translation>BibleTime и�пользует пои�ковый движок CLucene. Вы можете узнать больше на &lt;a href=&apos;%1&apos;&gt;�транице �интак�и�а lucene&lt;/a&gt; (во внешнем обозревателе).</translation>
     </message>
@@ -4787,31 +4838,19 @@ Language name ppk</extracomment>
         <translation>Печать...</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Копировать результат пои�ка...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="231"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="241"/>
         <source>Copying search result</source>
         <translation>Копирование результата пои�ка</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Сохранить результат пои�ка...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="250"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="259"/>
         <source>Saving search result</source>
         <translation>Сохранение результата пои�ка</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Печатать результата пои�ка...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="268"/>
         <source>Printing search result</source>
         <translation>Печать результата пои�ка</translation>
     </message>
@@ -4859,14 +4898,6 @@ Language name ppk</extracomment>
         <translation>�овые границы</translation>
     </message>
     <message>
-        <source>&lt;invalid name of search range&gt;</source>
-        <translation type="obsolete">&lt;неверное название границы пои�ка&gt;</translation>
-    </message>
-    <message>
-        <source>Select a scope from the list to edit the search ranges</source>
-        <translation type="obsolete">Дл� редактировани�, выберите диапазон пои�ка из �пи�ка</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="140"/>
         <source>&amp;Add new scope</source>
         <translation>&amp;Добавить новый диапазон</translation>
@@ -4892,10 +4923,6 @@ Language name ppk</extracomment>
         <translation>Изменить им� выбранного пои�кового диапазона</translation>
     </message>
     <message>
-        <source>Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="obsolete">Измените границы пои�ка выбранного пои�кового диапазона. Изучите преду�тановленные пои�ковые диапазоны, чтобы пон�ть как задают�� границы пои�ка.</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="158"/>
         <source>The search ranges which will be used for the search, parsed to the canonical form</source>
         <translation>Пои�ковые диапазоны, которые будут и�пользованы дл� пои�ка, обработанного в канониче�кой форме</translation>
@@ -4909,43 +4936,43 @@ Language name ppk</extracomment>
 <context>
     <name>Search::CSearchDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="130"/>
         <source>Missing indices</source>
         <translation>
             </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="87"/>
         <source>Search</source>
         <translation>Пои�к</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="131"/>
         <source>The following modules need to be indexed before they can be searched in:</source>
         <translation>Следующие модули необходимо индек�ировать, чтобы делать в них пои�к:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="132"/>
         <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
         <translation>Индек�аци� может быть длительной. �ажмите &quot;Да&quot; дл� индек�ации и начала пои�ка или &quot;�ет&quot; дл� отмены пои�ка.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="236"/>
         <source>Drag any verse reference onto an open Bible window</source>
         <translation>Перетащите ��ылку �тиха в открытое окно Библии</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="241"/>
         <source>&amp;Analyze results...</source>
         <translation>&amp;�нализ результатов...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="242"/>
         <source>Show a graphical analysis of the search result</source>
         <translation>Отображает графиче�кий анализ результатов пои�ка</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="248"/>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
@@ -4987,31 +5014,19 @@ Language name ppk</extracomment>
         <translation>Печать...</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Печатать результата пои�ка...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="164"/>
         <source>Printing search result</source>
         <translation>Печать результата пои�ка</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Сохранить результат пои�ка...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="192"/>
         <source>Saving search result</source>
         <translation>Сохранение результата пои�ка</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Копировать результат пои�ка...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="210"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="228"/>
         <source>Copying search result</source>
         <translation>Копирование результата пои�ка</translation>
     </message>
@@ -5024,91 +5039,6 @@ Language name ppk</extracomment>
 <context>
     <name>StandardWorksTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation>Стандартные книги и�пользуют��, когда не указана конкретна� книга, к примеру, нажатие на ��ылку в Библии или лек�иконе.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>Библи�:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>Стандартна� Библи� и�пользует��, когда нажата ��ылка на Библию</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>Комментарий:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>Стандартный комментарий и�пользует��, когда нажата ��ылка на комментарии</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation>Лек�икон:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>Стандартный лек�икон и�пользует��, когда нажата ��ылка на лек�икон</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>�а�тавлени�:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>И�пользует�� дл� короткого на�тавлени� при �тарте программы</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>Еврей�кий лек�икон Стронга:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>Стандартный лек�икон и�пользует��, когда нажата ��ылка на Еврей�кий лек�икон</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>Грече�кий лек�икон Стронга:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>Стандартный лек�икон и�пользует��, когда нажата ��ылка на Грече�кий лек�икон</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>Еврей�кий морфологиче�кий лек�икон:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>Стандартный морфологиче�кий лек�икон и�пользует��, когда нажата ��ылка на морфологиче�кий т�г в Еврей�ком тек�те</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation>Грече�кий морфологиче�кий лек�икон:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>Стандартный морфологиче�кий лек�икон и�пользует��, когда нажата ��ылка на морфологиче�кий т�г в Грече�ком тек�те</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="62"/>
         <source></source>
         <translation></translation>
@@ -5117,112 +5047,97 @@ Language name ppk</extracomment>
 <context>
     <name>TextFiltersTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation>В�тавл�ть перено� �троки по�ле каждого �тиха</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation>Показывать номера �тихов</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation>Показывать подзаголовки</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation>Показать перекрё�тные ��ылки Пи�ани�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation>Показывать грече�кие ударени�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation>Показывать точки еврей�ких гла�ных</translation>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
+        <source></source>
+        <translation></translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallProgress</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation>Показывать знаки еврей�кой кантил�ции</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="81"/>
+        <source>Failed</source>
+        <translation>�е Выполнено</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation>Показывать морфологиче�кое деление</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="84"/>
+        <source>Completed</source>
+        <translation>Завершено</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation>И�пользовать тек�товые варианты</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="90"/>
+        <source>Cancelled</source>
+        <translation>Отменено</translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallSources</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation>Фильтры вли�ют на пред�тавление тек�та. Зде�ь вы можете указать на�тройки по-умолчанию дл� фильтров. Вы можете отдельно указать �ти на�тройки дл� каждого окна.</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installsources.cpp" line="63"/>
+        <source>Failed to refresh source %1</source>
+        <translation>�е удало�ь обновить и�точник %1</translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source></source>
-        <translation></translation>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="59"/>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="62"/>
+        <source>The text you want to search for</source>
+        <translation>Тек�т, который вы ищете</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation>�айти Тек�т</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="135"/>
+        <source>New Window</source>
+        <translation>�овое Окно</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation>Тек�т, который вы ищете</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="136"/>
+        <source>View Window</source>
+        <translation>Окно Вида</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation>Пои�к � учетом реги�тра</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="137"/>
+        <source>Text Font Size</source>
+        <translation>Размер Шрифта</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation>Учитывать &amp;реги�тр</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="138"/>
+        <source>User Interface Font Size</source>
+        <translation>Размер Шрифта Интерфей�а</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation>И�кать предыдущее ме�тонахождение тек�та</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="141"/>
+        <source>Bookshelf Manager</source>
+        <translation>Менеджер Книг</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation>&amp;�азад</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="187"/>
+        <source>Single</source>
+        <translation>Одиночный</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation>И�кать �ледующее ме�тоположение тек�та</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="188"/>
+        <source>Tabbed</source>
+        <translation>Закладками</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation>&amp;Далее</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="189"/>
+        <source>Auto-tile</source>
+        <translation>�вто-плитки</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation>Закрыть диалог</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="190"/>
+        <source>Auto-tile horizontally</source>
+        <translation>�вто-плитки горизонтально</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Закрыть</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="191"/>
+        <source>Auto-tile vertically</source>
+        <translation>�вто-плитки вертикально</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/messages/bibletime_ui_sk.ts b/i18n/messages/bibletime_ui_sk.ts
index ad41793..a100a1a 100644
--- a/i18n/messages/bibletime_ui_sk.ts
+++ b/i18n/messages/bibletime_ui_sk.ts
@@ -6,7 +6,7 @@
     <message>
         <source></source>
         <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
 This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
@@ -22,452 +22,457 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTime</name>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
+        <location filename="../../src/bibletime_init.cpp" line="741"/>
         <source>&amp;File</source>
         <translation>&amp;Súbor</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&amp;View</source>
         <translation>&amp;Zobrazenie</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&amp;Search</source>
         <translation>&amp;Hľadanie</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&amp;Window</source>
         <translation>&amp;Okno</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&amp;ttings</source>
         <translation>Nas&amp;tavenia</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&amp;Help</source>
         <translation>&amp;Pomocník</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&amp;Show toolbar</source>
         <translation>&amp;Zobraziť panel nástrojov</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&amp;Fullscreen mode</source>
         <translation>&amp;Celá obrazovka</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&amp;Quit</source>
         <translation>&amp;Koniec</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
+        <location filename="../../src/bibletime_init.cpp" line="251"/>
         <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
-        <translation type="unfinished">Otvoriť Biblické štúdium Ako (Howto), ktoré je sú�asťou BibleTime.&lt;br/&gt; Táto príru�ka je úvodom ako študovať Bibliu efektívnym spôsobom.</translation>
+        <translation>Otvoriť príru�ku (je sú�asťou BibleTime) ako študovať Bibliu.&lt;br/&gt; Táto príru�ka je úvod do efektívneho štúdia Biblie.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
+        <location filename="../../src/bibletime_init.cpp" line="256"/>
         <source>Information about the BibleTime program</source>
         <translation>Informácie o programe BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation type="unfinished">&amp;Uložiť reláciu</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>N&amp;a�ítať reláciu</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&amp;Delete session</source>
         <translation>O&amp;dstrániť reláciu</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&amp;Arrangement mode</source>
         <translation>Režim &amp;usporiadania</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&amp;Manual mode</source>
         <translation>&amp;Manuálny režim</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &amp;vertically</source>
         <translation>Automaticky zarovnať &amp;zvisle</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &amp;horizontally</source>
         <translation>Automaticky zarovnať &amp;vodorovne</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&amp;cascade</source>
         <translation>&amp;Automaticky kaskádovať</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&amp;Cascade</source>
         <translation>&amp;Kaskádovať</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &amp;vertically</source>
         <translation>Zarovnať &amp;zvisle</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &amp;horizontally</source>
         <translation>Zarovnať &amp;vodorovne</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&amp;ose all windows</source>
         <translation>Zatv&amp;oriť všetky okná</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
+        <location filename="../../src/bibletime_init.cpp" line="224"/>
         <source>Close all open windows inside BibleTime</source>
         <translation>Zatvoriť všetky okná v BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
+        <location filename="../../src/bibletime_init.cpp" line="241"/>
         <source>&amp;Handbook</source>
         <translation>&amp;Príru�ka</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&amp;Bible Study Howto</source>
         <translation>&amp;Biblické štúdium Ako (Howto)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
+        <location filename="../../src/bibletime_slots.cpp" line="533"/>
         <source>Please enter a name for the new session.</source>
         <translation>Vložte prosím názov novej relácie.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
+        <location filename="../../src/bibletime_slots.cpp" line="541"/>
+        <source>Session already exists</source>
+        <translation>Relácia už existuje</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_slots.cpp" line="542"/>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation>Relácia s názvom &quot;%1&quot; už existuje. Zadajte prosím iný názov.</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="107"/>
         <source>Quit BibleTime</source>
         <translation>Ukon�iť BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
+        <location filename="../../src/bibletime_init.cpp" line="114"/>
         <source>Toggle fullscreen mode of the main window</source>
         <translation>Prepnúť celoobrázkový režim hlavného okna</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
+        <location filename="../../src/bibletime_init.cpp" line="123"/>
         <source>Search in &amp;open works...</source>
-        <translation>Hľadať v &amp;otvorených dielach...</translation>
+        <translation>Hľadať v &amp;otvorených dielach…</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &amp;Bible...</source>
-        <translation>Hľadať v štandardnej &amp;Biblií...</translation>
+        <translation>Hľadať v štandardnej &amp;Biblií…</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &amp;new session...</source>
-        <translation>Uložiť &amp;novú reláciu...</translation>
+        <translation>Uložiť &amp;novú reláciu…</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
+        <location filename="../../src/bibletime_init.cpp" line="140"/>
         <source>Create and save a new session</source>
         <translation>Vytvorí a uloží novú reláciu</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
+        <location filename="../../src/bibletime_init.cpp" line="147"/>
         <source>Manually arrange the open windows</source>
         <translation>Manuálne usporiadať otvorené okná</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
+        <location filename="../../src/bibletime_init.cpp" line="154"/>
         <source>Automatically tile the open windows vertically (arrange side by side)</source>
         <translation>Automaticky vertikálne zarovnáva otvorené okná (okraj vedľa okraju)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
+        <location filename="../../src/bibletime_init.cpp" line="161"/>
         <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
         <translation>Automaticky horizontálne zarovnáva otvorené okná (okraj vedľa okraju)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
+        <location filename="../../src/bibletime_init.cpp" line="165"/>
         <source>Auto-&amp;tile</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dlaždice automaticky</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
+        <location filename="../../src/bibletime_init.cpp" line="168"/>
         <source>Automatically tile the open windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Automaticky rozmiestniť otvorené okná ako dlaždice</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
+        <location filename="../../src/bibletime_init.cpp" line="172"/>
         <source>Ta&amp;bbed</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Karty</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
+        <location filename="../../src/bibletime_init.cpp" line="175"/>
         <source>Automatically tab the open windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Automaticky umiestniť okná do kariet</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
+        <location filename="../../src/bibletime_init.cpp" line="182"/>
         <source>Automatically cascade the open windows</source>
         <translation>Automaticky kaskáduje otvorené okná</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
+        <location filename="../../src/bibletime_init.cpp" line="189"/>
         <source>Cascade the open windows</source>
         <translation>Kaskádovať otvorené okná</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
+        <location filename="../../src/bibletime_init.cpp" line="193"/>
         <source>&amp;Tile</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dlaždice</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
+        <location filename="../../src/bibletime_init.cpp" line="196"/>
         <source>Tile the open windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozmiestniť otvorené okná ako dlaždice</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
+        <location filename="../../src/bibletime_init.cpp" line="203"/>
         <source>Vertically tile (arrange side by side) the open windows</source>
         <translation>Vertikálne uložiť (okraj vedľa okraju) otvorené okná</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
+        <location filename="../../src/bibletime_init.cpp" line="210"/>
         <source>Horizontally tile (arrange on top of each other) the open windows</source>
         <translation>Horizontálne uložiť (okraj vedľa okraju) otvorené okná</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
+        <location filename="../../src/bibletime_init.cpp" line="214"/>
         <source>Close &amp;window</source>
-        <translation type="unfinished">&amp;Zatvoriť okno</translation>
+        <translation>&amp;Zatvoriť okno</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
+        <location filename="../../src/bibletime_init.cpp" line="217"/>
         <source>Close the current open window</source>
-        <translation type="unfinished">Zavorí aktuálne okno</translation>
+        <translation>Zatvoriť aktuálne okno</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
+        <location filename="../../src/bibletime_init.cpp" line="228"/>
         <source>&amp;Configure BibleTime...</source>
-        <translation>Kon&amp;figurácia Bibletime...</translation>
+        <translation>Kon&amp;figurácia BibleTime…</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime&apos;s preferences</source>
         <translation>Upraviť BibleTime nastavenia</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
+        <location filename="../../src/bibletime_init.cpp" line="234"/>
         <source>Bookshelf &amp;Manager...</source>
-        <translation>Správca k&amp;nižnice...</translation>
+        <translation>Správca k&amp;nižnice…</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
+        <location filename="../../src/bibletime_init.cpp" line="237"/>
         <source>Configure your bookshelf and install/update/remove/index works</source>
         <translation>Konfigurácia vašej knižnice a inštalácia/aktualizácia/odstránenie/indexovanie diel</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
+        <location filename="../../src/bibletime_init.cpp" line="244"/>
         <source>Open BibleTime&apos;s handbook</source>
         <translation>Otvoriť BibleTime príru�ku</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&amp;Tip of the day...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Tip dňa…</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
+        <location filename="../../src/bibletime_init.cpp" line="263"/>
         <source>Show tips about BibleTime</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť tipy BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
+        <location filename="../../src/bibletime_init.cpp" line="402"/>
         <source>Toggle visibility of the bookshelf window</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť/skryť okno knižnice</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
+        <location filename="../../src/bibletime_init.cpp" line="406"/>
         <source>Toggle visibility of the bookmarks window</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť/skryť okno záložiek</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
+        <location filename="../../src/bibletime_init.cpp" line="410"/>
         <source>Toggle visibility of the mag window</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť/skryť okno s informáciami</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
+        <location filename="../../src/bibletime_init.cpp" line="735"/>
         <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Hlavný nástrojový panel</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
+        <location filename="../../src/bibletime_init.cpp" line="736"/>
         <source>Navigation toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Naviga�ný panel</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
+        <location filename="../../src/bibletime_init.cpp" line="737"/>
         <source>Works toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Panel s dielami</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
+        <location filename="../../src/bibletime_init.cpp" line="738"/>
         <source>Tools toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Nástrojový panel</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
+        <location filename="../../src/bibletime_init.cpp" line="739"/>
         <source>Format toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Formátovací panel</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
+        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <source>Sw&amp;itch session</source>
+        <translation>Pr&amp;epnúť reláciu</translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="777"/>
         <source>Show main toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť hlavný panel</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
+        <location filename="../../src/bibletime_init.cpp" line="780"/>
         <source>Show navigation bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť hlavný panel</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
+        <location filename="../../src/bibletime_init.cpp" line="783"/>
         <source>Show works toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť panel diel</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
+        <location filename="../../src/bibletime_init.cpp" line="786"/>
         <source>Show tools toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť panel nástrojov</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
+        <location filename="../../src/bibletime_init.cpp" line="789"/>
         <source>Show formatting toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť formátovací panel</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
+        <location filename="../../src/bibletime_init.cpp" line="792"/>
         <source>Show bookshelf</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť knižnicu</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
+        <location filename="../../src/bibletime_init.cpp" line="795"/>
         <source>Show bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť záložky</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
+        <location filename="../../src/bibletime_init.cpp" line="798"/>
         <source>Show mag</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť informácie</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
+        <location filename="../../src/bibletime_init.cpp" line="743"/>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation>Panely</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <location filename="../../src/bibletime_init.cpp" line="774"/>
         <source>Show toolbars in text windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť panel nástrojov v textových oknách</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
+        <location filename="../../src/bibletime_init.cpp" line="801"/>
         <source>Show parallel text headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť nadpisy paralelných textov</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
+        <location filename="../../src/bibletime_init.cpp" line="747"/>
         <source>O&amp;pen windows</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Otvoriť okná</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show &quot;Whats this widget&quot; dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť dialóg &quot;Čo je toto&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
+        <location filename="../../src/bibletime_init.cpp" line="954"/>
         <source>Whats this widget?</source>
-        <translation type="unfinished"></translation>
+        <translation>ÄŒo je toto?</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
+        <location filename="../../src/bibletime_init.cpp" line="126"/>
         <source>Search in all works that are currently open</source>
         <translation>Hľadať vo všetkých dielach, ktoré sú otvorené</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
+        <location filename="../../src/bibletime_init.cpp" line="133"/>
         <source>Search in the standard Bible</source>
         <translation>Hľadať v štandardnej biblií</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
+        <location filename="../../src/bibletime_slots.cpp" line="532"/>
         <source>New Session</source>
         <translation>Nová relácia</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
+        <location filename="../../src/bibletime.cpp" line="77"/>
         <source>Initializing the SWORD engine...</source>
-        <translation>Spúšťanie systému SWORD...</translation>
+        <translation>Spúšťanie systému SWORD…</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
+        <location filename="../../src/bibletime.cpp" line="85"/>
         <source>Creating BibleTime&apos;s user interface...</source>
-        <translation>Vytváranie BibleTime rozhrania...</translation>
+        <translation>Vytváranie BibleTime rozhrania…</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
+        <location filename="../../src/bibletime.cpp" line="92"/>
         <source>Initializing menu- and toolbars...</source>
-        <translation>Inicializácia ponuky a panelov...</translation>
+        <translation>Inicializácia ponuky a panelov…</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Unlock Work</source>
         <translation>Odomknúť dielo</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Enter the unlock key for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vložte kľú� pre %1.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
+        <location filename="../../src/bibletime.cpp" line="214"/>
         <source>Warning: Invalid unlock key!</source>
-        <translation type="unfinished"></translation>
+        <translation>Varovanie: neplatný kľú�!</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
+        <location filename="../../src/bibletime.cpp" line="215"/>
         <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kľú�, ktorý ste vložili, neodomkol tento modul. Prosím skúste znovu.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
+        <location filename="../../src/bibletime_init.cpp" line="255"/>
         <source>&amp;About BibleTime</source>
-        <translation>&amp;O Bibletime</translation>
+        <translation>&amp;O BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
+        <location filename="../../src/bibletime_init.cpp" line="733"/>
         <source>Bookmarks</source>
         <translation>Záložky</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
+        <location filename="../../src/bibletime_init.cpp" line="734"/>
         <source>Mag</source>
         <translation>Informácie</translation>
     </message>
@@ -475,22 +480,23 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTimeApp</name>
     <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
+        <location filename="../../src/bibletimeapp.cpp" line="59"/>
+        <location filename="../../src/mobile/bibletimeapp.cpp" line="63"/>
         <source>Fatal error!</source>
-        <translation type="unfinished"></translation>
+        <translation>Kritická chyba!</translation>
     </message>
 </context>
 <context>
     <name>BtAboutDialog</name>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
         <source>BibleTime is an easy to use but powerful Bible study tool.</source>
-        <translation>BibleTime sa ľahko používa, ale je mocný nástroj na štúdium Biblie.</translation>
+        <translation>BibleTime sa ľahko používa, a zároveň je mocným nástrojom na štúdium Biblie.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="271"/>
         <source>BibleTime is released under the GPL license. You can download and use the program for personal, private, public or commercial purposes without restrictions, but can give away or distribute the program only if you also distribute the corresponding source code.</source>
-        <translation type="unfinished"></translation>
+        <translation>BibleTime je vydaný pod licenciou GPL. Môžete si tento program stiahnuť a používať pre osobné, verejné alebo aj komer�né ú�ely bez obmedzenia. Pokiaľ však program distribuujete �alej, musíte spolu s ním distribuovať aj jeho zdrojové kódy.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="277"/>
@@ -498,197 +504,197 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Nižšie je možné dokon�iť právne obmedzenia.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="109"/>
         <source>About BibleTime</source>
-        <translation>O Bibletime</translation>
+        <translation>O BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="121"/>
         <source>&amp;BibleTime</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="126"/>
         <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hľadáme vývojárov a prekladateľov. Pokiaľ sa chcete pridať, pošlite e-mail na %1.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="130"/>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished">(c)1999-2014, The BibleTime Team</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="137"/>
         <source>&amp;Contributors</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Prispievatelia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="148"/>
         <source>The following people contributed to BibleTime:</source>
         <translation>Nasledujúci ľudia prispeli do BibleTime:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="150"/>
         <source>documentation and translation manager</source>
         <translation>správca dokumentácie a prekladov</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="172"/>
         <source>project manager</source>
-        <translation type="unfinished"></translation>
+        <translation>projektový manažér</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>tester</source>
-        <translation type="unfinished"></translation>
+        <translation>tester</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>usability expert</source>
-        <translation type="unfinished"></translation>
+        <translation>expert na použiteľnosť</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="220"/>
         <source>Some names may be missing, please email %1 if you notice errors or omissions.</source>
-        <translation type="unfinished"></translation>
+        <translation>Niektoré mená môžu chýbať. Ak ste našli chybu alebo nie�o chýba, pošlite nám o tom správu na %1.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="237"/>
         <source>BibleTime makes use of the SWORD Project. The SWORD Project is the CrossWire Bible Society&apos;s free Bible software project. Its purpose is to create cross-platform open-source tools &amp;mdash; covered by the GNU General Public License &amp;mdash; that allow programmers and Bible societies to write new Bible software more quickly and easily.</source>
-        <translation type="unfinished"></translation>
+        <translation>BibleTime využíva projekt SWORD. Projekt SWORD je slobodný softvér organizácie Crosswire Biblie Society Biblie. Jej cieľom je vytvoriť multiplatformové open-source nástroje &amp;mdash; vydané pod GNU General Public License, ktorá umožňuje programátorom a biblickým spolo�nostiam, aby rýchlejšie a ľahšie napísali nový biblický softvér.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="243"/>
         <source>The SWORD Project: </source>
-        <translation type="unfinished"></translation>
+        <translation>The SWORD Project:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="251"/>
         <source>&amp;Qt</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Qt</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="254"/>
         <source>Qt toolkit version %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt verzia %1</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="260"/>
         <source>More info...</source>
-        <translation type="unfinished"></translation>
+        <translation>Viac informácií…</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="265"/>
         <source>&amp;License</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Licencia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
         <source>designer</source>
         <translation>dizajnér</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="139"/>
         <source>developer</source>
         <translation>vývojár</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
         <source>project founder</source>
-        <translation type="unfinished"></translation>
+        <translation>zakladateľ projektu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="157"/>
         <source>packager</source>
         <translation>tvorca balí�ka</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="158"/>
         <source>creator of The Sword Project</source>
         <translation>tvorca projektu Sword</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
         <source>domain sponsor</source>
         <translation>sponzor domény</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
         <source>howto</source>
         <translation>ako</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="141"/>
         <source>artist</source>
-        <translation type="unfinished"></translation>
+        <translation>umelec</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="173"/>
         <source>documentation</source>
         <translation>dokumentácia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="188"/>
         <source>The following people translated BibleTime into their language:</source>
         <translation>Nasledujúci ľudia preložili BibleTime do svojho jazyka:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="231"/>
         <source>&amp;SWORD</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;SWORD</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="235"/>
         <source>SWORD library version %1</source>
-        <translation>Verzia  %1 knižnice SWORD</translation>
+        <translation>Verzia %1 knižnice SWORD</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="256"/>
         <source>This program uses Qt version %1.</source>
-        <translation type="unfinished">Tento program pouzíva Qt verziu %1.</translation>
+        <translation>Tento program používa Qt verziu %1.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btaboutdialog.cpp" line="258"/>
         <source>Qt is a cross-platform application and UI framework, created with C++ language. It has been released under the LGPL license.</source>
-        <translation type="unfinished">QT je multiplatformová aplikácia a UI rámec, vytvorený v jazyku C++. Qt bolo vydané pod licenciou LGPL.</translation>
+        <translation>QT je multiplatformová C++ knižnica. Qt bolo vydané pod licenciou LGPL.</translation>
     </message>
 </context>
 <context>
     <name>BtBibleKeyWidget</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="110"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="unfinished">Posúvanie cez položky v zozname. Stla�ením tla�idla a pohybom myši presuniete položku hore alebo dole.</translation>
+        <translation>Posúvanie cez položky v zozname. Stla�ením tla�idla a pohybom myši presuniete položku hore alebo dole.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
         <source>Next book</source>
-        <translation type="unfinished">Ďalšia kniha</translation>
+        <translation>Ďalšia kniha</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
         <source>Previous book</source>
-        <translation type="unfinished">Predchádzajúca kniha</translation>
+        <translation>Predchádzajúca kniha</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="117"/>
         <source>Next chapter</source>
-        <translation type="unfinished">Nasledujúca kapitola</translation>
+        <translation>Nasledujúca kapitola</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
         <source>Previous chapter</source>
-        <translation type="unfinished">Predchádzajúca kapitola</translation>
+        <translation>Predchádzajúca kapitola</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="122"/>
         <source>Next verse</source>
-        <translation type="unfinished">Nasledujúci verš</translation>
+        <translation>Nasledujúci verš</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
         <source>Previous verse</source>
-        <translation type="unfinished">Predchádzajúci verš</translation>
+        <translation>Predchádzajúci verš</translation>
     </message>
 </context>
 <context>
@@ -729,71 +735,71 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="156"/>
         <source>&amp;Unlock...</source>
-        <translation>O&amp;domknúť...</translation>
+        <translation>O&amp;domknúť…</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="157"/>
         <source>&amp;About...</source>
-        <translation>&amp;O...</translation>
+        <translation>&amp;O…</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="159"/>
         <source>There are currently no works installed. Please click the button below to install new works.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktuálne nie sú nainštalované žiadne diela. Kliknutím na tla�idlo ich môžete nainštalovať.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="161"/>
         <source>&amp;Install works...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Inštalovať diela…</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="173"/>
         <source>Warning: Module locked!</source>
-        <translation type="unfinished"></translation>
+        <translation>Varovanie: Modul je uzamknutý!</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="174"/>
         <source>You are trying to access an encrypted module. Please provide an unlock key in the following dialog to open the module.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokúšate sa pristúpiť k uzamknutému modulu. K jeho odomknutiu vložte prosím v nasledujúcom dialógu kľú�.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="223"/>
         <source>&amp;Search in %1...</source>
-        <translation>&amp;Hľadanie v %1...</translation>
+        <translation>&amp;Hľadanie v %1…</translation>
     </message>
 </context>
 <context>
     <name>BtBookshelfGroupingMenu</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
         <source>Category/Language</source>
-        <translation type="unfinished">Kategória/Jazyk</translation>
+        <translation>Kategória/Jazyk</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
         <source>Category</source>
-        <translation type="unfinished">Kategória</translation>
+        <translation>Kategória</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
         <source>Language/Category</source>
-        <translation type="unfinished">Jazyk/Kategória</translation>
+        <translation>Jazyk/Kategória</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="105"/>
         <source>Language</source>
-        <translation type="unfinished">Jazyk</translation>
+        <translation>Jazyk</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="108"/>
         <source>No grouping</source>
-        <translation type="unfinished">Bez zoskupovania</translation>
+        <translation>Bez zoskupovania</translation>
     </message>
 </context>
 <context>
     <name>BtBookshelfModel</name>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
+        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="78"/>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
@@ -801,144 +807,203 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfWidget</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="157"/>
         <source>Fi&amp;lter:</source>
-        <translation type="unfinished">Fi&amp;lter:</translation>
+        <translation>Fi&amp;lter:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="158"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
         <source>Grouping</source>
-        <translation type="unfinished">Zoskupovanie</translation>
+        <translation>Zoskupovanie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="159"/>
         <source>Change the grouping of items in the bookshelf.</source>
-        <translation type="unfinished">Zmeniť položku zoskupovania v knižnici.</translation>
+        <translation>Zmeniť položku zoskupovania v knižnici.</translation>
     </message>
     <message>
-        <source>Category/Language</source>
-        <translation type="obsolete">Kategória/Jazyk</translation>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
+        <source>Show/hide works</source>
+        <translation>Zobraziť/Skryť diela</translation>
     </message>
+</context>
+<context>
+    <name>BtChapterDropdownChooserButton</name>
     <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategória</translation>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
+        <source>Select chapter</source>
+        <translation>Vyberte kapitolu</translation>
     </message>
+</context>
+<context>
+    <name>BtConfig</name>
     <message>
-        <source>Language/Category</source>
-        <translation type="obsolete">Jazyk/Kategória</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="46"/>
+        <source>Old testament</source>
+        <translation>Starý zákon</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation type="obsolete">Jazyk</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="47"/>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation>Mojžišove knihy/Pentateuch/Tóra</translation>
     </message>
     <message>
-        <source>No grouping</source>
-        <translation type="obsolete">Bez zoskupovania</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="48"/>
+        <source>History</source>
+        <translation>História</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
-        <source>Show/hide works</source>
-        <translation type="unfinished">Zobraziť/Skryť diela</translation>
+        <location filename="../../src/backend/config/btconfig.cpp" line="49"/>
+        <source>Prophets</source>
+        <translation>Proroci</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="50"/>
+        <source>New testament</source>
+        <translation>Nový zákon</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="51"/>
+        <source>Gospels</source>
+        <translation>Evanjeliá</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="52"/>
+        <source>Letters/Epistles</source>
+        <translation>Listy/Epištoly</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="53"/>
+        <source>Paul&apos;s Epistles</source>
+        <translation>Pavlove epištoly</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="89"/>
+        <source>Error loading configuration!</source>
+        <translation>Chyba pri na�ítavaní konfigurácie!</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="90"/>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation>Nepodarilo sa na�ítať konfiguráciu BibleTime, pretože sa zdá, že konfigura�ný súbor je z novšej verzie BibleTime. To je pravdepodobne spôsobené tým, že bola nainštalovaná staršia verzia BibleTime. Na�ítanie novej konfigurácie môže mať za následok &lt;b&gt;stratu dát&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Ešte stále chcete na�ítať novú konfiguráciu? Stla�ením tla�idla &quot;Nie&quot;, sa BibleTime okamžite ukon�í.</translation>
     </message>
 </context>
 <context>
-    <name>BtChapterDropdownChooserButton</name>
+    <name>BtConfigCore</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
-        <source>Select chapter</source>
-        <translation>Vyberte kapitolu</translation>
+        <location filename="../../src/backend/config/btconfigcore.cpp" line="62"/>
+        <source>Default Session</source>
+        <translation>Štandardná relácia</translation>
     </message>
 </context>
 <context>
     <name>BtDisplaySettingsButton</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="103"/>
         <source>Use linebreaks after each verse</source>
-        <translation type="unfinished">Použiť ukon�enie riadkov po každom verši</translation>
+        <translation>Použiť ukon�enie riadkov po každom verši</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
         <source>Show verse numbers</source>
-        <translation type="unfinished">Zobraziť �ísla veršov</translation>
+        <translation>Zobraziť �ísla veršov</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
         <source>Show headings</source>
-        <translation type="unfinished">Zobraziť nadpisy</translation>
+        <translation>Zobraziť nadpisy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
         <source>Highlight words of Jesus</source>
-        <translation type="unfinished">Zvýrazniť Ježišove slová</translation>
+        <translation>Zvýrazniť Ježišove slová</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
         <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Zobraziť body hebrejských hlások</translation>
+        <translation>Zobraziť hebrejské zna�ky samohlások</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
         <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Zobraziť hebrejské liturgické znaky</translation>
+        <translation>Zobraziť hebrejské zna�ky prízvuku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
         <source>Show Greek accents</source>
-        <translation type="unfinished">Zobraziť grécke akcenty</translation>
+        <translation>Zobraziť grécke zna�ky prízvuku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
         <source>Use alternative textual variant</source>
-        <translation type="unfinished">Použiť alternatívne textové variácie</translation>
+        <translation>Použiť alternatívne varianty textu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
         <source>Show scripture cross-references</source>
-        <translation type="unfinished">Zobraziť krížové odkazy Biblie</translation>
+        <translation>Zobraziť krížové odkazy v Biblií</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
         <source>Show footnotes</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť poznámky</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
         <source>Show morph segmentation</source>
-        <translation type="unfinished">Zobraziť morfologické delenie</translation>
+        <translation>Zobraziť morfologické delenie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="120"/>
         <source>Display settings</source>
-        <translation type="unfinished">Zobraziť nastavenia</translation>
+        <translation>Zobraziť nastavenia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="123"/>
         <source>Display settings: No options available</source>
-        <translation type="unfinished">Zobraziť nastavenia: nie sú žiadne dostupné možnosti</translation>
+        <translation>Zobraziť nastavenia: Nie sú dostupné žiadne možnosti</translation>
     </message>
 </context>
 <context>
     <name>BtEditBookmarkDialog</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="71"/>
         <source>Edit Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Upraviť záložku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Umiestnenie:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
         <source>Title:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nadpis:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>Popis:</translation>
+    </message>
+</context>
+<context>
+    <name>BtFindWidget</name>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="28"/>
+        <source>Previous</source>
+        <translation>Späť</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="29"/>
+        <source>Next</source>
+        <translation>Dopredu</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="74"/>
+        <source>Match case</source>
+        <translation>Dodržiavať veľkosť písmen</translation>
     </message>
 </context>
 <context>
@@ -946,126 +1011,114 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
         <source>Font name:</source>
-        <translation type="unfinished">Názov písma:</translation>
+        <translation>Názov písma:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="98"/>
         <source>Font style:</source>
-        <translation type="unfinished">Štýl písma:</translation>
+        <translation>Štýl písma:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="99"/>
         <source>Size:</source>
-        <translation type="unfinished">Veľkosť:</translation>
+        <translation>Veľkosť:</translation>
     </message>
 </context>
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <source>You can specify a custom font for each language.</source>
-        <translation type="obsolete">Môžete si vybrať vlastné písmo pre každý jazyk.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="151"/>
         <source>&amp;Language:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Jazyk:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
         <source>The font selection below will apply to all texts in this language</source>
-        <translation type="unfinished">Výber písma sa použije na všetky texty v tomto jazyku</translation>
+        <translation>Výber písma sa použije na všetky texty v tomto jazyku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
         <source>Use custom font</source>
-        <translation type="unfinished">Použiť vlastné písmo</translation>
+        <translation>Použiť vlastné písmo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
         <source>Optionally specify a custom font for each language:</source>
-        <translation type="unfinished"></translation>
+        <translation>Voliteľne môžete ur�iť vlastné písmo pre každý jazyk:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="150"/>
         <source>Fonts</source>
-        <translation type="unfinished">Písma</translation>
+        <translation>Písma</translation>
     </message>
 </context>
 <context>
     <name>BtIndexPage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="107"/>
         <source>%1 KiB</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="114"/>
         <source>0 KiB</source>
-        <translation type="unfinished"></translation>
+        <translation>0 KiB</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="124"/>
         <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
-        <translation>Ak je zvolené, tak tie indexy, ku ktorým nebude existovať dielo, budu vymazané pri spustení Bibletime</translation>
+        <translation>Ak je zvolené, tak tie indexy, ku ktorým nebude existovať dielo, budu vymazané pri spustení BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
         <source>Automatically delete orphaned indexes when BibleTime starts</source>
         <translation>Automaticky odstrániť osamotené indexy pri spustení BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="127"/>
         <source>Delete the selected indexes</source>
         <translatorcomment>Vymazať zvolené indexi</translatorcomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
         <source>Delete</source>
         <translation>Zmazať</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="130"/>
         <source>Create new indexes for the selected works</source>
         <translation>Vytvoriť nové indexy pre zvolené diela</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Work</source>
         <translation>Dielo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Index size</source>
         <translation>Veľkosť indexu</translation>
     </message>
     <message>
-        <source>Create new search indexes and delete created indexes for the installed works.</source>
-        <translation type="obsolete">Vytvoriť nové indexy a zmazať vytvorené indexy pre nainštalované diela.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="122"/>
         <source>Search Indexes</source>
         <translation>Prehľadávať indexy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="91"/>
         <source>Indexed Works</source>
         <translation>Indexované diela</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="96"/>
         <source>Unindexed Works</source>
         <translation>Neindexované diela</translation>
     </message>
     <message>
-        <source>KiB</source>
-        <translation type="obsolete">KiB</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
         <source>Create...</source>
-        <translation>Vytvoriť...</translation>
+        <translation>Vytvoriť…</translation>
     </message>
 </context>
 <context>
@@ -1073,35 +1126,35 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="64"/>
         <source>Install/Update works?</source>
-        <translation type="unfinished">Inštalovať/Aktualizovať diela?</translation>
+        <translation>Inštalovať/Aktualizovať diela?</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="67"/>
         <source>Do you really want to install these works?</source>
-        <translation type="unfinished">Skuto�ne chcete nainštalovať tieto diela?</translation>
+        <translation>Skuto�ne chcete nainštalovať tieto diela?</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="68"/>
         <source>Only one version of a work can be installed at the same time. Select only one if there are items marked with red.</source>
-        <translation type="unfinished">Iba jedna verzia diela môže byť nainštalovaná v rovnakom �ase. Vyberte iba jedno, ak sp tam položky ozna�ené �ervenou.</translation>
+        <translation>Iba jedna verzia diela môže byť nainštalovaná v rovnakom �ase. Vyberte iba jednu položku, pokiaľ sú niektoré ozna�ené �ervenou.</translation>
     </message>
 </context>
 <context>
     <name>BtInstallModuleChooserDialogModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="88"/>
         <source>Work</source>
-        <translation type="unfinished">Dielo</translation>
+        <translation>Dielo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="89"/>
         <source>Installation source</source>
-        <translation type="unfinished"></translation>
+        <translation>Zdroj inštalácie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="90"/>
         <source>Version</source>
-        <translation type="unfinished">Verzia</translation>
+        <translation>Verzia</translation>
     </message>
 </context>
 <context>
@@ -1112,102 +1165,94 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>Inštalovať/Aktualizovať</translation>
     </message>
     <message>
-        <source>Install and update works. Add remote or local sources, refresh them, select the works to be installed/updated and click Install.&lt;br/&gt;&lt;b&gt;WARNING:&lt;/b&gt; If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="obsolete">Inštalovať a aktualizovať diela. Pridajte vzdialené alebo lokálne zdroje, obnovte ich, vyberte diela, ktoré sa majú nainštalovať/zaktualizovať a kliknite na Inštalovať.&lt;br/&gt;&lt;b&gt;VAROVANIE:&lt;/b&gt; Ak ste v krajine, kde je prenasledovanie a nechcete riskovať odhalenie, tak nepoužívajte vzdialené zdroje.</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="265"/>
         <source>WARNING!!!</source>
-        <translation type="unfinished"></translation>
+        <translation>VAROVANIE!!!</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="266"/>
         <source>If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokiaľ žijete v krajine, kde je prenasledovanie a nechcete riskovať odhalenie, nepoužívajte vzdialené zdroje.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="269"/>
         <source>Select installation &amp;source:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyberte &amp;zdroj inštalácie:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="270"/>
         <source>&amp;Add...</source>
-        <translation type="unfinished">Pridať...</translation>
+        <translation>Prid&amp;ať…</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="271"/>
         <source>Add new source</source>
-        <translation type="unfinished">Pridať nový zdroj</translation>
+        <translation>Pridať nový zdroj</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="272"/>
         <source>&amp;Delete...</source>
-        <translation type="unfinished">Zmazať...</translation>
+        <translation>O&amp;dstrániť…</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="273"/>
         <source>Delete this source</source>
-        <translation type="unfinished">Zmazať tento zdroj</translation>
+        <translation>Zmazať tento zdroj</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="275"/>
         <source>Select &amp;works to install:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vy&amp;berte diela pre inštalovanie:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="277"/>
         <source>Install &amp;folder:</source>
-        <translation type="unfinished"></translation>
+        <translation>I&amp;nštala�ný prie�inok:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="278"/>
         <source>The folder where the new works will be installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Prie�inok, do ktorého budú diela nainštalované</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="279"/>
         <source>Configure folders where works are installed and found</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfigurovanie prie�inkov, kde sa budú nachádzať a inštalovať diela</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="280"/>
         <source>&amp;Install...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Inštalovať….</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="254"/>
         <source>Start installation of %1 works from %2 sources:</source>
-        <translation type="unfinished"></translation>
+        <translation>Spustiť inštaláciu %1 diel z %2 zdrojov:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="258"/>
         <source>Start installation:</source>
-        <translation type="unfinished"></translation>
+        <translation>Spustenie inštalácie:</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="313"/>
         <source>Warning</source>
-        <translation type="unfinished">Varovanie</translation>
+        <translation>Varovanie</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="313"/>
         <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="unfinished">Do cieľového prie�inku nie je možné zapisovať, alebo neexistuje. Inštalácia zlyhá, ak tento problém nevyriešite.</translation>
+        <translation>Do cieľového prie�inku nie je možné zapisovať, alebo neexistuje. Inštalácia zlyhá, ak tento problém nevyriešite.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="388"/>
         <source>Delete Source?</source>
-        <translation type="unfinished">Odstrániť zdroj?</translation>
+        <translation>Odstrániť zdroj?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="389"/>
         <source>Do you really want to delete this source?</source>
-        <translation type="unfinished">Skuto�ne chcete odstrániť tento zdroj?</translation>
-    </message>
-    <message>
-        <source>Install...</source>
-        <translation type="obsolete">Inštalovať...</translation>
+        <translation>Skuto�ne chcete odstrániť tento zdroj?</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="281"/>
@@ -1218,19 +1263,19 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPageModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="75"/>
         <source>Work</source>
-        <translation type="unfinished">Dielo</translation>
+        <translation>Dielo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="76"/>
         <source>Version</source>
-        <translation type="unfinished">Verzia</translation>
+        <translation>Verzia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="77"/>
         <source>Description</source>
-        <translation type="unfinished">Popis</translation>
+        <translation>Popis</translation>
     </message>
 </context>
 <context>
@@ -1238,158 +1283,148 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp" line="68"/>
         <source>Refresh the list of works from this source</source>
-        <translation type="unfinished">Obnoviť zoznam diel z tohoto zdroja</translation>
+        <translation>Obnoviť zoznam diel z tohoto zdroja</translation>
     </message>
 </context>
 <context>
     <name>BtInstallPathDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="35"/>
         <source>Bookshelf Folders</source>
-        <translation type="unfinished">Prie�inky knižnice</translation>
+        <translation>Prie�inky knižnice</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
         <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
-        <translation type="unfinished">Diela môžu byť nainštalované do jedného alebo viacerých prie�inkov. Po nastavení prie�inkov si jeden znich môžete vybrať na stránke Inštalácia.</translation>
+        <translation>Diela môžu byť nainštalované do jedného alebo viacerých prie�inkov. Po nastavení prie�inkov si jeden z nich môžete vybrať na stránke Inštalácia.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="45"/>
         <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
-        <translation type="unfinished">BibleTime a knižnica SWORD nájdu diela vo všetkých týchto prie�inkoch. Ak prie�inok odstránite v tomto dialógu, stále existuje v súborovom systéme aj s dielami.</translation>
+        <translation>BibleTime a knižnica SWORD nájdu diela vo všetkých týchto prie�inkoch. Ak prie�inok odstránite v tomto dialógu, stále existuje v súborovom systéme aj s dielami.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="48"/>
         <source>Configure bookshelf folders</source>
-        <translation type="unfinished">Konfigurácia prie�inkov knižnice</translation>
+        <translation>Konfigurácia prie�inkov knižnice</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="53"/>
         <source>Configuration file for the folders is: </source>
-        <translation type="unfinished">Konfigura�ný súbor pre prie�inky je: </translation>
+        <translation>Konfigura�ný súbor pre prie�inky je: </translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="61"/>
         <source>Folders where new works can be installed</source>
-        <translation type="unfinished">Prie�inky, kam nove diela môžu byť nainštalované</translation>
+        <translation>Prie�inky, kam nové diela môžu byť nainštalované</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
         <source>Read-only folders</source>
-        <translation type="unfinished">Prie�inky iba na �ítanie</translation>
+        <translation>Prie�inky iba na �ítanie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="66"/>
         <source>Nonexistent folders</source>
-        <translation type="unfinished"></translation>
+        <translation>Neexistujúce prie�inky</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="80"/>
         <source>&amp;Add...</source>
-        <translation>Pridať...</translation>
+        <translation>Prid&amp;ať…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="81"/>
         <source>Add new folder</source>
-        <translation type="unfinished">Pridať nový prie�inok</translation>
+        <translation>Pridať nový prie�inok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="86"/>
         <source>&amp;Edit...</source>
-        <translation>Upraviť...</translation>
+        <translation>&amp;Upraviť…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="87"/>
         <source>Edit the selected folder</source>
-        <translation type="unfinished">Upraviť zvolený prie�inok</translation>
+        <translation>Upraviť zvolený prie�inok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="92"/>
         <source>&amp;Remove</source>
-        <translation>Odstrániť</translation>
+        <translation>Odst&amp;rániť</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="93"/>
         <source>Remove the selected folder</source>
-        <translation type="unfinished">Odstrániť ozna�ený prie�inok</translation>
+        <translation>Odstrániť ozna�ený prie�inok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="167"/>
         <source>This default folder in your home directory can&apos;t be removed</source>
-        <translation type="unfinished">Štandardný prie�inok vo Vašom domovskom adresári nemôže byť odstránený</translation>
+        <translation>Štandardný prie�inok vo Vašom domovskom adresári nemôže byť odstránený</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="194"/>
         <source>Choose Folder</source>
-        <translation type="unfinished">Vyberte prie�inok</translation>
+        <translation>Vyberte prie�inok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>Use Folder?</source>
-        <translation type="unfinished">Použiť prie�inok?</translation>
+        <translation>Použiť prie�inok?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
-        <translation type="unfinished">Do tohoto prie�inka nemôžete zapisovať a preto tam Bibletime nemôže inštalovať diela. Chcete použiť tento prie�inok namiesto predchádzajúcej hodnoty?</translation>
+        <translation>Do tohoto prie�inka nemôžete zapisovať a preto tam BibleTime nemôže inštalovať diela. Chcete použiť tento prie�inok namiesto predchádzajúcej hodnoty?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
-        <translation type="unfinished">Do tohoto prie�inka nemôžete zapisovať a preto tam Bibletime nemôže inštalovať diela. Aj napriek tomu ho chcete pridať do zoznamu prie�inkov v knižnici?</translation>
+        <translation>Do tohoto prie�inka nemôžete zapisovať a preto tam BibleTime nemôže inštalovať diela. Aj napriek tomu ho chcete pridať do zoznamu prie�inkov v knižnici?</translation>
     </message>
 </context>
 <context>
     <name>BtInstallProgressDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Work</source>
         <translation>Dielo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Progress</source>
         <translation>Postup</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>Zastaviť</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="60"/>
         <source>Stop All</source>
         <translation>Zastaviť všetko</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Completed</source>
         <translation>Ukon�ené</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>Zrušené</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="55"/>
         <source>Waiting for turn...</source>
-        <translation>ÄŒakanie...</translation>
+        <translation>Čakanie…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="113"/>
         <source>Preparing install...</source>
-        <translation>Príprava inštalácie...</translation>
+        <translation>Príprava inštalácie…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="37"/>
         <source>Install Progress</source>
         <translation>Postup inštalácie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Failed</source>
         <translation>Zlyhanie</translation>
     </message>
@@ -1397,23 +1432,19 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <source>Select the language in which the Biblical book names are displayed.</source>
-        <translation type="obsolete">Vyberte jazyk, v ktorom sa budú zobrazovať názvy kníh Biblie.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
         <source>Language for names of Bible books:</source>
-        <translation type="unfinished">Jazyk pre názvy kníh Biblie:</translation>
+        <translation>Jazyk pre názvy kníh Biblie:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation type="unfinished">Jazyky, ktoré je možné použiť pre názvy biblických kníh</translation>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="136"/>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation>Jazyky, ktoré môžu byť použité pre názvy biblických kníh. Preklady sú poskytované knižnicou Sword.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="133"/>
         <source>Languages</source>
-        <translation type="unfinished">Zoznam jazykov</translation>
+        <translation>Jazyky</translation>
     </message>
 </context>
 <context>
@@ -1421,18 +1452,18 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="76"/>
         <source>Select a work [%1]</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyberte dielo [%1]</translation>
     </message>
     <message>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="79"/>
         <source>Select an additional work</source>
-        <translation type="unfinished">Vybrať dodato�nú prácu</translation>
+        <translation>Vybrať �alšie dielo</translation>
     </message>
     <message>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="102"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="130"/>
         <source>NONE</source>
-        <translation type="unfinished">Ni�</translation>
+        <translation>Ni�</translation>
     </message>
 </context>
 <context>
@@ -1440,28 +1471,28 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="33"/>
         <source>Preparing to index modules...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pripravuje sa indexácia modulov…</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="33"/>
         <source>Cancel</source>
-        <translation type="unfinished">Zrušiť</translation>
+        <translation>Zrušiť</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="37"/>
         <source>Creating indices</source>
-        <translation type="unfinished">Vytváranie indexov</translation>
+        <translation>Vytváranie indexov</translation>
     </message>
     <message>
         <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="67"/>
         <source>Creating index for work: %1</source>
-        <translation type="unfinished">Vytváranie indexu pre dielo: %1</translation>
+        <translation>Vytváranie indexu pre dielo: %1</translation>
     </message>
 </context>
 <context>
     <name>BtModuleManagerDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="57"/>
         <source>Bookshelf Manager</source>
         <translation>Manažér Knižnice</translation>
     </message>
@@ -1469,22 +1500,22 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkAction</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="103"/>
         <source>&amp;Open work</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Otvoriť dielo</translation>
     </message>
 </context>
 <context>
     <name>BtOpenWorkActionMenu</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="42"/>
         <source>&amp;Grouping order</source>
-        <translation type="unfinished"></translation>
+        <translation>Poradie &amp;zoskupovania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="43"/>
         <source>Sets the grouping order for the items in this menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nastaviť poradie zoskupovanie pre položky v ponuke.</translation>
     </message>
 </context>
 <context>
@@ -1492,85 +1523,73 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="15"/>
         <source>Refreshing source %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualizovanie zdroja %1</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="16"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Z&amp;rušiť</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="17"/>
         <source>Connecting...</source>
-        <translation type="unfinished">Pripájanie...</translation>
+        <translation>Pripájanie…</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="47"/>
         <source>Warning</source>
-        <translation type="unfinished">Varovanie</translation>
+        <translation>Varovanie</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="48"/>
         <source>Failed to refresh source %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nepodarilo sa zaktualizovať zdroj %1</translation>
     </message>
 </context>
 <context>
     <name>BtRemovePage</name>
     <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">Odstrániť</translation>
-    </message>
-    <message>
-        <source>Remove installed works. Select the works and click Remove button.</source>
-        <translation type="obsolete">Odstrániť inštalované diela. Vyberte dielo a kliknite na tla�idlo Odstrániť.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="100"/>
         <source>Select &amp;works to uninstall:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyberte &amp;diela na odinštalovanie:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&amp;Remove...</source>
-        <translation type="unfinished"></translation>
+        <translation>Odst&amp;rániť…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="98"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Odstrániť</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="111"/>
         <source>Start removal of %1 works:</source>
-        <translation type="unfinished"></translation>
+        <translation>Spustiť odstraňovanie %1 diel:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="114"/>
         <source>Start removal:</source>
-        <translation type="unfinished"></translation>
+        <translation>Spustiť odstraňovanie:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="145"/>
         <source>You selected the following work(s): </source>
         <translation>Vybrali ste nasledovné dielo/diela:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="149"/>
         <source>Do you really want to remove them from your system?</source>
         <translation>Skuto�ne ich chcete odstrániť z vášho systému?</translation>
     </message>
     <message>
-        <source>Remove...</source>
-        <translation type="obsolete">Odstrániť...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
         <source>Remove the selected works</source>
         <translation>Odstrániť ozna�ené diela</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="151"/>
         <source>Remove Works?</source>
         <translation>Odstrániť diela?</translation>
     </message>
@@ -1580,25 +1599,25 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp" line="52"/>
         <source>Work</source>
-        <translation type="unfinished">Dielo</translation>
+        <translation>Dielo</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp" line="55"/>
         <source>Install path</source>
-        <translation type="unfinished">Inštala�ná cesta</translation>
+        <translation>Inštala�ná cesta</translation>
     </message>
 </context>
 <context>
     <name>BtSearchModuleChooserDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="47"/>
         <source>Works to Search in</source>
-        <translation type="unfinished">Diela do hľadať v</translation>
+        <translation>Diela k prehľadávaniu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="49"/>
         <source>Select the works which should be searched.</source>
-        <translation type="unfinished">Vyberte diela, v ktorých chcete hľadať.</translation>
+        <translation>Vyberte diela, v ktorých chcete hľadať.</translation>
     </message>
 </context>
 <context>
@@ -1611,7 +1630,7 @@ This file is distributed under the same license as the Bibetime package.</transl
     <message>
         <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="35"/>
         <source>Select first or second shortcut and type the shortcut with keyboard</source>
-        <translation type="unfinished">Vyberte prvú alebo druhú skratku a napíšte skratku klávesnicou</translation>
+        <translation>Vyberte prvú alebo druhú skratku a napíšte skratku klávesnicou</translation>
     </message>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="37"/>
@@ -1680,266 +1699,255 @@ skratka</translation>
     </message>
 </context>
 <context>
-    <name>BtSourceArea</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">Dielo</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="obsolete">Popis</translation>
-    </message>
-    <message>
-        <source>&amp;Add...</source>
-        <translation type="obsolete">Pridať...</translation>
-    </message>
-    <message>
-        <source>Refresh...</source>
-        <translation type="obsolete">Obnoviť...</translation>
-    </message>
-    <message>
-        <source>Refresh the list of works from this source</source>
-        <translation type="obsolete">Obnoviť zoznam diel z tohoto zdroja</translation>
-    </message>
-    <message>
-        <source>&amp;Delete...</source>
-        <translation type="obsolete">Zmazať...</translation>
-    </message>
-    <message>
-        <source>Delete this source</source>
-        <translation type="obsolete">Zmazať tento zdroj</translation>
-    </message>
+    <name>BtStandardWorksTab</name>
     <message>
-        <source>Add new source</source>
-        <translation type="obsolete">Pridať nový zdroj</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="169"/>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation>Štandardné diela sa použijú, ke� nie je uvedené žiadne konkrétne dielo, napríklad pri kliknutí na hypertextový odkaz na Bibliu alebo slovník.</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceAreaModel</name>
     <message>
-        <source>Work</source>
-        <translation type="obsolete">Dielo</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
+        <translation>Biblia:</translation>
     </message>
     <message>
-        <source>Version</source>
-        <translation type="obsolete">Verzia</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="174"/>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation>Štandardná Biblia sa použije, ke� sa klikne na hyperodkaz do Biblie</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Popis</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</source>
+        <translation>Komentár:</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceWidget</name>
     <message>
-        <source>Delete Source?</source>
-        <translation type="obsolete">Odstrániť zdroj?</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="178"/>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation>Štandardný komentár sa použije, ke� sa klikne na hyperodkaz do komentára</translation>
     </message>
     <message>
-        <source>Do you really want to delete this source?</source>
-        <translation type="obsolete">Skuto�ne chcete odstrániť tento zdroj?</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
+        <translation>Lexikón:</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Zrušiť</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="182"/>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation>Štandardný lexikón sa použije, ke� sa klikne na hyperodkaz do lexikónu</translation>
     </message>
     <message>
-        <source>Refreshing source</source>
-        <translation type="obsolete">Obnova zdroja</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</source>
+        <translation>Denné zamyslenie:</translation>
     </message>
     <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">Pripájanie...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="186"/>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation>Štandardné denné zamyslenie sa použije na zobrazenie krátkeho zamyslenie pri spustení</translation>
     </message>
     <message>
-        <source>Refreshing...</source>
-        <translation type="obsolete">Obnovovanie...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation>Lexikón hebrejských strongových �ísel:</translation>
     </message>
     <message>
-        <source>No sources were found in the SWORD configuration and BibleTime couldn&apos;t create a default source. Check your SWORD configuration and that the configuration path is writable. Then restart the Bookshelf Manager.</source>
-        <translation type="obsolete">Vo SWORD konfigurácií neboli nájdené zdroje a BibleTime nemôže vytvoriť štandardný zdroj. Skontrolujte svoju SWORD konfiguráciu a zabezpe�te, aby bolo konfigura�ná cesta mala práva na zápis. Potom znovu spustite Správcu knižnice.</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="190"/>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation>Štandardný hebrejský lexikón sa použije, ke� sa klikne na hyperodkaz do hebrejského lexikónu</translation>
     </message>
     <message>
-        <source>Remote:</source>
-        <translation type="obsolete">Vzdialený:</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation>Lexikón gréckych strongových �ísel:</translation>
     </message>
     <message>
-        <source>Local:</source>
-        <translation type="obsolete">Miestny:</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="194"/>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation>Štandardný grécky lexikón sa použije, ke� sa klikne na hyperodkaz do gréckeho lexikónu</translation>
     </message>
     <message>
-        <source>Not a directory!</source>
-        <translation type="obsolete">Nie je prie�inok!</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</source>
+        <translation>Hebrejský morfologický lexikón:</translation>
     </message>
     <message>
-        <source>Not readable!</source>
-        <translation type="obsolete">Nie je �itateľné!</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="198"/>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation>Štandardný morfologický lexikón pre hebrejský text sa použije, ke� sa klikne na hyperodkaz morfologickej zna�ky v hebrejskom texte</translation>
     </message>
     <message>
-        <source>Warning</source>
-        <translation type="obsolete">Varovanie</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</source>
+        <translation>Grécky morfologický lexikón:</translation>
     </message>
     <message>
-        <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="obsolete">Do cieľového prie�inku nie je možné zapisovať, alebo neexistuje. Inštalácia zlyhá, ak tento problém nevyriešite.</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="202"/>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation>Štandardný morfologický lexikón pre grécky text sa použije, ke� sa klikne na hyperodkaz morfologickej zna�ky v gréckom texte</translation>
     </message>
 </context>
 <context>
     <name>BtTextFiltersTab</name>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="74"/>
         <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="obsolete">Filtre ovládajú vzhľad textu. Tu môžete ur�iť štandardné nastavenia pre všetky filtre. Môžete prepísať tieto nastavenia v každom okne zobrazenia.</translation>
+        <translation>Filtre ovládajú vzhľad textu. Tu môžete ur�iť štandardné nastavenia pre všetky filtre. Tieto nastavenia môžete prepísať v každom okne zobrazenia.</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="78"/>
         <source>Insert line break after each verse</source>
-        <translation type="obsolete">Vložiť ukon�enie riadku po každom verši</translation>
+        <translation>Zalomiť riadok po každom verši</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
         <source>Show verse numbers</source>
-        <translation type="obsolete">Zobraziť �ísla veršov</translation>
+        <translation>Zobraziť �ísla veršov</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
         <source>Show section headings</source>
-        <translation type="obsolete">Zobraziť nadpisy oddielov</translation>
+        <translation>Zobraziť nadpisy oddielov</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
         <source>Show scripture cross-references</source>
-        <translation type="obsolete">Zobraziť krížové odkazy Biblie</translation>
+        <translation>Zobraziť krížové odkazy Biblie</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="82"/>
         <source>Show Greek accents</source>
-        <translation type="obsolete">Zobraziť grécke akcenty</translation>
+        <translation>Zobraziť grécke znaky prízvuku</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="83"/>
         <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">Zobraziť body hebrejských hlások</translation>
+        <translation>Zobraziť hebrejských zna�ky samohlások</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="84"/>
         <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">Zobraziť hebrejské liturgické znaky</translation>
+        <translation>Zobraziť hebrejské zna�ky prízvuku</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="85"/>
         <source>Show morph segmentation</source>
-        <translation type="obsolete">Zobraziť morfologické delenie</translation>
+        <translation>Zobraziť morfologické delenie</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="86"/>
         <source>Use textual variants</source>
-        <translation type="obsolete">Použiť textové varianty</translation>
+        <translation>Použiť textové varianty</translation>
     </message>
 </context>
 <context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
         <source>Add/remove/replace</source>
-        <translation type="unfinished"></translation>
+        <translation>Pridať/odstrániť/nahradiť</translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">Odstrániť</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Odstrániť</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
         <source>Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>Nahradiť</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Pridať</translation>
     </message>
 </context>
 <context>
     <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="69"/>
         <source>Tip Of The Day</source>
-        <translation type="unfinished"></translation>
+        <translation>Tip dňa</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="83"/>
         <source>Show tips at startup</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť tipy dňa pri štarte</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="94"/>
         <source>Next Tip</source>
-        <translation type="unfinished"></translation>
+        <translation>Ďalší tip</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
         <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ak chcete pridať viac Biblií pre paralelné zobrazenie v aktívnom okne Biblie, použite túto ikonu a zvoľte �alší preklad Biblie.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
         <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ak chcete pridať viac komentárov pre paralelné zobrazenie v aktívnom okne komentárov, použite túto ikonu a pridajte �alší komentár.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="134"/>
         <source>To learn more about the BibleTime project please go to our web site.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ak chcete vedieť viac o projekte BibleTime, cho�te na jeho domovskú stránku.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="137"/>
         <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pre synchronizáciu komentára s aktívnou Bibliou, aktivujte okno komentára a použite túto ikonu.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
         <source>Select the icon again to stop the synchronization.</source>
-        <translation type="unfinished"></translation>
+        <translation>Použite túto ikonu znova na ukon�enie synchronizácie.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="142"/>
         <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ak chcete vytvoriť záložku potiahnite ľubovoľný odkaz verša z Biblie alebo komentára do okna záložiek. Šípka indikuje pozíciu, že bude záložka po uvoľnení kurzora. Ďalšie diela budú mať odkazy v ľavom hornom rohu, ktoré môžu byť použité na vytvorenie záložky.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="147"/>
         <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ak chcete zmeniť názov záložky alebo jej popis, kliknite pravým tla�idlom na záložku a vyberte položku Upraviť záložku. Po ukon�ení úprav popisu je možné ho vidieť nad záložkou.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="151"/>
         <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pre na�ítanie viacerých inštala�ných zdrojov pre diela, cho�te do Správcu knižnice, použite tla�idlo Pridať a potom kliknite na Získať zoznam.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="154"/>
         <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ak chcete nájsť viac informácií o diele, cho�te do okna knižnice a kliknite pravým tla�idlom na myši na dielo a vyberte ponuku O… .</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="157"/>
         <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Okná knižnice, záložiek a informácií môžu byť premiestnené na novú pozíciu pomocou potiahnutia za ich titulok. Umiestnené môžu byť vľavo, vpravo, hore, alebo dole od okna diel. Môžu byť umiestené jedno na druhé, kedy sa zobrazia ako jednotlivé karty. Ich veľkosť môže byť zmenená pomocou posúvania okraja ich okna a �alšieho okna.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="163"/>
         <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
-        <translation type="unfinished"></translation>
+        <translation>Môžete vyhľadávať Strongové �ísla v diele. Otvorte dielo, ktoré má strongové �ísla a postojte kurzorom nad slovom. Kliknite pravým tla�idlom myši na slovo a vyberte položku Vyhľadávanie v strongových �íslach. Vyhľadávací dialóg vám umožní vidieť použité Strongové �íslo na �alších miestach v danom diely.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="178"/>
         <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>Môžete uložiť svoje otvorené okná v relácií. Taká relácia môže byť ľahko obnovená neskôr. Môžete uložiť toľko relácií, koľko budete chcieť. Relácie nájdete v hlavnej ponuke v položke Okno.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="168"/>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>Môžete si uložiť osobné poznámky pre konkrétne verše. Musíte si nainštalovať modul Osobný komentár (Personal commentary). Otvorte Správcu knižnice, vyberte Crosswire ako zdroj a pohľadajte v �asti Komentáre a Anglické. Ke� ho budete mať nainštalovaný, použite okno knižnice a kliknite pravým tla�idlom myši na Personal. Vyberte si Upraviť a potom bu� položku &quot;Oby�ajný text&quot; alebo &quot;HTML&quot; pre zápis.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
         <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Informácie o Strongových �íslach môžete vidieť okne Informácie, ak sa zastavíte kurzorom myši nad slovom v Biblií, ktorá má Strongové �ísla. Musíte mať nainštalované lexikóny StrongsGreek a StrongsHebrew z Crosswire.</translation>
     </message>
 </context>
 <context>
@@ -1953,49 +1961,49 @@ skratka</translation>
 <context>
     <name>CAcceleratorSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="128"/>
         <source>Choose action group:</source>
         <translation>Vyberte skupinu akcií:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="130"/>
         <source>Main Window</source>
         <translation>Hlavné okno</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
         <source>All text windows</source>
         <translation>Všetky textové okná</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="132"/>
         <source>Bible windows</source>
         <translation>Okná Biblií</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
         <source>Commentary windows</source>
         <translation>Okná komentárov</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="134"/>
         <source>Lexicon windows</source>
         <translation>Okná lexikónov</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
         <source>Book windows</source>
         <translation>Okná kníh</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
         <source>
    &quot;%1&quot; in the &quot;%2&quot; group</source>
         <translation>
    &quot;%1&quot; v skupine &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
         <source>Shortcuts</source>
         <translation>Skratky</translation>
     </message>
@@ -2003,103 +2011,95 @@ skratka</translation>
 <context>
     <name>CBibleReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="64"/>
         <source>Next book</source>
         <translation>Ďalšia kniha</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="68"/>
         <source>Previous book</source>
         <translation>Predchádzajúca kniha</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="72"/>
         <source>Next chapter</source>
         <translation>Nasledujúca kapitola</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="76"/>
         <source>Previous chapter</source>
         <translation>Predchádzajúca kapitola</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="80"/>
         <source>Next verse</source>
         <translation>Nasledujúci verš</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="84"/>
         <source>Previous verse</source>
         <translation>Predchádzajúci verš</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="89"/>
         <source>Copy chapter</source>
         <translation>Kopírovať kapitolu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="92"/>
         <source>Save chapter as plain text</source>
         <translation>Uložiť kapitolu ako oby�ajný text</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="95"/>
         <source>Save chapter as HTML</source>
         <translation>Uložiť kapitolu ako HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="98"/>
         <source>Print chapter</source>
         <translation>Vytla�iť kapitolu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="110"/>
         <source>Text of reference</source>
         <translation>Text odkazu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
         <source>Reference with text</source>
         <translation>Odkaz s textom</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="253"/>
         <source>Bible window</source>
         <translation>Okno Biblie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="263"/>
         <source>Copy...</source>
-        <translation>Kopírovať...</translation>
+        <translation>Kopírovať…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="274"/>
         <source>Save...</source>
-        <translation>Ulož...</translation>
+        <translation>Ulož…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="287"/>
         <source>Print...</source>
-        <translation>Tla�iť...</translation>
-    </message>
-    <message>
-        <source>Copy chapter to clipboard ...</source>
-        <translation type="obsolete">Skopírovať kapitolu do schránky...</translation>
+        <translation>Tla�iť…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="371"/>
         <source>Copying</source>
         <translation>Kopírovanie</translation>
     </message>
     <message>
-        <source>Saving chapter ...</source>
-        <translation type="obsolete">Ukladanie kapitoly...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="390"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="408"/>
         <source>Saving</source>
         <translation>Ukladanie</translation>
     </message>
@@ -2107,7 +2107,7 @@ skratka</translation>
 <context>
     <name>CBookReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
+        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="70"/>
         <source>Toggle tree view</source>
         <translation>Prepnutie stromového zobrazenia</translation>
     </message>
@@ -2115,97 +2115,93 @@ skratka</translation>
 <context>
     <name>CBookmarkIndex</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
         <source>Bookmarks</source>
         <translation>Záložky</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="92"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="583"/>
         <source>New folder</source>
         <translation>Nový prie�inok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
         <source>Rename folder</source>
         <translation>Premenovať prie�inok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
         <source>Delete Items</source>
         <translation>Zmazať položky</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="704"/>
         <source>Do you really want to delete the selected items and child-items?</source>
         <translation>Naozaj chcete zmazať vybrané položky a ich potomkov?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="814"/>
         <source>The work to which the bookmark points to is not installed.</source>
         <translation>Dielo, do ktorého ukazuje záložka, nie je nainštalované.</translation>
     </message>
     <message>
-        <source>Change bookmark description...</source>
-        <translation type="obsolete">Zmeňte popis záložky...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
         <source>Print bookmarks...</source>
-        <translation>Tla�iť záložky...</translation>
+        <translation>Tla�iť záložky…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="103"/>
         <source>Remove selected items...</source>
-        <translation>Odstrániť zvolené položky...</translation>
+        <translation>Odstrániť zvolené položky…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
         <source>Import to folder...</source>
-        <translation>Importovať prie�inok...</translation>
+        <translation>Importovať prie�inok…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
         <source>Edit bookmark...</source>
-        <translation type="unfinished"></translation>
+        <translation>Upraviť záložku…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
         <source>Sort folder bookmarks...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoradiť záložky v prie�inku…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
         <source>Sort all bookmarks...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoradiť všetky záložky…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="100"/>
         <source>Export from folder...</source>
-        <translation>Exportovať prie�inok...</translation>
+        <translation>Exportovať prie�inok…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="393"/>
         <source>Can drop only bookmarks or one folder</source>
         <translation>Je možné pustiť len jednu záložku alebo prie�inok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="398"/>
         <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
         <translation>Nie je možné pustiť prie�inok do samého seba alebo do podprie�inku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
         <source>Copy</source>
         <translation>Kopírovať</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="406"/>
         <source>Move</source>
         <translation>Presunúť</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="467"/>
         <source>Drag references from text views to this view</source>
         <translation>Ťahať odkazy zo zobrazenia textu do tohoto zobrazenia</translation>
     </message>
@@ -2213,42 +2209,42 @@ skratka</translation>
 <context>
     <name>CCommentaryReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="31"/>
         <source>Next book</source>
         <translation>Ďalšia kniha</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="35"/>
         <source>Previous book</source>
         <translation>Predchádzajúca kniha</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="39"/>
         <source>Next chapter</source>
         <translation>Nasledujúca kapitola</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="43"/>
         <source>Previous chapter</source>
         <translation>Predchádzajúca kapitola</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="47"/>
         <source>Next verse</source>
         <translation>Nasledujúci verš</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="51"/>
         <source>Previous verse</source>
         <translation>Predchádzajúci verš</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="56"/>
         <source>Synchronize</source>
         <translation>Synchronizovať</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="59"/>
         <source>Synchronize the displayed entry of this work with the active Bible window</source>
         <translation>Synchronizovať zobrazenie položky tejto práce s aktívnym oknom biblie</translation>
     </message>
@@ -2256,7 +2252,7 @@ skratka</translation>
 <context>
     <name>CConfigurationDialog</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="41"/>
         <source>Configure BibleTime</source>
         <translation>Konfigurácia BibleTime</translation>
     </message>
@@ -2264,67 +2260,67 @@ skratka</translation>
 <context>
     <name>CDisplaySettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
         <source>Display templates</source>
         <translation>Šablóny zobrazenia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
         <source>Available display styles:</source>
         <translation>Dostupné štýly zobrazenia:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="113"/>
         <source>Style preview</source>
         <translation>Náhľad štýlu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="131"/>
         <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
         <translation>Lebo tak miloval Boh svet, že svojho jednorodeného Syna dal, aby nikto, kto verí v Neho, nezahynul, ale mal ve�ný život.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="138"/>
         <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
         <translation>Lebo neposlal Boh na svet svojho Syna aby súdil svet, ale aby bol svet spasený skrze Neho.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="145"/>
         <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
         <translation>Kto verí v Neho, nebude odsúdený, ale ten, kto neverí, už je odsúdený. lebo neuveril v meno jednorodeného Syna Božieho.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="155"/>
         <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
         <translation>Lebo každý, kto robí zlé, nenávidí svetlo a nejde k svetlu, aby neboli trestané jeho skutky.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="160"/>
         <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
         <translation>Ale ten, kto �iní pravdu, ide k svetlu, aby boli zjavené jeho skutky, že sú vykonané v Bohu.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="106"/>
         <source>Display templates define how text is displayed.</source>
         <translation>Zobraziť šablóny definujúce ako sa text zobrazí.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="110"/>
         <source>Show the BibleTime logo on startup</source>
         <translation>Zobraziť logo BibleTime pri spustení</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
         <source>Show startup logo</source>
         <translation>Zobraziť logo pri spustení</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="150"/>
         <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
-        <translation type="unfinished"></translation>
+        <translation>Súd je v tom, že svetlo prišlo na svet, ale ľudia milovali vä�šmi tmu než svetlo, lebo ich skutky boli zlé.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="101"/>
         <source>Display</source>
         <translation>Zobrazenie</translation>
     </message>
@@ -2337,147 +2333,124 @@ skratka</translation>
 <context>
     <name>CDisplayWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="215"/>
         <source>Back in history</source>
         <translation>Späť v histórii</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="223"/>
         <source>Forward in history</source>
         <translation>Dopredu v histórii</translation>
     </message>
     <message>
-        <source>Zoom in</source>
-        <translation type="obsolete">Zvä�šiť</translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation type="obsolete">Zmenšiť</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="192"/>
         <source>Select all</source>
         <translation>Ozna�iť všetko</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="196"/>
         <source>Copy</source>
         <translation>Kopírovať</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="200"/>
         <source>Find...</source>
-        <translation>Hľadať...</translation>
+        <translation>Hľadať…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="204"/>
         <source>Change location</source>
         <translation>Zmeniť umiestnenie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="209"/>
         <source>Search with works of this window</source>
         <translation>Hľadať v dielach tohoto okna</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="393"/>
         <source>Work chooser buttons</source>
-        <translation type="unfinished"></translation>
+        <translation>Tla�idlá pre výber diel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="403"/>
         <source>Text area header</source>
-        <translation type="unfinished"></translation>
+        <translation>Záhlavie textovej plochy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="453"/>
         <source>Navigation</source>
-        <translation type="unfinished"></translation>
+        <translation>Navigácia</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="459"/>
         <source>Tool</source>
-        <translation type="unfinished"></translation>
+        <translation>Nástroj</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="465"/>
         <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CFontChooser</name>
-    <message>
-        <source>Size:</source>
-        <translation type="obsolete">Veľkosť:</translation>
-    </message>
-    <message>
-        <source>Font name:</source>
-        <translation type="obsolete">Názov písma:</translation>
-    </message>
-    <message>
-        <source>Font style:</source>
-        <translation type="obsolete">Štýl písma:</translation>
+        <translation>Formát</translation>
     </message>
 </context>
 <context>
     <name>CHTMLWriteDisplay</name>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
         <source>Bold</source>
         <translation>Tu�né</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="60"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="67"/>
         <source>Italic</source>
         <translation>Kurzíva</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="79"/>
         <source>Underline</source>
         <translation>Pod�iarknuté</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="84"/>
         <source>Left</source>
         <translation>Vľavo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="94"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="99"/>
         <source>Center</source>
         <translation>Na stred</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="104"/>
         <source>Right</source>
         <translation>Vpravo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="231"/>
         <source>Font</source>
         <translation>Písmo</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="243"/>
         <source>Font size</source>
         <translation>Veľkosť písma</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="255"/>
         <source>Font color</source>
         <translation>Farba písma</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="89"/>
         <source>Align left</source>
         <translation>Zarovnanie doľava</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="109"/>
         <source>Align right</source>
         <translation>Zarovnanie doprava</translation>
     </message>
@@ -2485,60 +2458,22 @@ skratka</translation>
 <context>
     <name>CHTMLWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="122"/>
         <source>Module not writable</source>
         <translation>Do modulu nie je možné zapisovať</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="124"/>
         <source>Module is not writable.</source>
         <translation>Do modulu nie je možné zapisovať.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="125"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Bu� nie je možné upravovať modul, alebo nemáte práva na zápis.</translation>
     </message>
 </context>
 <context>
-    <name>CInputDialog</name>
-    <message>
-        <source>Clear</source>
-        <translation type="obsolete">Vy�istiť</translation>
-    </message>
-</context>
-<context>
-    <name>CKeyReferenceWidget</name>
-    <message>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="obsolete">Posúvanie cez položky v zozname. Stla�ením tla�idla a pohybom myši presuniete položku hore alebo dole.</translation>
-    </message>
-    <message>
-        <source>Next book</source>
-        <translation type="obsolete">Ďalšia kniha</translation>
-    </message>
-    <message>
-        <source>Previous book</source>
-        <translation type="obsolete">Predchádzajúca kniha</translation>
-    </message>
-    <message>
-        <source>Next chapter</source>
-        <translation type="obsolete">Nasledujúca kapitola</translation>
-    </message>
-    <message>
-        <source>Previous chapter</source>
-        <translation type="obsolete">Predchádzajúca kapitola</translation>
-    </message>
-    <message>
-        <source>Next verse</source>
-        <translation type="obsolete">Nasledujúci verš</translation>
-    </message>
-    <message>
-        <source>Previous verse</source>
-        <translation type="obsolete">Predchádzajúci verš</translation>
-    </message>
-</context>
-<context>
     <name>CLanguageSettingsPage</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/clanguagesettings.cpp" line="297"/>
@@ -2549,22 +2484,22 @@ skratka</translation>
 <context>
     <name>CLexiconKeyChooser</name>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>Posúvanie cez položky v zozname. Stla�ením tla�idla a pohybom myši presuniete položku hore alebo dole.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
         <source>Entries of the current work</source>
         <translation>Položky aktuálneho diela</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Nasledujúca položka</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="49"/>
         <source>Previous entry</source>
         <translation>Predchádzajúca položka</translation>
     </message>
@@ -2572,376 +2507,370 @@ skratka</translation>
 <context>
     <name>CLexiconReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="47"/>
         <source>Next entry</source>
         <translation>Nasledujúca položka</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="51"/>
         <source>Previous entry</source>
         <translation>Predchádzajúca položka</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="55"/>
         <source>Copy reference only</source>
         <translation>Kopírovať iba odkazy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
         <source>Save entry as HTML</source>
         <translation>Uložiť položku ako HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
         <source>Print reference only</source>
         <translation>Tla�iť iba odkazy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
         <source>Strong&apos;s Search</source>
         <translation>Vyhľadávanie v strongových �íslach</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
         <source>Entry with text</source>
         <translation>Položka s textom</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="134"/>
         <source>Entry as plain text</source>
         <translation>Položka ako surový text</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="265"/>
         <source>Lexicon window</source>
         <translation>Okno lexikónu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="272"/>
         <source>Copy...</source>
-        <translation>Kopírovať...</translation>
+        <translation>Kopírovať…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="281"/>
         <source>Save...</source>
-        <translation>Ulož...</translation>
+        <translation>Ulož…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="297"/>
         <source>Print...</source>
-        <translation>Tla�iť...</translation>
+        <translation>Tla�iť…</translation>
     </message>
     <message>
-        <source>Saving entry ...</source>
-        <translation type="obsolete">Ukladanie položky...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="340"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="364"/>
         <source>Saving</source>
         <translation>Ukladám</translation>
     </message>
 </context>
 <context>
-    <name>CModuleIndexDialog</name>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Zrušiť</translation>
-    </message>
-    <message>
-        <source>Creating indices</source>
-        <translation type="obsolete">Vytváranie indexov</translation>
-    </message>
-    <message>
-        <source>Creating index for work: %1</source>
-        <translation type="obsolete">Vytváranie indexu pre dielo: %1</translation>
-    </message>
-    <message>
-        <source>Indexing Is Cancelled</source>
-        <translation type="obsolete">Indexovanie zrušené</translation>
-    </message>
-    <message>
-        <source>Indexing is cancelled because modules are removed.</source>
-        <translation type="obsolete">Indexovanie je zrušené, lebo moduly sú presunuté.</translation>
-    </message>
-</context>
-<context>
     <name>CPlainWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="235"/>
         <source>Sync with active Bible</source>
         <translation>Synchronizovať s aktívnou Bibliou</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="245"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="249"/>
         <source>Save text</source>
         <translation>Uložiť text</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="254"/>
         <source>Delete current entry</source>
         <translation>Odstrániť aktuálnu položku</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="263"/>
         <source>Restore original text</source>
         <translation>Obnoviť pôvodný text</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="163"/>
         <source>Module not writable</source>
         <translation>Do modulu nie je možné zapisovať</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="165"/>
         <source>Module is not writable.</source>
         <translation>Do modulu nie je možné zapisovať.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="166"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>Bu� nie je možné upravovať modul, alebo nemáte práva na zápis.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="240"/>
         <source>Synchronize (show the same verse) with the active Bible window</source>
         <translation>Synchronizovať (zobraziť rovnaký verš) v aktívnom okne Biblie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="258"/>
         <source>Delete current entry (no undo)</source>
         <translation>Zmazať aktuálnu položku (nie je možné vrátiť späť)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="267"/>
         <source>Restore original text, new text will be lost</source>
         <translation>Obnoviť originálny text, nový text bude stratený</translation>
     </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save Text?</source>
+        <translation>Uložiť text?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <source>Save text before closing?</source>
+        <translation>Uložiť text pred ukon�ením?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save changed text?</source>
+        <translation>Uložiť zmenený text?</translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="232"/>
         <source>Save Search Analysis</source>
-        <translation type="unfinished"></translation>
+        <translation>Uložiť analýzu hľadania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="243"/>
+        <source>BibleTime Search Analysis</source>
+        <translation>BibleTime analýza hľadania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
-        <source>BibleTime Search Analysis</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="234"/>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
+        <translation>XHTML súbory (*.html *.HTML *.HTM *.htm);;Všetky súbory (*)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="259"/>
+        <source>Search text:</source>
+        <translation>Hľadať text:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="263"/>
+        <source>Results by work and book</source>
+        <translation>Výsledky podľa diela a knihy</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="265"/>
         <source>Book</source>
-        <translation type="unfinished"></translation>
+        <translation>Kniha</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="293"/>
         <source>Total hits</source>
-        <translation type="unfinished"></translation>
+        <translation>Celkom nájdené</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="303"/>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Vytvorené v &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</translation>
     </message>
 </context>
 <context>
     <name>CSwordModuleInfo</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="763"/>
         <source>Version</source>
         <translation>Verzia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="766"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="774"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="771"/>
         <source>Markup</source>
         <translation>Ozna�enie</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
         <source>Location</source>
         <translation>Umiestnenie</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="782"/>
         <source>Language</source>
         <translation>Jazyk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="787"/>
         <source>Category</source>
         <translation>Kategória</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="792"/>
         <source>LCSH</source>
         <translation>LCSH</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="796"/>
         <source>Writable</source>
         <translation>Zapisovateľné</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>yes</source>
         <translation>áno</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>no</source>
         <translation>nie</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="801"/>
         <source>Unlock key</source>
         <translation>Kľú� k odomknutiu</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="822"/>
         <source>Features</source>
         <translation>Vlastnosti</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="830"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Dávajte si pozor, toto dielo obsahuje kultový / otázny materiál!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="834"/>
         <source>About</source>
         <translation>O module</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="856"/>
         <source>Distribution license</source>
         <translation>Licencia ohľadom distribuovanie</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="857"/>
         <source>Distribution source</source>
         <translation>Zdroj distribúcie</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="858"/>
         <source>Distribution notes</source>
         <translation>Poznámky k distribúcii</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="859"/>
         <source>Text source</source>
         <translation>Zdroj textu</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="860"/>
         <source>Copyright notes</source>
         <translation>Poznámky k autorským právam</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
         <source>Copyright holder</source>
         <translation>Držiteľ autorských práv</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
         <source>Copyright date</source>
         <translation>Dátum autorských práv</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
         <source>Copyright contact name</source>
         <translation>Kontakt ohľadom autorských práv</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
         <source>Copyright contact address</source>
         <translation>Kontaktná adresa ohľadom autorských práv</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
         <source>Copyright contact email</source>
         <translation>Kontaktný email ohľadom autorských práv</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="956"/>
         <source>Bibles</source>
-        <translation type="unfinished">Biblie</translation>
+        <translation>Biblie</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="958"/>
         <source>Commentaries</source>
-        <translation type="unfinished">Komentáre</translation>
+        <translation>Komentáre</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="960"/>
         <source>Books</source>
-        <translation type="unfinished">Knihy</translation>
+        <translation>Knihy</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="962"/>
         <source>Cults/Unorthodox</source>
-        <translation type="unfinished">Kultové/Neortodoxné</translation>
+        <translation>Kultické/Neortodoxné</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="964"/>
         <source>Maps and Images</source>
-        <translation type="unfinished">Mapy a obrázky</translation>
+        <translation>Mapy a obrázky</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="966"/>
         <source>Daily Devotionals</source>
-        <translation type="unfinished">Denné zamyslenia</translation>
+        <translation>Denné zamyslenia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="968"/>
         <source>Lexicons and Dictionaries</source>
-        <translation type="unfinished">Lexikóny a slovníky</translation>
+        <translation>Lexikóny a slovníky</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="970"/>
         <source>Glossaries</source>
-        <translation type="unfinished">Glosáre</translation>
+        <translation>Glosáre</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="972"/>
         <source>Unknown</source>
-        <translation type="unfinished">Neznáme</translation>
+        <translation>Neznáme</translation>
     </message>
 </context>
 <context>
     <name>CSwordSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="43"/>
         <source>Standard works</source>
         <translation>Štandardné diela</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="44"/>
         <source>Text filters</source>
         <translation>Textové filtre</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="41"/>
         <source>Desk</source>
         <translation>Plocha</translation>
     </message>
@@ -2954,177 +2883,160 @@ skratka</translation>
 <context>
     <name>CSwordSetupInstallSourcesDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="47"/>
         <source>Caption</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="68"/>
         <source>Path</source>
         <translation>Cesta</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="91"/>
         <source>Get list...</source>
-        <translation type="unfinished"></translation>
+        <translation>Získať zoznam…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
         <source>A source with this caption already exists. Please provide a different caption.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zdroj s týmto titulkom už existuje. Uve�te, prosím, iný titulok.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="160"/>
         <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
 
 Do you want to continue?</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoznam zdrojov bude stiahnutý zo vzdialeného servera. Zdroje budú pridané do aktuálneho zoznamu. Nový zdroj nahradí starý, ak bude mať rovnaké ozna�enie. Neskôr môžete odstrániť zdroje, ktoré nechcete.
+
+Chcete pokra�ovať?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
         <source>Get source list from remote server?</source>
-        <translation type="unfinished"></translation>
+        <translation>Získať zoznam zo vzdialeného servera?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="167"/>
         <source>Cancel</source>
-        <translation type="unfinished">Zrušiť</translation>
+        <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="168"/>
         <source>Downloading List</source>
-        <translation type="unfinished"></translation>
+        <translation>SÅ¥ahovanie zoznamu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="178"/>
         <source>Connecting...</source>
-        <translation type="unfinished">Pripájanie...</translation>
+        <translation>Pripájanie…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="197"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="198"/>
         <source>Refreshing...</source>
-        <translation type="unfinished">Obnovovanie...</translation>
+        <translation>Obnovovanie…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="92"/>
         <source>Download a list of sources from CrossWire server and add sources</source>
-        <translation type="unfinished"></translation>
+        <translation>Stiahnuť zoznam zdrojov zo servera CrossWire a pridať zdroje</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
         <source>Please provide a caption.</source>
         <translation>Prosím zadajte popis.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
         <source>Please provide a server name.</source>
         <translation>Prosím zadajte názov serveru.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
         <source>Please provide a valid, readable path.</source>
         <translation>Prosím zadajte platnú, �itateľnú adresu.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Please provide a path.</source>
         <translation>Prosím zadajte cestu.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="39"/>
         <source>New  Installation Source</source>
         <translation>Nový inštala�ný zdroj</translation>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>Uložiť text pred ukon�ením?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>Uložiť zmenený text?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>Uložiť text?</translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="178"/>
         <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Verzia: %3&lt;/p&gt;&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="194"/>
         <source>Abbreviation</source>
         <translation>Skratka</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="203"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="290"/>
         <source>Cross references</source>
         <translation>Krížové referencie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="343"/>
         <source>Footnote</source>
         <translation>Poznámky pod �iarou</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="374"/>
         <source>Strongs</source>
         <translation>Strongové �ísla</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="451"/>
         <source>Morphology</source>
         <translation>Morfologické príznaky</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="472"/>
         <source>Word lookup</source>
         <translation>Hľadanie slov</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="60"/>
         <source>Copy</source>
         <translation>Kopírovať</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
         <source>Select all</source>
-        <translation type="unfinished">Ozna�iť všetko</translation>
+        <translation>Vybrať všetko</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="80"/>
         <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
         <translation>&lt;small&gt;Toto je informa�ná oblasť. Postavte sa s myšou nad odkaz alebo inú položku, ktorá obsahuje nejaké dáta, a jej obsah sa po chvíli zobrazí v informa�nej oblasti. Rýchlym pohybom myši sa presuňte do informa�nej oblasti, alebo uzamknite zobrazenie stla�ením a držaním klávesy Shift pri pohybe myši.&lt;/small&gt;</translation>
     </message>
@@ -3132,28 +3044,28 @@ Do you want to continue?</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="412"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="422"/>
         <source>Indexing aborted</source>
         <translation>Indexovanie bolo prerušené</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="413"/>
         <source>An internal error occurred while building the index: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyskytla sa interná chyba pri vytváraní indexu: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="423"/>
         <source>An internal error occurred while building the index.</source>
         <translation>Vyskytla sa interná chyba pri vytváraní indexu.</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="522"/>
         <source>Search aborted</source>
         <translation>Vyhľadávanie prerušené</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="523"/>
         <source>An internal error occurred while executing your search.</source>
         <translation>Vyskytla sa interná chyba pri vykonávaní vyhľadávania.</translation>
     </message>
@@ -3194,7 +3106,7 @@ Do you want to continue?</source>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="122"/>
         <source>Bibles</source>
         <translation>Biblie</translation>
     </message>
@@ -3211,1349 +3123,1309 @@ Do you want to continue?</source>
         <translation>Knihy</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="390"/>
         <source>Added text</source>
         <translation>Pridaný text</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="143"/>
         <source>Names of languages</source>
         <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
         <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
         <translation>Názvy jazykov</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="148"/>
         <source>Afrikaans</source>
         <extracomment>Language name af</extracomment>
         <translation>Afrikánske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="151"/>
         <source>Amuzgo, Guerrero</source>
         <extracomment>Language name amu</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Amuzgo, Guerrero</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="153"/>
         <source>English, Old (ca.450-1100)</source>
         <extracomment>Language name ang</extracomment>
         <translation>Staroanglické, (450-1100)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="155"/>
         <source>Arabic</source>
         <extracomment>Language name ar</extracomment>
         <translation>Arabské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="158"/>
         <source>Azerbaijani</source>
         <extracomment>Language name az</extracomment>
         <translation>Azerbajdžanské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="160"/>
         <source>Azerbaijani, South</source>
         <extracomment>Language name azb</extracomment>
         <translation>Juhoazerbajdžanské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="165"/>
         <source>Belarusian</source>
         <extracomment>Language name be</extracomment>
         <translation>Bieloruské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="167"/>
         <source>Bulgarian</source>
         <extracomment>Language name bg</extracomment>
         <translation>Bulharské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="173"/>
         <source>Breton</source>
         <extracomment>Language name br</extracomment>
         <translation>Bretónske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="175"/>
         <source>Bosnian</source>
         <extracomment>Language name bs</extracomment>
         <translation>Bosnianské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="177"/>
         <source>Catalan</source>
         <extracomment>Language name ca</extracomment>
         <translation>Katalánske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="180"/>
         <source>Chinantec, Comaltepec</source>
         <extracomment>Language name cco</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Chinantec, Comaltepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="182"/>
         <source>Cebuano</source>
         <extracomment>Language name ceb</extracomment>
         <translation>Cebuánske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
         <source>Chamorro</source>
         <extracomment>Language name ch</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Chamorro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
         <source>Chontal, Highland Oaxaca</source>
         <extracomment>Language name chd</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Chontal, Highland Oaxaca</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
         <source>Chinantec, Quiotepec</source>
         <extracomment>Language name chq</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Chinantec, Quiotepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="190"/>
         <source>Chinantec, Ozumacu00edn</source>
         <extracomment>Language name chz</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Chinantec, Ozumacu00edn</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="193"/>
         <source>Cakchiquel, Western</source>
         <extracomment>Language name ckw</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Cakchiquel, Západné</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="195"/>
         <source>Chinantec, Lalana</source>
         <extracomment>Language name cnl</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Chinantec, Lalana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="197"/>
         <source>Chinantec, Tepetotutla</source>
         <extracomment>Language name cnt</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Chinantec, Tepetotutla</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="199"/>
         <source>Coptic</source>
         <extracomment>Language name cop</extracomment>
         <translation>Koptské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
         <source>Czech</source>
         <extracomment>Language name cs</extracomment>
         <translation>České</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
         <source>Chinantec, Sochiapan</source>
         <extracomment>Language name cso</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Chinantec, Sochiapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
         <source>Chol, Tila</source>
         <extracomment>Language name cti</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Chol, Tila</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
         <source>Chatino, Western Highland</source>
         <extracomment>Language name ctp</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Chatino, Western Highland</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
         <source>Church Slavic</source>
         <extracomment>Language name cu</extracomment>
         <translation>Staroslovienske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="212"/>
         <source>Welsh</source>
         <extracomment>Language name cy</extracomment>
         <translation>Welšské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
         <source>Danish</source>
         <extracomment>Language name da</extracomment>
         <translation>Dánske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
         <source>German</source>
         <extracomment>Language name de</extracomment>
         <translation>Nemecké</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
         <source>Duruma</source>
         <extracomment>Language name dug</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Duruma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="221"/>
         <source>Greek, Modern (1453-)</source>
         <extracomment>Language name el</extracomment>
         <translation>Moderné grécke (1453-)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
         <source>English</source>
         <extracomment>Language name en</extracomment>
         <translation>Anglické</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="225"/>
         <source>American English</source>
         <extracomment>Language name en_US</extracomment>
         <translation>Americko-anglické</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="227"/>
         <source>English, Middle (1100-1500)</source>
         <extracomment>Language name enm</extracomment>
-        <translation>Stredo-anglické (1100-1500)</translation>
+        <translation>Anglické, Stredovek (1100-1500)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="229"/>
         <source>Esperanto</source>
         <extracomment>Language name eo</extracomment>
         <translation>Esperanto</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="231"/>
         <source>Spanish</source>
         <extracomment>Language name es</extracomment>
         <translation>Å panielske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
         <source>Estonian</source>
         <extracomment>Language name et</extracomment>
         <translation>Estónske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
         <source>Basque</source>
         <extracomment>Language name eu</extracomment>
         <translation>Baskitské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
         <source>Persian</source>
         <extracomment>Language name fa</extracomment>
         <translation>Perské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
         <source>Finnish</source>
         <extracomment>Language name fi</extracomment>
         <translation>Fínske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="243"/>
         <source>French</source>
         <extracomment>Language name fr</extracomment>
         <translation>Francúzske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="245"/>
         <source>Frisian</source>
         <extracomment>Language name fy</extracomment>
         <translation>Frisianské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="247"/>
         <source>Irish</source>
         <extracomment>Language name ga</extracomment>
         <translation>�rske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="249"/>
         <source>Gaelic (Scots)</source>
         <extracomment>Language name gd</extracomment>
         <translation>Gaelštinské (Škótske)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="251"/>
         <source>Geez</source>
         <extracomment>Language name gez</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Geez</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
         <source>Gothic</source>
         <extracomment>Language name got</extracomment>
         <translation>Gotické</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
         <source>Manx</source>
         <extracomment>Language name gv</extracomment>
         <translation>Manské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
         <source>Greek, Ancient (to 1453)</source>
         <extracomment>Language name grc</extracomment>
         <translation>Starogrécke (do 1453)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="262"/>
         <source>Hebrew</source>
         <extracomment>Language name he</extracomment>
         <translation>Hebrejské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
         <source>Hausa</source>
         <extracomment>Language name hau</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Hausa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
         <source>Hawaiian</source>
         <extracomment>Language name haw</extracomment>
         <translation>Havajské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
         <source>Hindi</source>
         <extracomment>Language name hi</extracomment>
         <translation>Hindské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="271"/>
         <source>Croatian</source>
         <extracomment>Language name hr</extracomment>
         <translation>Chorvátske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="275"/>
         <source>Hungarian</source>
         <extracomment>Language name hu</extracomment>
         <translation>Ma�arské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
         <source>Huave, San Mateo Del Mar</source>
         <extracomment>Language name huv</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Huave, San Mateo Del Mar</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
         <source>Armenian</source>
         <extracomment>Language name hy</extracomment>
         <translation>Arménske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
         <source>Indonesian</source>
         <extracomment>Language name id</extracomment>
         <translation>Indonézske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
         <source>Icelandic</source>
         <extracomment>Language name is</extracomment>
         <translation>Islandské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
         <source>Italian</source>
         <extracomment>Language name it</extracomment>
         <translation>Talianske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="291"/>
         <source>Itzu00e1</source>
         <extracomment>Language name itz</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Itzu00e1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="293"/>
         <source>Ixil, San Juan Cotzal</source>
         <extracomment>Language name ixl</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Ixil, San Juan Cotzal</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
         <source>Japanese</source>
         <extracomment>Language name ja</extracomment>
         <translation>Japonské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
         <source>Jacalteco, Eastern</source>
         <extracomment>Language name jac</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Jacalteco, Východné</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
         <source>Javanese, Caribbean</source>
         <extracomment>Language name jvn</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Jávske, Karibské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="302"/>
         <source>Georgian</source>
         <extracomment>Language name ka</extracomment>
         <translation>Gruzínske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
         <source>Korean</source>
         <extracomment>Language name ko</extracomment>
         <translation>Kórejské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="315"/>
         <source>Kurdish</source>
         <extracomment>Language name ku</extracomment>
         <translation>Kurdské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
         <source>Kirghiz</source>
         <extracomment>Language name ky</extracomment>
         <translation>Kyrgizské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
         <source>Latin</source>
         <extracomment>Language name la</extracomment>
         <translation>Latinské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
         <source>Lacandon</source>
         <extracomment>Language name lac</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Lacandon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
         <source>Lithuanian</source>
         <extracomment>Language name lt</extracomment>
         <translation>Litovské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="332"/>
         <source>Latvian</source>
         <extracomment>Language name lv</extracomment>
         <translation>Lotyšské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="334"/>
         <source>Malagasy</source>
         <extracomment>Language name mg</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Madagaskarské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="337"/>
         <source>Maori</source>
         <extracomment>Language name mi</extracomment>
         <translation>Maorské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="339"/>
         <source>Mixe, Isthmus</source>
         <extracomment>Language name mir</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Mixe, Isthmus</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="341"/>
         <source>Mixtec, Coatzospan</source>
         <extracomment>Language name miz</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Mixtec, Coatzospan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="343"/>
         <source>Macedonian</source>
         <extracomment>Language name mk</extracomment>
         <translation>Macedónske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="345"/>
         <source>Mixtec, Silacayoapan</source>
         <extracomment>Language name mks</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Mixtec, Silacayoapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="350"/>
         <source>More</source>
         <extracomment>Language name mos</extracomment>
         <translation>Maorské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
         <source>Malay</source>
         <extracomment>Language name ms</extracomment>
         <translation>Malajské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
         <source>Maltese</source>
         <extracomment>Language name mt</extracomment>
         <translation>Maltské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="375"/>
         <source>Low German; Low Saxon</source>
         <extracomment>Language name nds</extracomment>
         <translation>Dolnonemecké; dolnosaské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="377"/>
         <source>Nepali</source>
         <extracomment>Language name ne</extracomment>
         <translation>Nepálske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="379"/>
         <source>Nahuatl, Guerrero</source>
         <extracomment>Language name ngu</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Nahuatl, Guerrero</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
         <source>Nahuatl, Northern Oaxaca</source>
         <extracomment>Language name nhy</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Nahuatl, Northern Oaxaca</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
         <source>Dutch</source>
         <extracomment>Language name nl</extracomment>
         <translation>Holandské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
         <source>Norwegian Nynorsk</source>
         <extracomment>Language name nn</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Nórske Nynorsk</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
         <source>Norwegian</source>
         <extracomment>Language name no</extracomment>
         <translation>Nórske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="397"/>
         <source>Otomi, Queru00e9taro</source>
         <extracomment>Language name otq</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Otomi, Queru00e9taro</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
         <source>Papiamento</source>
         <extracomment>Language name pap</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Papiamento</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
         <source>Polish</source>
         <extracomment>Language name pl</extracomment>
         <translation>Poľské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="411"/>
         <source>Persian (Dari)</source>
         <extracomment>Language name prs</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Perzské (Dari)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="415"/>
         <source>Portuguese</source>
         <extracomment>Language name pt</extracomment>
         <translation>Portugalské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
         <source>Brasilian Portuguese</source>
         <extracomment>Language name pt_BR</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Brazílska portugal�ina</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
         <source>Quichu00e9, West Central</source>
         <extracomment>Language name qut</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Quichu00e9, Západocentrálne</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
         <source>Romanian</source>
         <extracomment>Language name ro</extracomment>
         <translation>Rumunské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
         <source>Russian</source>
         <extracomment>Language name ru</extracomment>
         <translation>Ruské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="431"/>
         <source>Scots</source>
         <extracomment>Language name sco</extracomment>
         <translation>Škótske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="437"/>
         <source>Slovak</source>
         <extracomment>Language name sk</extracomment>
         <translation>Slovenské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="439"/>
         <source>Slovenian</source>
         <extracomment>Language name sl</extracomment>
         <translation>Slovinské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="443"/>
         <source>Somali</source>
         <extracomment>Language name so</extracomment>
         <translation>Somálske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
         <source>Albanian</source>
         <extracomment>Language name sq</extracomment>
         <translation>Albánske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="453"/>
         <source>Swedish</source>
         <extracomment>Language name sv</extracomment>
         <translation>Švédske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="455"/>
         <source>Swahili</source>
         <extracomment>Language name sw</extracomment>
         <translation>Swahilské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="457"/>
         <source>Syriac</source>
         <extracomment>Language name syr</extracomment>
         <translation>Sýrske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="459"/>
         <source>Tamil</source>
         <extracomment>Language name ta</extracomment>
         <translation>Tamilské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="463"/>
         <source>Thai</source>
         <extracomment>Language name th</extracomment>
         <translation>Thajské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
         <source>Tagalog</source>
         <extracomment>Language name tl</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Tagalog</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="470"/>
         <source>Tswana</source>
         <extracomment>Language name tn</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Tswana</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="472"/>
         <source>Turkish</source>
         <extracomment>Language name tr</extracomment>
         <translation>Turecké</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
         <source>Tektiteko</source>
         <extracomment>Language name ttc</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Tektiteko</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="479"/>
         <source>Tahitian</source>
         <extracomment>Language name ty</extracomment>
         <translation>Tahitské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="481"/>
         <source>Tzotzil, Zinacantu00e1n</source>
         <extracomment>Language name tzz</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Tzotzil, Zinacantu00e1n</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
         <source>Ukrainian</source>
         <extracomment>Language name uk</extracomment>
         <translation>Ukrajinské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
         <source>Orya</source>
         <extracomment>Language name ury</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Orya</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
         <source>Uspanteco</source>
         <extracomment>Language name usp</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Uspanteco</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="492"/>
         <source>Vietnamese</source>
         <extracomment>Language name vi</extracomment>
         <translation>Vietnamské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="496"/>
         <source>Xhosa</source>
         <extracomment>Language name xh</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Xhosa</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="163"/>
         <source>Bavarian</source>
         <extracomment>Language name bar</extracomment>
         <translation>Bavorské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="326"/>
         <source>Lombard</source>
         <extracomment>Language name lmo</extracomment>
         <translation>Lombardské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="403"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
         <source>Uma</source>
         <extracomment>Language name ppk
 ----------
 Language name ppk</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Uma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="448"/>
         <source>Sranan</source>
         <extracomment>Language name srn</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Sranan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
         <source>Yiddish</source>
         <extracomment>Language name yi</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Jidiš</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
         <source>Zapotec, San Juan Guelavu00eda</source>
         <extracomment>Language name zab</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Zapotec, San Juan Guelavu00eda</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="507"/>
         <source>Zapotec, Mitla</source>
         <extracomment>Language name zaw</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Zapotec, Mitla</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="509"/>
         <source>Chinese</source>
         <extracomment>Language name zh</extracomment>
         <translation>Čínske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="511"/>
         <source>Zapotec, Amatlu00e1n</source>
         <extracomment>Language name zpo</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Zapotec, Amatlu00e1n</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
         <source>Zapotec, Zoogocho</source>
         <extracomment>Language name zpq</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Zapotec, Zoogocho</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="515"/>
         <source>Zapotec, Yalu00e1lag</source>
         <extracomment>Language name zpu</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Zapotec, Yalu00e1lag</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
         <source>Zapotec, Chichicapan</source>
         <extracomment>Language name zpv</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Zapotec, Chichicapan</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
         <source>Zapotec, Southern Rincon</source>
         <extracomment>Language name zsr</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Zapotec, Southern Rincon</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
         <source>Zapotec, Quioquitani-Quieru00ed</source>
         <extracomment>Language name ztq</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Zapotec, Quioquitani-Quieru00ed</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
         <source>Zapotec, Yatee</source>
         <extracomment>Language name zty</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Zapotec, Yatee</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="525"/>
         <source>Zulu</source>
         <extracomment>Language name zu</extracomment>
         <translation>Zulské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="314"/>
         <source>Footnotes</source>
         <translation>Poznámky pod �iarou</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="316"/>
         <source>Strong&apos;s numbers</source>
         <translation>Strongové �íslo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="318"/>
         <source>Headings</source>
         <translation>Nadpisy</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="320"/>
         <source>Morphological tags</source>
         <translation>Morfologické zna�ky</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="322"/>
         <source>Lemmas</source>
         <translation>Lemy</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="324"/>
         <source>Hebrew vowel points</source>
         <translation>Body hebrejských samohlások</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="326"/>
         <source>Hebrew cantillation marks</source>
         <translation>Zobraziť hebrejské liturgické znaky</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="328"/>
         <source>Greek accents</source>
         <translation>Grécke akcenty</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="330"/>
         <source>Red letter words</source>
         <translation>Slová s �erveným písmom</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="332"/>
         <source>Textual variants</source>
         <translation>Textové varianty</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="334"/>
         <source>Scripture cross-references</source>
         <translation>Krížové referencie Písma</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="336"/>
         <source>Morph segmentation</source>
         <translation>Morfologické delenie</translation>
     </message>
     <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation>Export</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
         <source>Local</source>
         <translation>Lokálny</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>Vzdialený</translation>
+        <source>Remote FTP</source>
+        <translation>Vzdialený FTP</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>Starý zákon</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="32"/>
+        <source>Remote SFTP</source>
+        <translation>Vzdialený SFTP</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>Mojžišove knihy/Pentateuch/Tóra</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="33"/>
+        <source>Remote HTTP</source>
+        <translation>Vzdialený HTTP</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>História</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="34"/>
+        <source>Remote HTTPS</source>
+        <translation>Vzdialený HTTPS</translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>Proroci</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>Nový zákon</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>Evanjeliá</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>Listy/Epištoly</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>Pavlove epištoly</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
         <source>HTML files</source>
         <translation>HTML súbory</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="438"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>All files</source>
         <translation>Všetky súbory</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>Text files</source>
         <translation>Textové súbory</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="444"/>
         <source>Save file</source>
         <translation>Uložiť súbor</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="130"/>
         <source>Save document ...</source>
-        <translation>Uložiť dokument...</translation>
-    </message>
-    <message>
-        <source>Print keys</source>
-        <translation type="obsolete">Tla�iť kľú�e</translation>
+        <translation>Uložiť dokument…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
         <source>BibleTime bookmark files</source>
         <translation>Súbor BibleTime záložiek</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="127"/>
         <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <source>Change description ...</source>
-        <translation type="obsolete">Zmeniť popis...</translation>
-    </message>
-    <message>
-        <source>Enter a new description for the chosen bookmark.</source>
-        <translation type="obsolete">Vložiť nový popis pre zvolenú záložku.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="60"/>
         <source>New folder</source>
         <translation>Nový prie�inok</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
+        <location filename="../../src/util/tool.cpp" line="48"/>
         <source>The file already exists.</source>
         <translation>Súbor už existuje.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
+        <location filename="../../src/util/tool.cpp" line="49"/>
         <source>Do you want to overwrite it?</source>
         <translation>Chcete ho prepísať?</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
+        <location filename="../../src/util/tool.cpp" line="69"/>
+        <location filename="../../src/util/tool.cpp" line="75"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>Súbor nie je možné uložiť.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
+        <location filename="../../src/util/tool.cpp" line="78"/>
         <source>Please check permissions etc.</source>
         <translation>Skontrolujte prosím práva at�.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
+        <location filename="../../src/util/tool.cpp" line="197"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>Dávajte si pozor, toto dielo obsahuje kultový / otázny materiál!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
+        <location filename="../../src/util/tool.cpp" line="218"/>
         <source>Version</source>
         <translation>Verzia</translation>
     </message>
     <message>
-        <source>Settings Migration</source>
-        <translation type="obsolete">Nastavenia migrácie</translation>
-    </message>
-    <message>
-        <source>It appears you have a BibleTime configuration from KDE 3 stored in %1, and you have not migrated it to this version.  Would you like to import it?</source>
-        <translation type="obsolete">Zdá sa, že vaša BibleTime konfigurácia z KDE 3 je uložená v %1, a nebola premigrovaná do tejto verzie. Chcete ju naimportovať?</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
+        <location filename="../../src/util/tool.cpp" line="207"/>
         <source>Encrypted - needs unlock key</source>
         <translation>Šifrovaný - potrebný je kľú� na odomknutie</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
+        <location filename="../../src/util/tool.cpp" line="231"/>
         <source>Double click for more information</source>
         <translation>Dvojklik zobrazí viac informácií</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
+        <location filename="../../src/util/tool.cpp" line="213"/>
         <source>Updated version available!</source>
         <translation>Dostupná je nová aktualizácia!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
+        <location filename="../../src/util/tool.cpp" line="71"/>
+        <source>Error while writing to file.</source>
+        <translation>Chyba pri zapisovaní do súbora.</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="72"/>
+        <source>Please check that enough disk space is available.</source>
+        <translation>Prosím skontrolujte dostatok voľného miesta na disku.</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="77"/>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation>Nie je možné otvoriť súbor pre uloženie.</translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="226"/>
         <source>Installed version</source>
         <translation>Nainštalovaná verzia</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="273"/>
         <source>Haitian Creole</source>
         <extracomment>Language name ht</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Haitské kreolské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
         <source>Kekchu00ed</source>
         <comment>kek</comment>
         <extracomment>Language name kek</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Kekchu00ed</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="357"/>
         <source>(Multiple languages)</source>
         <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
         <translation>Viacjazy�né</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="359"/>
         <source>Mam, Central</source>
         <extracomment>Language name mvc</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Mam, Central</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
         <source>Mam, Todos Santos Cuchumatu00e1n</source>
         <extracomment>Language name mvj</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Mam, Todos Santos Cuchumatu00e1n</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="363"/>
         <source>Mixe, Juquila</source>
         <extracomment>Language name mxq</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Mixe, Juquila</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="365"/>
         <source>Mixtec, Jamiltepec</source>
         <extracomment>Language name mxt</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Mixtec, Jamiltepec</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="367"/>
         <source>Burmese</source>
         <extracomment>Language name my</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Barmské</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="370"/>
         <source>Norwegian Bokmu00e5l</source>
         <extracomment>Language name nb</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Nórske Bokmu00e5l</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="372"/>
         <source>Nahuatl, Michoacu00e1n</source>
         <extracomment>Language name ncl</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Nahuatl, Michoacu00e1n</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
         <source>Potawatomi</source>
         <extracomment>Language name pot</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Potawatomi</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="468"/>
         <source>Klingon</source>
         <extracomment>Language name tlh</extracomment>
         <translation>Klingónske</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="498"/>
         <source>Mixtec, Diuxi-Tilantongo</source>
         <extracomment>Language name xtd</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Mixtec, Diuxi-Tilantongo</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
         <source>Yoryba</source>
         <extracomment>Language name yo</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Yoryba</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="407"/>
         <source>Verb tense changed</source>
         <translation>Slovesný �as sa zmenil</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>Can&apos;t write file</source>
         <translation>Nie je možné zapísať súbor</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>The Sword config file can&apos;t be written!</source>
         <translation>Nie je možné zapísať Sword konfiguráciu!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="39"/>
         <source>Export Bookmarks</source>
         <translation>Exportovať záložky</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="50"/>
         <source>Import bookmarks</source>
         <translation>Import záložiek</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
+        <location filename="../../src/util/tool.cpp" line="46"/>
         <source>Overwrite File?</source>
         <translation>Prepísať súbor?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="276"/>
         <source>Parsing Strong&apos;s Numbers</source>
         <translation>Spracovanie strongových �ísel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="154"/>
         <source>This shortcut conflicts with the shortcut for the following actions:</source>
-        <translation>Táto skratka je v konflikte so skrátkou pre naslevoné akcie:</translation>
+        <translation>Táto skratka je v konflikte so skratkou pre nasledovné akcie:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
         <source>Do you want to clear the conflicting shortcuts and continue?</source>
         <translation>Chcete vymazať konfliktné skratky a pokra�ovať?</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="23"/>
         <source>Indexed works</source>
-        <translation type="unfinished"></translation>
+        <translation>Indexované diela</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="24"/>
         <source>Unindexed works</source>
-        <translation type="unfinished"></translation>
+        <translation>Neindexované diela</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="44"/>
         <source>Show this help message and exit</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť tohoto pomocníka a skon�iť</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="47"/>
         <source>Output BibleTime version and exit</source>
-        <translation type="unfinished"></translation>
+        <translation>BibleTime verzia a skon�iť</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="50"/>
         <source>Open a clean session</source>
-        <translation type="unfinished"></translation>
+        <translation>Otvoriť prázdnu reláciu</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="53"/>
         <source>Open the default Bible with the reference &lt;ref&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Otvoriť štandardnú Bibliu s odkazom &lt;ref&gt;</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="56"/>
         <source>For command-line arguments parsed by the Qt toolkit, see %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pre argumenty príkazového riadku spracovaných v QT pozri %1.</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="103"/>
         <source>Error: %1 expects an argument.</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba: %1 o�akáva argument.</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="106"/>
         <source>See --help for details.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pre detaily použite voľbu --help.</translation>
     </message>
     <message>
         <location filename="../../src/main.cpp" line="111"/>
         <source>Error: Invalid command-line argument: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba: Neplatný argument príkazového riadku: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="57"/>
         <source>CSS base template not found!</source>
-        <translation type="unfinished"></translation>
+        <translation>CSS základná šablóna nebola nájdená!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="74"/>
         <source>Default template &quot;%1&quot; not found!</source>
-        <translation type="unfinished"></translation>
+        <translation>Štandardná šablóna &quot;%1&quot; nebola nájdená!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="113"/>
         <source>Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>Nahradiť</translation>
     </message>
 </context>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="58"/>
         <source>OK</source>
         <comment>Dialog Button</comment>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="59"/>
         <source>Open</source>
         <comment>Dialog Button</comment>
         <translation>Otvoriť</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="60"/>
         <source>Save</source>
         <comment>Dialog Button</comment>
         <translation>Uložiť</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="61"/>
         <source>Cancel</source>
         <comment>Dialog Button</comment>
         <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="62"/>
         <source>Close</source>
         <comment>Dialog Button</comment>
         <translation>Zatvoriť</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="63"/>
         <source>Discard</source>
         <comment>Dialog Button</comment>
         <translation>Zahodiť</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="64"/>
         <source>Apply</source>
         <comment>Dialog Button</comment>
         <translation>Použiť</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="65"/>
         <source>Reset</source>
         <comment>Dialog Button</comment>
         <translation>Resetovať</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="66"/>
         <source>Restore defaults</source>
         <comment>Dialog Button</comment>
         <translation>Obnoviť štandardné</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="67"/>
         <source>Help</source>
         <comment>Dialog Button</comment>
         <translation>Pomocník</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="68"/>
         <source>Save All</source>
         <comment>Dialog Button</comment>
         <translation>Všetko uložiť</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="69"/>
         <source>Yes</source>
         <comment>Dialog Button</comment>
         <translation>�no</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="70"/>
         <source>Yes to all</source>
         <comment>Dialog Button</comment>
         <translation>�no pre všetko</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="71"/>
         <source>No</source>
         <comment>Dialog Button</comment>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="72"/>
         <source>No to all</source>
         <comment>Dialog Button</comment>
         <translation>Pre všetko nie</translation>
@@ -4562,102 +4434,102 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchOptionsArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="97"/>
         <source>Search for:</source>
         <translation>Hľadať:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="104"/>
         <source>&amp;Search</source>
         <translation>&amp;Hľadanie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="106"/>
         <source>Start to search the text in the chosen works</source>
         <translation>Spustiť hľadanie textu vo zvolených dielach</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="109"/>
         <source>Ch&amp;oose...</source>
-        <translation>Vy&amp;brať...</translation>
+        <translation>Vy&amp;brať…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="111"/>
         <source>Choose works for the search</source>
         <translation>Vybrať diela do vyhľadávania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="114"/>
         <source>S&amp;etup...</source>
-        <translation>&amp;Nastaviť...</translation>
+        <translation>&amp;Nastaviť…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="133"/>
         <source>All of the words (AND is added between the words)</source>
         <translation>Všetky slová (AND je pridané medzi slová)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="137"/>
         <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
         <translation> (&lt;a href=&apos;syntax_help&apos;&gt;úplná syntax&lt;/a&gt;)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="148"/>
         <source>Scope:</source>
         <translation>Záber:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="169"/>
         <source>The text you want to search for</source>
         <translation>Text, ktorý chcete hľadať</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="173"/>
         <source>Works:</source>
         <translation>Diela:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="346"/>
         <source>No search scope</source>
         <translation>Bez rozsahu vyhľadávania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="128"/>
         <source>All words</source>
         <translation>Všetky slová</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="116"/>
         <source>Configure predefined scopes for search</source>
         <translation>Konfigurovať preddefinované zábery hľadania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="130"/>
         <source>Some words</source>
         <translation>Niektoré slová</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
         <source>Free</source>
         <translation>Voľné</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
         <source>Some of the words (OR is added between the words)</source>
         <translation>Niektoré slová (OR bude pridané medzi slová)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
         <source>Full lucene syntax</source>
         <translation>Úplná syntax lucene</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
         <source>Click the link to get help for search syntax</source>
         <translation>Kliknite na odkaz, ak chcete získať pomoc pre syntax hľadania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="159"/>
         <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
         <translation>Vybrať záber (knihy/kapitoly/verše do vyhľadávania).&lt;br /&gt;Použiteľné pre Biblie a komentáre.</translation>
     </message>
@@ -4665,262 +4537,262 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchResultArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="85"/>
         <source>Text of the selected search result item</source>
         <translation>Text vybranej položky výsledku hľadania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="88"/>
         <source>Select all</source>
-        <translation type="unfinished">Ozna�iť všetko</translation>
+        <translation>Vybrať všetko</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="92"/>
         <source>Copy</source>
-        <translation type="unfinished">Kopírovať</translation>
+        <translation>Kopírovať</translation>
     </message>
 </context>
 <context>
     <name>Search::BtSearchSyntaxHelpDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="47"/>
         <source>Search Syntax Help</source>
-        <translation type="unfinished">Pomocník pre syntax hľadania</translation>
+        <translation>Pomocník pre syntax hľadania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="94"/>
         <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
-        <translation type="unfinished"></translation>
+        <translation>Táto pomoc je hlavne pre možnosť &apos;Úplná syntax&apos;. Možnosti &apos;Všetky slová&apos; a &apos;Niektoré slová&apos; majú viac obmedzenú syntax; &lt;a href=&apos;#wildcards&apos;&gt;zástupné znaky&lt;/a&gt; a &lt;a href=&apos;#fields&apos;&gt;textové polia&lt;/a&gt; sú pri nich podporované. Niektoré �alšie vlastnosti syntaxe môžu dať zvláštne alebo zlé výsledky pri použití s voľbami &apos;Všetky slová&apos; a &apos;Niektoré slová&apos;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
         <source>Which words to find</source>
-        <translation type="unfinished"></translation>
+        <translation>Aké slovo hľadať</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="101"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
         <source>Grouping and order</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoskupovanie a poradie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="103"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
         <source>Wildcards (partial words)</source>
-        <translation type="unfinished"></translation>
+        <translation>Zástupné znaky (�iasto�né slová)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
         <source>Text fields (different parts of text)</source>
-        <translation type="unfinished"></translation>
+        <translation>Textové polia (rôzne �asti textu)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="208"/>
         <source>Other syntax features</source>
-        <translation type="unfinished"></translation>
+        <translation>Ďalšie syntaktické funkcie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
         <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
         <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>Vyhľadávané termíny sa oddeľujú medzerami. &lt;strong&gt;AND&lt;/strong&gt; (všetky slová), &lt;strong&gt;OR&lt;/strong&gt; (niektoré slová) a &lt;strong&gt;NOT&lt;/strong&gt; (nie nasledujúce slovo) môžu byť pridané medzi slová. Ak nie je použité ani jedno z nich, automaticky sa použije OR. &apos;&lt;strong&gt;+&lt;/strong&gt;slovo&apos; znamená, že slovo musí byť vo výsledkoch. &apos;&lt;strong&gt;-&lt;/strong&gt;slovo&apos; znamená, že slovo sa nesmie nachádzať vo výsledkoch.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="119"/>
         <source>jesus AND god</source>
         <comment>Do not translate &quot;AND&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>ježiš AND boh</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="121"/>
         <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyhľadá verše, v ktorých sa nachádza &apos;Ježiš&apos; a &apos;Boh&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="123"/>
         <source>jesus OR god</source>
         <comment>Do not translate &quot;OR&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>ježiš OR boh</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="125"/>
         <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyhľadá verše, v ktorých sa nachádza &apos;Ježiš&apos; alebo &apos;Boh&apos; alebo oba výrazy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="127"/>
         <source>jesus NOT god</source>
         <comment>Do not translate &quot;NOT&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>ježiš NOT boh</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="133"/>
         <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyhľadá verše, v ktorých sa nachádza &apos;Ježiš&apos; ale nie &apos;Boh&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="131"/>
         <source>+jesus -god</source>
-        <translation type="unfinished"></translation>
+        <translation>+ježiš -boh</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
         <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Slová môžu byť zoskupené so &lt;strong&gt;zátvorkami&lt;/strong&gt;. Striktné poradie slov môže byť definované pomocou &lt;strong&gt;úvodzoviek&lt;/strong&gt;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
         <source>(a AND b) OR c</source>
         <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>(a AND b) OR c</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
         <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyhľadá verše, v ktorých sa nachádza &apos;a&apos; A &apos;b&apos; alebo &apos;c&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="145"/>
         <source>&quot;says lord&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;hovorí pán&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="149"/>
         <source>&quot;says the lord&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;hovorí Pán&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="151"/>
         <source>Finds all verses with &apos;says the LORD&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyhľadá všetky verše s &apos;hovorí Pán&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
         <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; zodpovedá ľubovoľnej postupnosti 0 a viac znakov, zatiaľ �o &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; len jednému ľubovoľnému znaku. Zástupné znaky nie je možné použiť na za�iatku slova.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="160"/>
         <source>a*</source>
-        <translation type="unfinished"></translation>
+        <translation>a*</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="162"/>
         <source>All words beginning with &apos;a&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Všetky slová za�ínajúce s &apos;a&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="164"/>
         <source>a*a</source>
-        <translation type="unfinished"></translation>
+        <translation>a*a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="166"/>
         <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;Asýria&apos;, &apos;aróma&apos;, &apos;abba&apos; at�.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="168"/>
         <source>a?</source>
-        <translation type="unfinished"></translation>
+        <translation>s?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="170"/>
         <source>&apos;at&apos; and &apos;an&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;sa&apos;, &apos;sú&apos;, &apos;so&apos; a pod.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="172"/>
         <source>a??a</source>
-        <translation type="unfinished"></translation>
+        <translation>a??a</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="174"/>
         <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;abba&apos; at�.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
         <source>Available text fields:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dostupné textové polia:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="181"/>
         <source>Searches headings</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyhľadávanie nadpisov</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="183"/>
         <source>Searches footnotes</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyhľadávanie poznámok</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="185"/>
         <source>Searches Strong&apos;s numbers</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyhľadávanie Strongových �ísiel</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="187"/>
         <source>Searches morphology codes</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyhľadávanie morfologických kódov</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="189"/>
         <source>Examples:</source>
-        <translation type="unfinished"></translation>
+        <translation>Príklady:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="191"/>
         <source>heading:Jesus</source>
         <comment>Do not translate &quot;heading:&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>heading:Ježiš</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="193"/>
         <source>Finds headings with &apos;Jesus&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyhľadá nadpis so slovom &apos;Ježiš&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="195"/>
         <source>footnote:Jesus AND footnote:said</source>
         <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>footnote:Ježiš AND footnote:povedal</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
         <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyhľadá poznámky s &apos;Ježiš&apos; a &apos;povedal&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
         <source>strong:G846</source>
         <comment>Do not translate &quot;strong:&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>strong:G846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="202"/>
         <source>Finds verses with Strong&apos;s Greek number 846</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyhľadá verše, ktoré obsahujú grécke strongové �íslo 846</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="204"/>
         <source>morph:&quot;N-NSF&quot;</source>
         <comment>Do not translate &quot;morph:&quot;.</comment>
-        <translation type="unfinished"></translation>
+        <translation>morph:&quot;N-NSF&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="206"/>
         <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyhľadá verše, ktoré obsahujú morfologický kód &apos;N-NSF&apos;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="210"/>
         <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
-        <translation type="unfinished"></translation>
+        <translation>BibleTime používa CLucene pre vyhľadávanie. Viac sa môžete do�ítať na web stránke &lt;a href=&apos;%1&apos;&gt;lucene syntax&lt;/a&gt; (v externom prehliada�i).</translation>
     </message>
 </context>
 <context>
@@ -4938,7 +4810,7 @@ Language name ppk</extracomment>
     <message>
         <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="64"/>
         <source>Copy...</source>
-        <translation>Kopírovať...</translation>
+        <translation>Kopírovať…</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="66"/>
@@ -4956,39 +4828,27 @@ Language name ppk</extracomment>
     <message>
         <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="74"/>
         <source>Save...</source>
-        <translation>Uložiť...</translation>
+        <translation>Uložiť…</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="84"/>
         <source>Print...</source>
-        <translation>Tla�iť...</translation>
-    </message>
-    <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Kopírovať výsledky hľadania...</translation>
+        <translation>Tla�iť…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="231"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="241"/>
         <source>Copying search result</source>
         <translation>Kopírovanie výsledkov hľadania</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Uložiť výsledky hľadania...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="250"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="259"/>
         <source>Saving search result</source>
         <translation>Ukladanie výsledkov hľadania</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Vytla�iť výsledky hľadania...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="268"/>
         <source>Printing search result</source>
         <translation>Tla� výsledkov hľadania</translation>
     </message>
@@ -5008,7 +4868,7 @@ Language name ppk</extracomment>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="137"/>
         <source>Select a scope from the list to edit the searchranges</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyberte rozsah zo zoznamu na úpravu rozsahu hľadania</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="148"/>
@@ -5023,7 +4883,7 @@ Language name ppk</extracomment>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="152"/>
         <source>Change the search ranges of the selected searchscope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmeniť rozsahy hľadania vybranej položky rozsahu. Pozrite sa na preddefinované rozsahy vyhľadávania, ak chcete vidieť, ako sú rozsahy zostavené.</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="157"/>
@@ -5036,14 +4896,6 @@ Language name ppk</extracomment>
         <translation>Nový rozsah</translation>
     </message>
     <message>
-        <source>&lt;invalid name of search range&gt;</source>
-        <translation type="obsolete">&lt;neplatný názov rozsahu hľadania&gt;</translation>
-    </message>
-    <message>
-        <source>Select a scope from the list to edit the search ranges</source>
-        <translation type="obsolete">Vyberte záber zo zoznamu na upravenie rozsahu hľadania</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="140"/>
         <source>&amp;Add new scope</source>
         <translation>Prid&amp;ať nový záber</translation>
@@ -5069,10 +4921,6 @@ Language name ppk</extracomment>
         <translation>Zmeniť názov ozna�eného záberu hľadania</translation>
     </message>
     <message>
-        <source>Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="obsolete">Zmení rozsah hľadania zvolenej položky. Pozrite si preddefinované rozsahy, aby ste videli, ako sú zostavené.</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="158"/>
         <source>The search ranges which will be used for the search, parsed to the canonical form</source>
         <translation>Rozsah hľadania, ktorý bude použitý pre hľadanie, spracovanie do kanonickej formy</translation>
@@ -5086,48 +4934,42 @@ Language name ppk</extracomment>
 <context>
     <name>Search::CSearchDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="130"/>
         <source>Missing indices</source>
         <translation>Chýbajúce indexy</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="87"/>
         <source>Search</source>
         <translation>Hľadať</translation>
     </message>
     <message>
-        <source>One or more works need indexing before they can be searched.
-This could take a long time. Proceed with indexing?</source>
-        <translation type="obsolete">Jedno alebo viac diel potrebuje indexáciu pred tým, než sa v ňom bude vyhľadávať.
-Toto môže dlho trvať. Pokra�ovať s indexovaním?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="131"/>
         <source>The following modules need to be indexed before they can be searched in:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nasledujúce moduly musia byť zindexované pred tým ako v nich bude hľadané:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="132"/>
         <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
-        <translation type="unfinished"></translation>
+        <translation>Indexovanie môže trvať dlhšiu dobu. Kliknite na &quot;�no&quot; pre zindexovanie modulov a spustenie hľadania, alebo &quot;Nie&quot; na zrušenie hľadania.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="236"/>
         <source>Drag any verse reference onto an open Bible window</source>
-        <translation type="unfinished"></translation>
+        <translation>Potiahnite ktorúkoľvek referenciu do otvoreného okna Biblie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="241"/>
         <source>&amp;Analyze results...</source>
-        <translation>&amp;Analyzovať výsledky...</translation>
+        <translation>&amp;Analyzovať výsledky…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="242"/>
         <source>Show a graphical analysis of the search result</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobraziť grafickú analýzu výsledkov hľadania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="248"/>
         <source>&amp;Close</source>
         <translation>&amp;Zatvoriť</translation>
     </message>
@@ -5142,7 +4984,7 @@ Toto môže dlho trvať. Pokra�ovať s indexovaním?</translation>
     <message>
         <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="47"/>
         <source>Copy...</source>
-        <translation>Kopírovať...</translation>
+        <translation>Kopírovať…</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="50"/>
@@ -5160,39 +5002,27 @@ Toto môže dlho trvať. Pokra�ovať s indexovaním?</translation>
     <message>
         <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="61"/>
         <source>Save...</source>
-        <translation>Uložiť...</translation>
+        <translation>Uložiť…</translation>
     </message>
     <message>
         <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="73"/>
         <source>Print...</source>
-        <translation>Tla�iť...</translation>
-    </message>
-    <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">Vytla�iť výsledky hľadania...</translation>
+        <translation>Tla�iť…</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="164"/>
         <source>Printing search result</source>
         <translation>Tla� výsledkov hľadania</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">Uložiť výsledky hľadania...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="192"/>
         <source>Saving search result</source>
         <translation>Ukladanie výsledkov hľadania</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">Kopírovať výsledky hľadania...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="210"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="228"/>
         <source>Copying search result</source>
         <translation>Kopírovanie výsledkov hľadania</translation>
     </message>
@@ -5205,91 +5035,6 @@ Toto môže dlho trvať. Pokra�ovať s indexovaním?</translation>
 <context>
     <name>StandardWorksTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>Biblia:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>Štandardná Biblia sa použije, ke� sa klikne na hyperodkaz do Biblie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>Komentár:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>Štandardný komentár sa použije, ke� sa klikne na hyperodkaz do komentára</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation>Lexikón:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>Štandardný lexikón sa použije, ke� sa klikne na hyperodkaz do lexikónu</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>Denné zamyslenie:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>Štandardné denné zamyslenie sa použije na zobrazenie krátkeho zamyslenie pri spustení</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>Lexikón hebrejských strongových �ísel:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>Štandardný hebrejský lexikón sa použije, ke� sa klikne na hyperodkaz do hebrejského lexikónu</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>Lexikón gréckych strongových �ísel:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>Štandardný grécky lexikón sa použije, ke� sa klikne na hyperodkaz do gréckeho lexikónu</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>Hebrejský morfologický lexikón:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>Štandardný morfologický lexikón pre hebrejský text sa použije, ke� sa klikne na hyperodkaz morfologickej zna�ky v hebrejskom texte</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation>Grécky morfologický lexikón:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>Štandardný morfologický lexikón pre grécky text sa použije, ke� sa klikne na hyperodkaz morfologickej zna�ky v gréckom texte</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="62"/>
         <source></source>
         <translation></translation>
@@ -5298,112 +5043,97 @@ Toto môže dlho trvať. Pokra�ovať s indexovaním?</translation>
 <context>
     <name>TextFiltersTab</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation type="unfinished">Vložiť ukon�enie riadku po každom verši</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">Zobraziť �ísla veršov</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation type="unfinished">Zobraziť nadpisy oddielov</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">Zobraziť krížové odkazy Biblie</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">Zobraziť grécke akcenty</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">Zobraziť body hebrejských hlások</translation>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
+        <source></source>
+        <translation></translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallProgress</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">Zobraziť hebrejské liturgické znaky</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="81"/>
+        <source>Failed</source>
+        <translation>Zlyhanie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">Zobraziť morfologické delenie</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="84"/>
+        <source>Completed</source>
+        <translation>Ukon�ené</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation type="unfinished">Použiť textové varianty</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="90"/>
+        <source>Cancelled</source>
+        <translation>Zrušené</translation>
     </message>
+</context>
+<context>
+    <name>btm::InstallSources</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="unfinished">Filtre ovládajú vzhľad textu. Tu môžete ur�iť štandardné nastavenia pre všetky filtre. Môžete prepísať tieto nastavenia v každom okne zobrazenia.</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installsources.cpp" line="63"/>
+        <source>Failed to refresh source %1</source>
+        <translation>Nepodarilo sa zaktualizovať zdroj %1</translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source></source>
-        <translation></translation>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="59"/>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="62"/>
+        <source>The text you want to search for</source>
+        <translation>Text, ktorý chcete hľadať</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation>Hľadať text</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="135"/>
+        <source>New Window</source>
+        <translation>Nové okno</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation>Text, ktorý chcete vyhľadať</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="136"/>
+        <source>View Window</source>
+        <translation>Zobraziť okno</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../src/mobile/qml/main.qml" line="137"/>
+        <source>Text Font Size</source>
+        <translation>Veľkosť písma textu</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation>Rozlišovať veľkosť pí&amp;smen</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="138"/>
+        <source>User Interface Font Size</source>
+        <translation>Veľkosť písma používateľského rozhrania</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation>Nájsť predchádzajúci výskyt textu</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="141"/>
+        <source>Bookshelf Manager</source>
+        <translation>Správca knižnice</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation>S&amp;päť</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="187"/>
+        <source>Single</source>
+        <translation>Jednotlivé</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation>Nájsť �alší výskyt text</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="188"/>
+        <source>Tabbed</source>
+        <translation>V kartách</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation>ÄŽ&amp;alej</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="189"/>
+        <source>Auto-tile</source>
+        <translation>Auto dláždenie</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation>Zatvoriť dialóg</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="190"/>
+        <source>Auto-tile horizontally</source>
+        <translation>Auto dláždenie horizontálne</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation>&amp;Zatvoriť</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="191"/>
+        <source>Auto-tile vertically</source>
+        <translation>Auto dláždenie vertikálne</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/messages/bibletime_ui_zh_CN.ts b/i18n/messages/bibletime_ui_zh_CN.ts
deleted file mode 100644
index 84b556a..0000000
--- a/i18n/messages/bibletime_ui_zh_CN.ts
+++ /dev/null
@@ -1,5186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
-<context>
-    <name></name>
-    <message>
-        <source></source>
-        <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
-This file is distributed under the same license as the Bibetime package.</translatorcomment>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>BTAboutModuleDialog</name>
-    <message>
-        <location filename="../../src/frontend/btaboutmoduledialog.cpp" line="45"/>
-        <source>Information About %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BibleTime</name>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
-        <source>&amp;File</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
-        <source>&amp;View</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
-        <source>&amp;Search</source>
-        <translation>�索(&amp;S)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
-        <source>&amp;Window</source>
-        <translation>窗�(&amp;W)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
-        <source>Se&amp;ttings</source>
-        <translation>设置(&amp;T)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
-        <source>&amp;Help</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
-        <source>&amp;Show toolbar</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
-        <source>&amp;Fullscreen mode</source>
-        <translation>全�幕模�(&amp;F)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
-        <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
-        <source>Information about the BibleTime program</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation type="unfinished">�存工作阶段(&amp;S)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>载入工作阶段(&amp;L)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
-        <source>&amp;Delete session</source>
-        <translation>删除工作阶段(&amp;D)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
-        <source>&amp;Arrangement mode</source>
-        <translation>排列模�(&amp;A)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
-        <source>&amp;Manual mode</source>
-        <translation>手动模�(&amp;M)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
-        <source>Auto-tile &amp;vertically</source>
-        <translation>自动垂直并排(&amp;V)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
-        <source>Auto-tile &amp;horizontally</source>
-        <translation>自动水平并排(&amp;H)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
-        <source>Auto-&amp;cascade</source>
-        <translation>自动��显示(&amp;C)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
-        <source>&amp;Cascade</source>
-        <translation>��显示(&amp;C)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
-        <source>Tile &amp;vertically</source>
-        <translation>垂直并排(&amp;V)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
-        <source>Tile &amp;horizontally</source>
-        <translation>水平并排(&amp;H)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
-        <source>Cl&amp;ose all windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
-        <source>Close all open windows inside BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
-        <source>&amp;Handbook</source>
-        <translation>手册(&amp;H)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
-        <source>&amp;Bible Study Howto</source>
-        <translation>如何研�(&amp;B)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
-        <source>Please enter a name for the new session.</source>
-        <translation>请输入新工作阶段的�称.</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
-        <source>Quit BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
-        <source>Toggle fullscreen mode of the main window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
-        <source>Search in &amp;open works...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
-        <source>Search in standard &amp;Bible...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
-        <source>Save as &amp;new session...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
-        <source>Create and save a new session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
-        <source>Manually arrange the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
-        <source>Automatically tile the open windows vertically (arrange side by side)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
-        <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
-        <source>Auto-&amp;tile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
-        <source>Automatically tile the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
-        <source>Ta&amp;bbed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
-        <source>Automatically tab the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
-        <source>Automatically cascade the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
-        <source>Cascade the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
-        <source>&amp;Tile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
-        <source>Tile the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
-        <source>Vertically tile (arrange side by side) the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
-        <source>Horizontally tile (arrange on top of each other) the open windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
-        <source>Close &amp;window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
-        <source>Close the current open window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
-        <source>&amp;Configure BibleTime...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
-        <source>Set BibleTime&apos;s preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
-        <source>Bookshelf &amp;Manager...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
-        <source>Configure your bookshelf and install/update/remove/index works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
-        <source>Open BibleTime&apos;s handbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
-        <source>&amp;Tip of the day...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
-        <source>Show tips about BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
-        <source>Toggle visibility of the bookshelf window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
-        <source>Toggle visibility of the bookmarks window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
-        <source>Toggle visibility of the mag window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
-        <source>Main toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
-        <source>Navigation toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
-        <source>Works toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
-        <source>Tools toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
-        <source>Format toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
-        <source>Show main toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
-        <source>Show navigation bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
-        <source>Show works toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
-        <source>Show tools toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
-        <source>Show formatting toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
-        <source>Show bookshelf</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
-        <source>Show bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
-        <source>Show mag</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
-        <source>Toolbars</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
-        <source>Show toolbars in text windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
-        <source>Show parallel text headers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
-        <source>O&amp;pen windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
-        <source>Show &quot;Whats this widget&quot; dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
-        <source>Whats this widget?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
-        <source>Search in all works that are currently open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
-        <source>Search in the standard Bible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
-        <source>New Session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
-        <source>Initializing the SWORD engine...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
-        <source>Creating BibleTime&apos;s user interface...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
-        <source>Initializing menu- and toolbars...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
-        <source>Unlock Work</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
-        <source>Enter the unlock key for %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
-        <source>Warning: Invalid unlock key!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
-        <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
-        <source>&amp;About BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
-        <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
-        <source>Mag</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BibleTimeApp</name>
-    <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
-        <source>Fatal error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtAboutDialog</name>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
-        <source>BibleTime is an easy to use but powerful Bible study tool.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="271"/>
-        <source>BibleTime is released under the GPL license. You can download and use the program for personal, private, public or commercial purposes without restrictions, but can give away or distribute the program only if you also distribute the corresponding source code.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="277"/>
-        <source>The complete legally binding license is below.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
-        <source>About BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
-        <source>&amp;BibleTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
-        <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
-        <source>&amp;Contributors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
-        <source>The following people contributed to BibleTime:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
-        <source>documentation and translation manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
-        <source>project manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
-        <source>tester</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
-        <source>usability expert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="220"/>
-        <source>Some names may be missing, please email %1 if you notice errors or omissions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="237"/>
-        <source>BibleTime makes use of the SWORD Project. The SWORD Project is the CrossWire Bible Society&apos;s free Bible software project. Its purpose is to create cross-platform open-source tools &amp;mdash; covered by the GNU General Public License &amp;mdash; that allow programmers and Bible societies to write new Bible software more quickly and easily.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="243"/>
-        <source>The SWORD Project: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="251"/>
-        <source>&amp;Qt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="254"/>
-        <source>Qt toolkit version %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="260"/>
-        <source>More info...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="265"/>
-        <source>&amp;License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
-        <source>designer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
-        <source>developer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
-        <source>project founder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
-        <source>packager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
-        <source>creator of The Sword Project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
-        <source>domain sponsor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
-        <source>howto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
-        <source>artist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
-        <source>documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
-        <source>The following people translated BibleTime into their language:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="231"/>
-        <source>&amp;SWORD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="235"/>
-        <source>SWORD library version %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="256"/>
-        <source>This program uses Qt version %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="258"/>
-        <source>Qt is a cross-platform application and UI framework, created with C++ language. It has been released under the LGPL license.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtBibleKeyWidget</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
-        <source>Next book</source>
-        <translation type="unfinished">下一�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
-        <source>Previous book</source>
-        <translation type="unfinished">上一�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
-        <source>Next chapter</source>
-        <translation type="unfinished">下一章</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
-        <source>Previous chapter</source>
-        <translation type="unfinished">上一章</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
-        <source>Next verse</source>
-        <translation type="unfinished">下一节</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
-        <source>Previous verse</source>
-        <translation type="unfinished">上一节</translation>
-    </message>
-</context>
-<context>
-    <name>BtBookDropdownChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="64"/>
-        <source>Select book</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfDockWidget</name>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="150"/>
-        <source>Bookshelf</source>
-        <translation type="unfinished">书架</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="152"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="153"/>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="154"/>
-        <source>&amp;Plain text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="155"/>
-        <source>&amp;HTML</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="156"/>
-        <source>&amp;Unlock...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="157"/>
-        <source>&amp;About...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="159"/>
-        <source>There are currently no works installed. Please click the button below to install new works.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="161"/>
-        <source>&amp;Install works...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="173"/>
-        <source>Warning: Module locked!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="174"/>
-        <source>You are trying to access an encrypted module. Please provide an unlock key in the following dialog to open the module.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfdockwidget.cpp" line="223"/>
-        <source>&amp;Search in %1...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfGroupingMenu</name>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
-        <source>Category/Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
-        <source>Category</source>
-        <translation type="unfinished">类别</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
-        <source>Language/Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
-        <source>Language</source>
-        <translation type="unfinished">语言</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
-        <source>No grouping</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfModel</name>
-    <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
-        <source>Module</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtBookshelfWidget</name>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
-        <source>Fi&amp;lter:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
-        <source>Grouping</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
-        <source>Change the grouping of items in the bookshelf.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">类别</translation>
-    </message>
-    <message>
-        <source>Language</source>
-        <translation type="obsolete">语言</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
-        <source>Show/hide works</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtChapterDropdownChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="85"/>
-        <source>Select chapter</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtDisplaySettingsButton</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
-        <source>Use linebreaks after each verse</source>
-        <translation type="unfinished">�节後�行</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">显示节数</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
-        <source>Show headings</source>
-        <translation type="unfinished">显示标题</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
-        <source>Highlight words of Jesus</source>
-        <translation type="unfinished">�点标示耶稣的�语</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">显示希伯�文元音符�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">显示希伯�文�诵标记</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">显示希腊文�音符�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
-        <source>Use alternative textual variant</source>
-        <translation type="unfinished">使用替代文字�体</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">显示�照�文</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
-        <source>Show footnotes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">显示构�学分割</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
-        <source>Display settings</source>
-        <translation type="unfinished">显示设置</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
-        <source>Display settings: No options available</source>
-        <translation type="unfinished">显示设置: 没有�用选项</translation>
-    </message>
-</context>
-<context>
-    <name>BtEditBookmarkDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
-        <source>Edit Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtFontChooserWidget</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
-        <source>Font name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="98"/>
-        <source>Font style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="99"/>
-        <source>Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtFontSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
-        <source>&amp;Language:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
-        <source>The font selection below will apply to all texts in this language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
-        <source>Use custom font</source>
-        <translation type="unfinished">使用自定义字体</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
-        <source>Optionally specify a custom font for each language:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
-        <source>Fonts</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtIndexPage</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
-        <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
-        <source>Automatically delete orphaned indexes when BibleTime starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
-        <source>Delete the selected indexes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
-        <source>Create new indexes for the selected works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
-        <source>Work</source>
-        <translation type="unfinished">著作</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
-        <source>Index size</source>
-        <translation type="unfinished">索引大�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
-        <source>%1 KiB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
-        <source>0 KiB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
-        <source>Search Indexes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
-        <source>Indexed Works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
-        <source>Unindexed Works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KiB</source>
-        <translation type="obsolete">�字节</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
-        <source>Create...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallModuleChooserDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="64"/>
-        <source>Install/Update works?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="67"/>
-        <source>Do you really want to install these works?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp" line="68"/>
-        <source>Only one version of a work can be installed at the same time. Select only one if there are items marked with red.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallModuleChooserDialogModel</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
-        <source>Work</source>
-        <translation type="unfinished">著作</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
-        <source>Installation source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
-        <source>Version</source>
-        <translation type="unfinished">版本</translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPage</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="263"/>
-        <source>Install/Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="265"/>
-        <source>WARNING!!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="266"/>
-        <source>If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="269"/>
-        <source>Select installation &amp;source:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="270"/>
-        <source>&amp;Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="271"/>
-        <source>Add new source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="272"/>
-        <source>&amp;Delete...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="273"/>
-        <source>Delete this source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="275"/>
-        <source>Select &amp;works to install:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="277"/>
-        <source>Install &amp;folder:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="278"/>
-        <source>The folder where the new works will be installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="279"/>
-        <source>Configure folders where works are installed and found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="280"/>
-        <source>&amp;Install...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="254"/>
-        <source>Start installation of %1 works from %2 sources:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="258"/>
-        <source>Start installation:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="313"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="313"/>
-        <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
-        <source>Delete Source?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
-        <source>Do you really want to delete this source?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="281"/>
-        <source>Install or update selected works</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPageModel</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
-        <source>Work</source>
-        <translation type="unfinished">著作</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
-        <source>Version</source>
-        <translation type="unfinished">版本</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPageWorksWidget</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp" line="68"/>
-        <source>Refresh the list of works from this source</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallPathDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
-        <source>Bookshelf Folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
-        <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
-        <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
-        <source>Configure bookshelf folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
-        <source>Configuration file for the folders is: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
-        <source>Folders where new works can be installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
-        <source>Read-only folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
-        <source>Nonexistent folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
-        <source>&amp;Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
-        <source>Add new folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
-        <source>&amp;Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
-        <source>Edit the selected folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
-        <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
-        <source>Remove the selected folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
-        <source>This default folder in your home directory can&apos;t be removed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
-        <source>Choose Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
-        <source>Use Folder?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
-        <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtInstallProgressDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
-        <source>Work</source>
-        <translation type="unfinished">著作</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
-        <source>Progress</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
-        <source>Stop All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
-        <source>Completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
-        <source>Waiting for turn...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
-        <source>Preparing install...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
-        <source>Install Progress</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
-        <source>Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtLanguageSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
-        <source>Language for names of Bible books:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
-        <source>Languages</source>
-        <translation type="unfinished">语言</translation>
-    </message>
-</context>
-<context>
-    <name>BtModuleChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="76"/>
-        <source>Select a work [%1]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="79"/>
-        <source>Select an additional work</source>
-        <translation type="unfinished">选择�外著作</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="102"/>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="130"/>
-        <source>NONE</source>
-        <translation type="unfinished">æ— </translation>
-    </message>
-</context>
-<context>
-    <name>BtModuleIndexDialog</name>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="33"/>
-        <source>Preparing to index modules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="33"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="37"/>
-        <source>Creating indices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btmoduleindexdialog.cpp" line="67"/>
-        <source>Creating index for work: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtModuleManagerDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
-        <source>Bookshelf Manager</source>
-        <translation type="unfinished">书架管�器</translation>
-    </message>
-</context>
-<context>
-    <name>BtOpenWorkAction</name>
-    <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
-        <source>&amp;Open work</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtOpenWorkActionMenu</name>
-    <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
-        <source>&amp;Grouping order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
-        <source>Sets the grouping order for the items in this menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtRefreshProgressDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="15"/>
-        <source>Refreshing source %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="16"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="17"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="47"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp" line="48"/>
-        <source>Failed to refresh source %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtRemovePage</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
-        <source>Select &amp;works to uninstall:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
-        <source>&amp;Remove...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
-        <source>Start removal of %1 works:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
-        <source>Start removal:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
-        <source>You selected the following work(s): </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
-        <source>Do you really want to remove them from your system?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
-        <source>Remove the selected works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
-        <source>Remove Works?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtRemovePageTreeModel</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp" line="52"/>
-        <source>Work</source>
-        <translation type="unfinished">著作</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp" line="55"/>
-        <source>Install path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtSearchModuleChooserDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
-        <source>Works to Search in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
-        <source>Select the works which should be searched.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtShortcutsDialog</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="26"/>
-        <source>Configure shortcuts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="35"/>
-        <source>Select first or second shortcut and type the shortcut with keyboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="37"/>
-        <source>First shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutsdialog.cpp" line="42"/>
-        <source>Second shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtShortcutsEditor</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="180"/>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="187"/>
-        <source>Select to change key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
-        <source>Action
-name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
-        <source>First
-shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="205"/>
-        <source>Second
-shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="253"/>
-        <source>Shortcut for selected action name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="259"/>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="264"/>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="269"/>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btshortcutseditor.cpp" line="284"/>
-        <source>Default key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceArea</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">著作</translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceAreaModel</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">著作</translation>
-    </message>
-    <message>
-        <source>Version</source>
-        <translation type="obsolete">版本</translation>
-    </message>
-</context>
-<context>
-    <name>BtTextFiltersTab</name>
-    <message>
-        <source>Insert line break after each verse</source>
-        <translation type="obsolete">�节後�入�行符</translation>
-    </message>
-    <message>
-        <source>Show verse numbers</source>
-        <translation type="obsolete">显示节数</translation>
-    </message>
-    <message>
-        <source>Show section headings</source>
-        <translation type="obsolete">显示标题</translation>
-    </message>
-    <message>
-        <source>Show scripture cross-references</source>
-        <translation type="obsolete">显示�照�文</translation>
-    </message>
-    <message>
-        <source>Show Greek accents</source>
-        <translation type="obsolete">显示希腊文�音符�</translation>
-    </message>
-    <message>
-        <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">显示希伯�文元音符�</translation>
-    </message>
-    <message>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">显示希伯�文�诵标记</translation>
-    </message>
-    <message>
-        <source>Show morph segmentation</source>
-        <translation type="obsolete">显示构�学分割</translation>
-    </message>
-    <message>
-        <source>Use textual variants</source>
-        <translation type="obsolete">使用文字�体</translation>
-    </message>
-</context>
-<context>
-    <name>BtTextWindowHeaderWidget</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
-        <source>Add/remove/replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
-        <source>Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtTipDialog</name>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
-        <source>Tip Of The Day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
-        <source>Show tips at startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
-        <source>Next Tip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
-        <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
-        <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
-        <source>To learn more about the BibleTime project please go to our web site.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
-        <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
-        <source>Select the icon again to stop the synchronization.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
-        <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
-        <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
-        <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
-        <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
-        <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
-        <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
-        <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
-        <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
-        <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BtVerseDropdownChooserButton</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp" line="106"/>
-        <source>Select verse</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CAcceleratorSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
-        <source>Choose action group:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
-        <source>Main Window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
-        <source>All text windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
-        <source>Bible windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
-        <source>Commentary windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
-        <source>Lexicon windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
-        <source>Book windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
-        <source>
-   &quot;%1&quot; in the &quot;%2&quot; group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
-        <source>Shortcuts</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CBibleReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
-        <source>Next book</source>
-        <translation>下一�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
-        <source>Previous book</source>
-        <translation>上一�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
-        <source>Next chapter</source>
-        <translation>下一章</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
-        <source>Previous chapter</source>
-        <translation>上一章</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
-        <source>Next verse</source>
-        <translation>下一节</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
-        <source>Previous verse</source>
-        <translation>上一节</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
-        <source>Copy chapter</source>
-        <translation>�制本章</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
-        <source>Save chapter as plain text</source>
-        <translation>�存本章为纯文本</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
-        <source>Save chapter as HTML</source>
-        <translation>�存本章为 HTML</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
-        <source>Print chapter</source>
-        <translation>打�本章</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
-        <source>Text of reference</source>
-        <translation>�照�文</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
-        <source>Reference with text</source>
-        <translation>�文连��照</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
-        <source>Bible window</source>
-        <translation>圣�窗�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
-        <source>Copy...</source>
-        <translation>�制...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
-        <source>Save...</source>
-        <translation>�存...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
-        <source>Print...</source>
-        <translation>打�...</translation>
-    </message>
-    <message>
-        <source>Copy chapter to clipboard ...</source>
-        <translation type="obsolete">�制本章至剪贴�...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
-        <source>Copying</source>
-        <translation>正在�制</translation>
-    </message>
-    <message>
-        <source>Saving chapter ...</source>
-        <translation type="obsolete">正在�存本章...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
-        <source>Saving</source>
-        <translation>正在�存</translation>
-    </message>
-</context>
-<context>
-    <name>CBookReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
-        <source>Toggle tree view</source>
-        <translation>切�树视图</translation>
-    </message>
-</context>
-<context>
-    <name>CBookmarkIndex</name>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
-        <source>Bookmarks</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
-        <source>New folder</source>
-        <translation>新文件夹</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
-        <source>Rename folder</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
-        <source>Delete Items</source>
-        <translation>删除项目</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
-        <source>Do you really want to delete the selected items and child-items?</source>
-        <translation>你真的想删除已选项目��项目�?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
-        <source>The work to which the bookmark points to is not installed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
-        <source>Print bookmarks...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
-        <source>Remove selected items...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
-        <source>Import to folder...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
-        <source>Edit bookmark...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
-        <source>Sort folder bookmarks...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
-        <source>Sort all bookmarks...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
-        <source>Export from folder...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
-        <source>Can drop only bookmarks or one folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
-        <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
-        <source>Move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
-        <source>Drag references from text views to this view</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CCommentaryReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
-        <source>Next book</source>
-        <translation>下一�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
-        <source>Previous book</source>
-        <translation>上一�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
-        <source>Next chapter</source>
-        <translation>下一章</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
-        <source>Previous chapter</source>
-        <translation>上一章</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
-        <source>Next verse</source>
-        <translation>下一节</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
-        <source>Previous verse</source>
-        <translation>上一节</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
-        <source>Synchronize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
-        <source>Synchronize the displayed entry of this work with the active Bible window</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CConfigurationDialog</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
-        <source>Configure BibleTime</source>
-        <translation type="unfinished">�置 BibleTime</translation>
-    </message>
-</context>
-<context>
-    <name>CDisplaySettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
-        <source>Display templates</source>
-        <translation>显示模�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
-        <source>Available display styles:</source>
-        <translation>�用的显示样�:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
-        <source>Style preview</source>
-        <translation>样�预览</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
-        <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
-        <translation>　神爱世人，甚至把他的独生��给他们，�一切信他的，�至�亡，�得永生。</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
-        <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
-        <translation>因为　神差他的儿�到世上�，�是�定世人的罪，而是�使世人藉�他得救。</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
-        <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
-        <translation>信他的，�被定罪；�信的，罪已�定了，因为他�信　神独生�的�。</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
-        <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
-        <translation>凡作�的都�光，��接近光，�得他的�行暴露出�。</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
-        <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
-        <translation>凡行真�的，就�接近光，好显明他所作的都是��　神而作的。</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
-        <source>Display templates define how text is displayed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
-        <source>Show the BibleTime logo on startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
-        <source>Show startup logo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
-        <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
-        <source>Display</source>
-        <translation type="unfinished">显示</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="193"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>CDisplayWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
-        <source>Back in history</source>
-        <translation>上一步</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
-        <source>Forward in history</source>
-        <translation>下一步</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
-        <source>Select all</source>
-        <translation type="unfinished">全选</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
-        <source>Find...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
-        <source>Change location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
-        <source>Search with works of this window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
-        <source>Work chooser buttons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
-        <source>Text area header</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
-        <source>Navigation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
-        <source>Tool</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CHTMLWriteDisplay</name>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
-        <source>Bold</source>
-        <translation>粗体</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
-        <source>Italic</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
-        <source>Underline</source>
-        <translation>底线</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
-        <source>Left</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
-        <source>Center</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
-        <source>Right</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
-        <source>Font color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
-        <source>Align left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
-        <source>Align right</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CHTMLWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
-        <source>Module not writable</source>
-        <translation>�能写入模�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
-        <source>Module is not writable.</source>
-        <translation>�能写入模�.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
-        <source>Either the module may not be edited, or you do not have write permission.</source>
-        <translation>模���被编辑, 或你没有写入��.</translation>
-    </message>
-</context>
-<context>
-    <name>CKeyReferenceWidget</name>
-    <message>
-        <source>Next book</source>
-        <translation type="obsolete">下一�</translation>
-    </message>
-    <message>
-        <source>Previous book</source>
-        <translation type="obsolete">上一�</translation>
-    </message>
-    <message>
-        <source>Next chapter</source>
-        <translation type="obsolete">下一章</translation>
-    </message>
-    <message>
-        <source>Previous chapter</source>
-        <translation type="obsolete">上一章</translation>
-    </message>
-    <message>
-        <source>Next verse</source>
-        <translation type="obsolete">下一节</translation>
-    </message>
-    <message>
-        <source>Previous verse</source>
-        <translation type="obsolete">上一节</translation>
-    </message>
-</context>
-<context>
-    <name>CLanguageSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/clanguagesettings.cpp" line="297"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>CLexiconKeyChooser</name>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
-        <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
-        <source>Entries of the current work</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
-        <source>Next entry</source>
-        <translation type="unfinished">下一�目</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
-        <source>Previous entry</source>
-        <translation type="unfinished">上一�目</translation>
-    </message>
-</context>
-<context>
-    <name>CLexiconReadWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
-        <source>Next entry</source>
-        <translation>下一�目</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
-        <source>Previous entry</source>
-        <translation>上一�目</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
-        <source>Copy reference only</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
-        <source>Save entry as HTML</source>
-        <translation>�存�目为 HTML</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
-        <source>Print reference only</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
-        <source>Strong&apos;s Search</source>
-        <translation>Strong&apos;s �索</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
-        <source>Entry with text</source>
-        <translation>�目文本</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
-        <source>Entry as plain text</source>
-        <translation>�目为纯文本</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
-        <source>Lexicon window</source>
-        <translation>辞典窗�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
-        <source>Copy...</source>
-        <translation>�制...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
-        <source>Save...</source>
-        <translation>�存...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
-        <source>Print...</source>
-        <translation>打�...</translation>
-    </message>
-    <message>
-        <source>Saving entry ...</source>
-        <translation type="obsolete">正在�存�目...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
-        <source>Saving</source>
-        <translation>正在�存</translation>
-    </message>
-</context>
-<context>
-    <name>CPlainWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
-        <source>Sync with active Bible</source>
-        <translation>与活动的圣��步</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
-        <source>Save text</source>
-        <translation>�存文本</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
-        <source>Delete current entry</source>
-        <translation>删除当��目</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
-        <source>Restore original text</source>
-        <translation>还原原�文本</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
-        <source>Module not writable</source>
-        <translation>�能写入模�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
-        <source>Module is not writable.</source>
-        <translation>�能写入模�.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
-        <source>Either the module may not be edited, or you do not have write permission.</source>
-        <translation>模���被编辑, 或你没有写入��.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
-        <source>Synchronize (show the same verse) with the active Bible window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
-        <source>Delete current entry (no undo)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
-        <source>Restore original text, new text will be lost</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CSearchAnalysisScene</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>Save Search Analysis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
-        <source>BibleTime Search Analysis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
-        <source>Book</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
-        <source>Total hits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
-        <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CSwordModuleInfo</name>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
-        <source>Version</source>
-        <translation>版本</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
-        <source>unknown</source>
-        <translation>未知的</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
-        <source>Markup</source>
-        <translation>标记</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
-        <source>Location</source>
-        <translation>�置</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
-        <source>Language</source>
-        <translation>语言</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
-        <source>Category</source>
-        <translation>类别</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
-        <source>LCSH</source>
-        <translation>LCSH</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
-        <source>Writable</source>
-        <translation>�写入</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
-        <source>yes</source>
-        <translation>是</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
-        <source>no</source>
-        <translation>�</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
-        <source>Unlock key</source>
-        <translation>解�钥</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
-        <source>Features</source>
-        <translation>特点</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
-        <source>Take care, this work contains cult / questionable material!</source>
-        <translation>�心, 此著作包�异端或�疑的内容!</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
-        <source>About</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
-        <source>Distribution license</source>
-        <translation>�行许��</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
-        <source>Distribution source</source>
-        <translation>�行��</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
-        <source>Distribution notes</source>
-        <translation>�行备注</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
-        <source>Text source</source>
-        <translation>文本��</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
-        <source>Copyright notes</source>
-        <translation>版�备注</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
-        <source>Copyright holder</source>
-        <translation>版��有人</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
-        <source>Copyright date</source>
-        <translation>版�日期</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
-        <source>Copyright contact name</source>
-        <translation>版��系人姓�</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
-        <source>Copyright contact address</source>
-        <translation>版��系人地�</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
-        <source>Copyright contact email</source>
-        <translation>版��系人电�邮件</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
-        <source>Bibles</source>
-        <translation type="unfinished">圣�</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
-        <source>Commentaries</source>
-        <translation type="unfinished">评论</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
-        <source>Books</source>
-        <translation type="unfinished">书�</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
-        <source>Cults/Unorthodox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
-        <source>Maps and Images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
-        <source>Daily Devotionals</source>
-        <translation type="unfinished">�日�修</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
-        <source>Lexicons and Dictionaries</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
-        <source>Glossaries</source>
-        <translation type="unfinished">字汇表</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CSwordSettingsPage</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
-        <source>Standard works</source>
-        <translation>标准著作</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
-        <source>Text filters</source>
-        <translation>文本过滤器</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
-        <source>Desk</source>
-        <translation type="unfinished">桌�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="359"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>CSwordSetupInstallSourcesDialog</name>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
-        <source>Caption</source>
-        <translation type="unfinished">标题</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
-        <source>Type</source>
-        <translation type="unfinished">类型</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
-        <source>Server</source>
-        <translation type="unfinished">�务器</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
-        <source>Path</source>
-        <translation type="unfinished">路径</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
-        <source>Get list...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
-        <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
-
-Do you want to continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
-        <source>Get source list from remote server?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
-        <source>Downloading List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
-        <source>Refreshing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
-        <source>Download a list of sources from CrossWire server and add sources</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <source>Please provide a caption.</source>
-        <translation type="unfinished">请�供标题.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
-        <source>A source with this caption already exists. Please provide a different caption.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <source>Please provide a server name.</source>
-        <translation type="unfinished">请�供�务器�称.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <source>Please provide a valid, readable path.</source>
-        <translation type="unfinished">请�供有效的, �读的路径.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
-        <source>Please provide a path.</source>
-        <translation type="unfinished">请�供路径.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
-        <source>New  Installation Source</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>关闭��存文本?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>�存已更改文本?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InfoDisplay::CInfoDisplay</name>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
-        <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
-        <source>Abbreviation</source>
-        <translation>缩写</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
-        <source>Cross references</source>
-        <translation>�照</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
-        <source>Footnote</source>
-        <translation>注释</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
-        <source>Strongs</source>
-        <translation>Strongs</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
-        <source>Morphology</source>
-        <translation>构�学</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
-        <source>Word lookup</source>
-        <translation>�汇查询</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
-        <source>Select all</source>
-        <translation type="unfinished">全选</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
-        <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QCoreApplication</name>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
-        <source>Indexing aborted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <source>An internal error occurred while building the index: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
-        <source>An internal error occurred while building the index.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
-        <source>Search aborted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
-        <source>An internal error occurred while executing your search.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="126"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="240"/>
-        <source>Commentaries</source>
-        <translation>评论</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="127"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="246"/>
-        <source>Cults/Unorthodox</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="128"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="245"/>
-        <source>Maps and Images</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="129"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="244"/>
-        <source>Daily Devotionals</source>
-        <translation>�日�修</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="130"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="242"/>
-        <source>Lexicons and Dictionaries</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
-        <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
-        <source>Bibles</source>
-        <translation>圣�</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="132"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="243"/>
-        <source>Glossaries</source>
-        <translation>字汇表</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="133"/>
-        <location filename="../../src/backend/btmoduletreeitem.cpp" line="241"/>
-        <source>Books</source>
-        <translation>书�</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
-        <source>Added text</source>
-        <translation>附加文本</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
-        <source>Names of languages</source>
-        <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
-        <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
-        <source>Afrikaans</source>
-        <extracomment>Language name af</extracomment>
-        <translation>���兰语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
-        <source>Amuzgo, Guerrero</source>
-        <extracomment>Language name amu</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
-        <source>English, Old (ca.450-1100)</source>
-        <extracomment>Language name ang</extracomment>
-        <translation>英语, �代 (约450-1100)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
-        <source>Arabic</source>
-        <extracomment>Language name ar</extracomment>
-        <translation>阿拉伯语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
-        <source>Azerbaijani</source>
-        <extracomment>Language name az</extracomment>
-        <translation>阿塞拜疆语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
-        <source>Azerbaijani, South</source>
-        <extracomment>Language name azb</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
-        <source>Belarusian</source>
-        <extracomment>Language name be</extracomment>
-        <translation>白俄罗斯语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
-        <source>Bulgarian</source>
-        <extracomment>Language name bg</extracomment>
-        <translation>�加利亚语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
-        <source>Breton</source>
-        <extracomment>Language name br</extracomment>
-        <translation>布里敦语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
-        <source>Bosnian</source>
-        <extracomment>Language name bs</extracomment>
-        <translation>波斯尼亚语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
-        <source>Catalan</source>
-        <extracomment>Language name ca</extracomment>
-        <translation>加泰罗尼亚语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
-        <source>Chinantec, Comaltepec</source>
-        <extracomment>Language name cco</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
-        <source>Cebuano</source>
-        <extracomment>Language name ceb</extracomment>
-        <translation>宿雾语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
-        <source>Chamorro</source>
-        <extracomment>Language name ch</extracomment>
-        <translation>查莫罗语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
-        <source>Chontal, Highland Oaxaca</source>
-        <extracomment>Language name chd</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
-        <source>Chinantec, Quiotepec</source>
-        <extracomment>Language name chq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
-        <source>Chinantec, Ozumacu00edn</source>
-        <extracomment>Language name chz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
-        <source>Cakchiquel, Western</source>
-        <extracomment>Language name ckw</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
-        <source>Chinantec, Lalana</source>
-        <extracomment>Language name cnl</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
-        <source>Chinantec, Tepetotutla</source>
-        <extracomment>Language name cnt</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
-        <source>Coptic</source>
-        <extracomment>Language name cop</extracomment>
-        <translation>科普特语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
-        <source>Czech</source>
-        <extracomment>Language name cs</extracomment>
-        <translation>�克语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
-        <source>Chinantec, Sochiapan</source>
-        <extracomment>Language name cso</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
-        <source>Chol, Tila</source>
-        <extracomment>Language name cti</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
-        <source>Chatino, Western Highland</source>
-        <extracomment>Language name ctp</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
-        <source>Church Slavic</source>
-        <extracomment>Language name cu</extracomment>
-        <translation>教会斯拉夫语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
-        <source>Welsh</source>
-        <extracomment>Language name cy</extracomment>
-        <translation>�尔士语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
-        <source>Danish</source>
-        <extracomment>Language name da</extracomment>
-        <translation>丹麦语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
-        <source>German</source>
-        <extracomment>Language name de</extracomment>
-        <translation>德语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
-        <source>Duruma</source>
-        <extracomment>Language name dug</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
-        <source>Greek, Modern (1453-)</source>
-        <extracomment>Language name el</extracomment>
-        <translation>希腊语, 现代 (1453-)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
-        <source>English</source>
-        <extracomment>Language name en</extracomment>
-        <translation>英语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
-        <source>American English</source>
-        <extracomment>Language name en_US</extracomment>
-        <translation>美国英语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
-        <source>English, Middle (1100-1500)</source>
-        <extracomment>Language name enm</extracomment>
-        <translation>英语, 中世纪 (1100-1500)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
-        <source>Esperanto</source>
-        <extracomment>Language name eo</extracomment>
-        <translation>世界语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
-        <source>Spanish</source>
-        <extracomment>Language name es</extracomment>
-        <translation>西�牙语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
-        <source>Estonian</source>
-        <extracomment>Language name et</extracomment>
-        <translation>爱沙尼亚语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
-        <source>Basque</source>
-        <extracomment>Language name eu</extracomment>
-        <translation>巴斯克语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
-        <source>Persian</source>
-        <extracomment>Language name fa</extracomment>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
-        <source>Finnish</source>
-        <extracomment>Language name fi</extracomment>
-        <translation>芬兰语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
-        <source>French</source>
-        <extracomment>Language name fr</extracomment>
-        <translation>法语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
-        <source>Frisian</source>
-        <extracomment>Language name fy</extracomment>
-        <translation>弗里西语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
-        <source>Irish</source>
-        <extracomment>Language name ga</extracomment>
-        <translation>爱尔兰语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
-        <source>Gaelic (Scots)</source>
-        <extracomment>Language name gd</extracomment>
-        <translation>盖尔语 (�格兰)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
-        <source>Geez</source>
-        <extracomment>Language name gez</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
-        <source>Gothic</source>
-        <extracomment>Language name got</extracomment>
-        <translation>哥德语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
-        <source>Manx</source>
-        <extracomment>Language name gv</extracomment>
-        <translation>曼岛语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
-        <source>Greek, Ancient (to 1453)</source>
-        <extracomment>Language name grc</extracomment>
-        <translation>希腊语, �代 (至1453)</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
-        <source>Hebrew</source>
-        <extracomment>Language name he</extracomment>
-        <translation>希伯�语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
-        <source>Hausa</source>
-        <extracomment>Language name hau</extracomment>
-        <translation>豪�语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
-        <source>Hawaiian</source>
-        <extracomment>Language name haw</extracomment>
-        <translation>��夷语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
-        <source>Hindi</source>
-        <extracomment>Language name hi</extracomment>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
-        <source>Croatian</source>
-        <extracomment>Language name hr</extracomment>
-        <translation>克罗地亚语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
-        <source>Hungarian</source>
-        <extracomment>Language name hu</extracomment>
-        <translation>匈牙利语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
-        <source>Huave, San Mateo Del Mar</source>
-        <extracomment>Language name huv</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
-        <source>Armenian</source>
-        <extracomment>Language name hy</extracomment>
-        <translation>亚美尼亚语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
-        <source>Indonesian</source>
-        <extracomment>Language name id</extracomment>
-        <translation>�度尼西亚语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
-        <source>Icelandic</source>
-        <extracomment>Language name is</extracomment>
-        <translation>冰岛语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
-        <source>Italian</source>
-        <extracomment>Language name it</extracomment>
-        <translation>�大利语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
-        <source>Itzu00e1</source>
-        <extracomment>Language name itz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
-        <source>Ixil, San Juan Cotzal</source>
-        <extracomment>Language name ixl</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
-        <source>Japanese</source>
-        <extracomment>Language name ja</extracomment>
-        <translation>日语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
-        <source>Jacalteco, Eastern</source>
-        <extracomment>Language name jac</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
-        <source>Javanese, Caribbean</source>
-        <extracomment>Language name jvn</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
-        <source>Georgian</source>
-        <extracomment>Language name ka</extracomment>
-        <translation>格��亚语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
-        <source>Korean</source>
-        <extracomment>Language name ko</extracomment>
-        <translation>�鲜语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
-        <source>Kurdish</source>
-        <extracomment>Language name ku</extracomment>
-        <translation>库尔德语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
-        <source>Kirghiz</source>
-        <extracomment>Language name ky</extracomment>
-        <translation>�尔�斯语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
-        <source>Latin</source>
-        <extracomment>Language name la</extracomment>
-        <translation>拉�语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
-        <source>Lacandon</source>
-        <extracomment>Language name lac</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
-        <source>Lithuanian</source>
-        <extracomment>Language name lt</extracomment>
-        <translation>立陶宛语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
-        <source>Latvian</source>
-        <extracomment>Language name lv</extracomment>
-        <translation>拉脱维亚语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
-        <source>Malagasy</source>
-        <extracomment>Language name mg</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
-        <source>Maori</source>
-        <extracomment>Language name mi</extracomment>
-        <translation>毛利语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
-        <source>Mixe, Isthmus</source>
-        <extracomment>Language name mir</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
-        <source>Mixtec, Coatzospan</source>
-        <extracomment>Language name miz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
-        <source>Macedonian</source>
-        <extracomment>Language name mk</extracomment>
-        <translation>马其顿语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
-        <source>Mixtec, Silacayoapan</source>
-        <extracomment>Language name mks</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
-        <source>More</source>
-        <extracomment>Language name mos</extracomment>
-        <translation>更多</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
-        <source>Malay</source>
-        <extracomment>Language name ms</extracomment>
-        <translation>马�语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
-        <source>Maltese</source>
-        <extracomment>Language name mt</extracomment>
-        <translation>马尔他语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
-        <source>Low German; Low Saxon</source>
-        <extracomment>Language name nds</extracomment>
-        <translation>低地德语; 低地�克逊语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
-        <source>Nepali</source>
-        <extracomment>Language name ne</extracomment>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
-        <source>Nahuatl, Guerrero</source>
-        <extracomment>Language name ngu</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
-        <source>Nahuatl, Northern Oaxaca</source>
-        <extracomment>Language name nhy</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
-        <source>Dutch</source>
-        <extracomment>Language name nl</extracomment>
-        <translation>�兰语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
-        <source>Norwegian Nynorsk</source>
-        <extracomment>Language name nn</extracomment>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
-        <source>Norwegian</source>
-        <extracomment>Language name no</extracomment>
-        <translation>挪�语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
-        <source>Otomi, Queru00e9taro</source>
-        <extracomment>Language name otq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
-        <source>Papiamento</source>
-        <extracomment>Language name pap</extracomment>
-        <translation>帕皮亚门托语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
-        <source>Polish</source>
-        <extracomment>Language name pl</extracomment>
-        <translation>波兰语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
-        <source>Persian (Dari)</source>
-        <extracomment>Language name prs</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
-        <source>Portuguese</source>
-        <extracomment>Language name pt</extracomment>
-        <translation>葡�牙语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
-        <source>Brasilian Portuguese</source>
-        <extracomment>Language name pt_BR</extracomment>
-        <translation>巴西葡�牙语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
-        <source>Quichu00e9, West Central</source>
-        <extracomment>Language name qut</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
-        <source>Romanian</source>
-        <extracomment>Language name ro</extracomment>
-        <translation>罗马尼亚语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
-        <source>Russian</source>
-        <extracomment>Language name ru</extracomment>
-        <translation>俄语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
-        <source>Scots</source>
-        <extracomment>Language name sco</extracomment>
-        <translation>�格兰语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
-        <source>Slovak</source>
-        <extracomment>Language name sk</extracomment>
-        <translation>斯洛�克语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
-        <source>Slovenian</source>
-        <extracomment>Language name sl</extracomment>
-        <translation>斯洛文尼亚语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
-        <source>Somali</source>
-        <extracomment>Language name so</extracomment>
-        <translation>索马里语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
-        <source>Albanian</source>
-        <extracomment>Language name sq</extracomment>
-        <translation>阿尔巴尼亚语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
-        <source>Swedish</source>
-        <extracomment>Language name sv</extracomment>
-        <translation>瑞典语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
-        <source>Swahili</source>
-        <extracomment>Language name sw</extracomment>
-        <translation>斯瓦希里语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
-        <source>Syriac</source>
-        <extracomment>Language name syr</extracomment>
-        <translation>�利亚语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
-        <source>Tamil</source>
-        <extracomment>Language name ta</extracomment>
-        <translation>泰米尔语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
-        <source>Thai</source>
-        <extracomment>Language name th</extracomment>
-        <translation>泰语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
-        <source>Tagalog</source>
-        <extracomment>Language name tl</extracomment>
-        <translation>塔加洛语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
-        <source>Tswana</source>
-        <extracomment>Language name tn</extracomment>
-        <translation>茨瓦纳语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
-        <source>Turkish</source>
-        <extracomment>Language name tr</extracomment>
-        <translation>土耳其语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
-        <source>Tektiteko</source>
-        <extracomment>Language name ttc</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
-        <source>Tahitian</source>
-        <extracomment>Language name ty</extracomment>
-        <translation>大溪地语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
-        <source>Tzotzil, Zinacantu00e1n</source>
-        <extracomment>Language name tzz</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
-        <source>Ukrainian</source>
-        <extracomment>Language name uk</extracomment>
-        <translation>乌克兰语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
-        <source>Orya</source>
-        <extracomment>Language name ury</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
-        <source>Uspanteco</source>
-        <extracomment>Language name usp</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
-        <source>Vietnamese</source>
-        <extracomment>Language name vi</extracomment>
-        <translation>越�语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
-        <source>Xhosa</source>
-        <extracomment>Language name xh</extracomment>
-        <translation>科�语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
-        <source>Bavarian</source>
-        <extracomment>Language name bar</extracomment>
-        <translation>巴�利亚语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
-        <source>Lombard</source>
-        <extracomment>Language name lmo</extracomment>
-        <translation>伦巴底语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
-        <source>Uma</source>
-        <extracomment>Language name ppk
-----------
-Language name ppk</extracomment>
-        <translation>Uma 语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
-        <source>Sranan</source>
-        <extracomment>Language name srn</extracomment>
-        <translation>�利�语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
-        <source>Yiddish</source>
-        <extracomment>Language name yi</extracomment>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
-        <source>Zapotec, San Juan Guelavu00eda</source>
-        <extracomment>Language name zab</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
-        <source>Zapotec, Mitla</source>
-        <extracomment>Language name zaw</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
-        <source>Chinese</source>
-        <extracomment>Language name zh</extracomment>
-        <translation>中文</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
-        <source>Zapotec, Amatlu00e1n</source>
-        <extracomment>Language name zpo</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
-        <source>Zapotec, Zoogocho</source>
-        <extracomment>Language name zpq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
-        <source>Zapotec, Yalu00e1lag</source>
-        <extracomment>Language name zpu</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
-        <source>Zapotec, Chichicapan</source>
-        <extracomment>Language name zpv</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
-        <source>Zapotec, Southern Rincon</source>
-        <extracomment>Language name zsr</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
-        <source>Zapotec, Quioquitani-Quieru00ed</source>
-        <extracomment>Language name ztq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
-        <source>Zapotec, Yatee</source>
-        <extracomment>Language name zty</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
-        <source>Zulu</source>
-        <extracomment>Language name zu</extracomment>
-        <translation>祖�语</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
-        <source>Footnotes</source>
-        <translation>注释</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
-        <source>Strong&apos;s numbers</source>
-        <translation>Strong&apos;s numbers</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
-        <source>Headings</source>
-        <translation>标题</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
-        <source>Morphological tags</source>
-        <translation>构�学标记</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
-        <source>Lemmas</source>
-        <translation>�形</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
-        <source>Hebrew vowel points</source>
-        <translation>希伯�文元音符�</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
-        <source>Hebrew cantillation marks</source>
-        <translation>希伯�文�诵标记</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
-        <source>Greek accents</source>
-        <translation>希腊文�音符�</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
-        <source>Red letter words</source>
-        <translation>红字版本</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
-        <source>Textual variants</source>
-        <translation>文字�体</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
-        <source>Scripture cross-references</source>
-        <translation>�文�照</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
-        <source>Morph segmentation</source>
-        <translation>构�学分割</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
-        <source>Local</source>
-        <translation>本地</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>远程</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>旧约</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>摩西五�/律法书</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>历�书</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>先知书</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>新约</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>四�音书</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>书信</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>�罗书信</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <source>HTML files</source>
-        <translation>HTML 文件</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
-        <source>All files</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
-        <source>Text files</source>
-        <translation>文本文件</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
-        <source>Save file</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
-        <source>Save document ...</source>
-        <translation>�存文件...</translation>
-    </message>
-    <message>
-        <source>Print keys</source>
-        <translation type="obsolete">打�键</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <source>BibleTime bookmark files</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
-        <source>unknown</source>
-        <translation>未知的</translation>
-    </message>
-    <message>
-        <source>Change description ...</source>
-        <translation type="obsolete">更改�述...</translation>
-    </message>
-    <message>
-        <source>Enter a new description for the chosen bookmark.</source>
-        <translation type="obsolete">请为已选书签输入新�述.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
-        <source>New folder</source>
-        <translation>新文件夹</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
-        <source>The file already exists.</source>
-        <translation>这个文件已�存在.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
-        <source>Do you want to overwrite it?</source>
-        <translation>你是��覆盖它?</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
-        <source>Error</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>�能�存文件.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
-        <source>Please check permissions etc.</source>
-        <translation>请检查��等.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
-        <source>Take care, this work contains cult / questionable material!</source>
-        <translation>�心, 此著作包�异端或�疑的内容!</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
-        <source>Version</source>
-        <translation>版本</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
-        <source>Encrypted - needs unlock key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
-        <source>Double click for more information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
-        <source>Updated version available!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
-        <source>Installed version</source>
-        <translation type="unfinished">已安装版本</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
-        <source>Haitian Creole</source>
-        <extracomment>Language name ht</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
-        <source>Kekchu00ed</source>
-        <comment>kek</comment>
-        <extracomment>Language name kek</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
-        <source>(Multiple languages)</source>
-        <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
-        <source>Mam, Central</source>
-        <extracomment>Language name mvc</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
-        <source>Mam, Todos Santos Cuchumatu00e1n</source>
-        <extracomment>Language name mvj</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
-        <source>Mixe, Juquila</source>
-        <extracomment>Language name mxq</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
-        <source>Mixtec, Jamiltepec</source>
-        <extracomment>Language name mxt</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
-        <source>Burmese</source>
-        <extracomment>Language name my</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
-        <source>Norwegian Bokmu00e5l</source>
-        <extracomment>Language name nb</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
-        <source>Nahuatl, Michoacu00e1n</source>
-        <extracomment>Language name ncl</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
-        <source>Potawatomi</source>
-        <extracomment>Language name pot</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
-        <source>Klingon</source>
-        <extracomment>Language name tlh</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
-        <source>Mixtec, Diuxi-Tilantongo</source>
-        <extracomment>Language name xtd</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
-        <source>Yoryba</source>
-        <extracomment>Language name yo</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
-        <source>Verb tense changed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
-        <source>Can&apos;t write file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
-        <source>The Sword config file can&apos;t be written!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
-        <source>Export Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
-        <source>Import bookmarks</source>
-        <translation type="unfinished">导入书签</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
-        <source>Overwrite File?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
-        <source>Parsing Strong&apos;s Numbers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
-        <source>This shortcut conflicts with the shortcut for the following actions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
-        <source>Do you want to clear the conflicting shortcuts and continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
-        <source>Indexed works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
-        <source>Unindexed works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="44"/>
-        <source>Show this help message and exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="47"/>
-        <source>Output BibleTime version and exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="50"/>
-        <source>Open a clean session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="53"/>
-        <source>Open the default Bible with the reference &lt;ref&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="56"/>
-        <source>For command-line arguments parsed by the Qt toolkit, see %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="103"/>
-        <source>Error: %1 expects an argument.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="106"/>
-        <source>See --help for details.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/main.cpp" line="111"/>
-        <source>Error: Invalid command-line argument: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
-        <source>CSS base template not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
-        <source>Default template &quot;%1&quot; not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
-        <source>Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPushButton</name>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
-        <source>OK</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
-        <source>Open</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
-        <source>Save</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
-        <source>Cancel</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
-        <source>Close</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
-        <source>Discard</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
-        <source>Apply</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
-        <source>Reset</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
-        <source>Restore defaults</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
-        <source>Help</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
-        <source>Save All</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
-        <source>Yes</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
-        <source>Yes to all</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
-        <source>No</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
-        <source>No to all</source>
-        <comment>Dialog Button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::BtSearchOptionsArea</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
-        <source>Search for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
-        <source>&amp;Search</source>
-        <translation type="unfinished">�索(&amp;S)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
-        <source>Start to search the text in the chosen works</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
-        <source>Ch&amp;oose...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
-        <source>Choose works for the search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
-        <source>S&amp;etup...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
-        <source>All of the words (AND is added between the words)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
-        <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
-        <source>Scope:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
-        <source>The text you want to search for</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
-        <source>Works:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
-        <source>No search scope</source>
-        <translation type="unfinished">没有�索范围</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
-        <source>All words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
-        <source>Configure predefined scopes for search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
-        <source>Some words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
-        <source>Free</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
-        <source>Some of the words (OR is added between the words)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
-        <source>Full lucene syntax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
-        <source>Click the link to get help for search syntax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
-        <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::BtSearchResultArea</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
-        <source>Text of the selected search result item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
-        <source>Select all</source>
-        <translation type="unfinished">全选</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::BtSearchSyntaxHelpDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
-        <source>Search Syntax Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
-        <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
-        <source>Which words to find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
-        <source>Grouping and order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
-        <source>Wildcards (partial words)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
-        <source>Text fields (different parts of text)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
-        <source>Other syntax features</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
-        <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
-        <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
-        <source>jesus AND god</source>
-        <comment>Do not translate &quot;AND&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
-        <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
-        <source>jesus OR god</source>
-        <comment>Do not translate &quot;OR&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
-        <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
-        <source>jesus NOT god</source>
-        <comment>Do not translate &quot;NOT&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
-        <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
-        <source>+jesus -god</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
-        <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
-        <source>(a AND b) OR c</source>
-        <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
-        <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
-        <source>&quot;says lord&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
-        <source>&quot;says the lord&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
-        <source>Finds all verses with &apos;says the LORD&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
-        <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
-        <source>a*</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
-        <source>All words beginning with &apos;a&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
-        <source>a*a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
-        <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
-        <source>a?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
-        <source>&apos;at&apos; and &apos;an&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
-        <source>a??a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
-        <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
-        <source>Available text fields:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
-        <source>Searches headings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
-        <source>Searches footnotes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
-        <source>Searches Strong&apos;s numbers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
-        <source>Searches morphology codes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
-        <source>Examples:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
-        <source>heading:Jesus</source>
-        <comment>Do not translate &quot;heading:&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
-        <source>Finds headings with &apos;Jesus&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
-        <source>footnote:Jesus AND footnote:said</source>
-        <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
-        <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
-        <source>strong:G846</source>
-        <comment>Do not translate &quot;strong:&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
-        <source>Finds verses with Strong&apos;s Greek number 846</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
-        <source>morph:&quot;N-NSF&quot;</source>
-        <comment>Do not translate &quot;morph:&quot;.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
-        <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
-        <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::CModuleResultView</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="50"/>
-        <source>Work</source>
-        <translation>著作</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="50"/>
-        <source>Hits</source>
-        <translation>�索项数</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="64"/>
-        <source>Copy...</source>
-        <translation>�制...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="66"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="76"/>
-        <source>Reference only</source>
-        <translation>���照</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="69"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="79"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="86"/>
-        <source>Reference with text</source>
-        <translation>�文连��照</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="74"/>
-        <source>Save...</source>
-        <translation>�存...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="84"/>
-        <source>Print...</source>
-        <translation>打�...</translation>
-    </message>
-    <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">�制�索结果...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
-        <source>Copying search result</source>
-        <translation>正在�制�索结果</translation>
-    </message>
-    <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">�存�索结果...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
-        <source>Saving search result</source>
-        <translation>正在�存�索结果</translation>
-    </message>
-    <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">打��索结果...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
-        <source>Printing search result</source>
-        <translation>正在打��索结果</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="49"/>
-        <source>Works chosen for the search and the number of the hits in each work</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::CRangeChooserDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="136"/>
-        <source>S&amp;earch range:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="137"/>
-        <source>Select a scope from the list to edit the searchranges</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="148"/>
-        <source>&amp;Name:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="151"/>
-        <source>Edi&amp;t current range:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="152"/>
-        <source>Change the search ranges of the selected searchscope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="157"/>
-        <source>Parsed search range:</source>
-        <translation>分��索范围:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="171"/>
-        <source>New range</source>
-        <translation>新范围</translation>
-    </message>
-    <message>
-        <source>&lt;invalid name of search range&gt;</source>
-        <translation type="obsolete">&lt;无效的�索范围�称&gt;</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="140"/>
-        <source>&amp;Add new scope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="141"/>
-        <source>Add a new search scope. First enter an appropriate name, then edit the search ranges.</source>
-        <translation type="unfinished">加入新的�索范围. 先输入�适�称, 然後编辑�索范围.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="145"/>
-        <source>Delete current &amp;scope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="146"/>
-        <source>Delete the selected search scope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="149"/>
-        <source>Change the name of the selected search scope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="obsolete">更改已选�索项目的范围. 查看已预先定义的�索范围, 以了解�索范围的组�.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="158"/>
-        <source>The search ranges which will be used for the search, parsed to the canonical form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="134"/>
-        <source>Setup Search Scopes</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::CSearchDialog</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
-        <source>Missing indices</source>
-        <translation>��的索引</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
-        <source>Search</source>
-        <translation type="unfinished">�索</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
-        <source>The following modules need to be indexed before they can be searched in:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
-        <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
-        <source>Drag any verse reference onto an open Bible window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
-        <source>&amp;Analyze results...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
-        <source>Show a graphical analysis of the search result</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Search::CSearchResultView</name>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="39"/>
-        <source>Results</source>
-        <translation>�索结果</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="47"/>
-        <source>Copy...</source>
-        <translation>�制...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="50"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="64"/>
-        <source>Reference only</source>
-        <translation>���照</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="54"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="68"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="76"/>
-        <source>Reference with text</source>
-        <translation>�文连��照</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="61"/>
-        <source>Save...</source>
-        <translation>�存...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="73"/>
-        <source>Print...</source>
-        <translation>打�...</translation>
-    </message>
-    <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">打��索结果...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
-        <source>Printing search result</source>
-        <translation>正在打��索结果</translation>
-    </message>
-    <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">�存�索结果...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
-        <source>Saving search result</source>
-        <translation>正在�存�索结果</translation>
-    </message>
-    <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">�制�索结果...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
-        <source>Copying search result</source>
-        <translation>正在�制�索结果</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="38"/>
-        <source>Search result of the selected work</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StandardWorksTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="62"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>TextFiltersTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation type="unfinished">�节後�入�行符</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">显示节数</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation type="unfinished">显示标题</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">显示�照�文</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">显示希腊文�音符�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">显示希伯�文元音符�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">显示希伯�文�诵标记</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">显示构�学分割</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation type="unfinished">使用文字�体</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source></source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>findTextDialog</name>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/messages/bibletime_ui_zh_TW.ts b/i18n/messages/bibletime_ui_zh_TW.ts
index 01b2150..05a4893 100644
--- a/i18n/messages/bibletime_ui_zh_TW.ts
+++ b/i18n/messages/bibletime_ui_zh_TW.ts
@@ -6,7 +6,7 @@
     <message>
         <source></source>
         <translatorcomment>Bibletime User Interface translation
-Copyright (C) 2012 The Bibletime Team, http://www.bibletime.info
+Copyright (C) 1999-2014 The Bibletime Team, http://www.bibletime.info
 This file is distributed under the same license as the Bibetime package.</translatorcomment>
         <translation></translation>
     </message>
@@ -22,452 +22,457 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTime</name>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="720"/>
+        <location filename="../../src/bibletime_init.cpp" line="741"/>
         <source>&amp;File</source>
         <translation>檔案(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="721"/>
+        <location filename="../../src/bibletime_init.cpp" line="742"/>
         <source>&amp;View</source>
         <translation>檢視(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="724"/>
+        <location filename="../../src/bibletime_init.cpp" line="745"/>
         <source>&amp;Search</source>
         <translation>�尋(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="725"/>
+        <location filename="../../src/bibletime_init.cpp" line="746"/>
         <source>&amp;Window</source>
         <translation>視窗(&amp;W)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="731"/>
+        <location filename="../../src/bibletime_init.cpp" line="754"/>
         <source>Se&amp;ttings</source>
         <translation>設定(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="732"/>
+        <location filename="../../src/bibletime_init.cpp" line="757"/>
         <source>&amp;Help</source>
         <translation>幫助(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="120"/>
+        <location filename="../../src/bibletime_init.cpp" line="118"/>
         <source>&amp;Show toolbar</source>
         <translation>顯示工具列(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="113"/>
+        <location filename="../../src/bibletime_init.cpp" line="111"/>
         <source>&amp;Fullscreen mode</source>
         <translation>全螢幕模�(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="106"/>
+        <location filename="../../src/bibletime_init.cpp" line="104"/>
         <source>&amp;Quit</source>
         <translation>離開(&amp;Q)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="253"/>
+        <location filename="../../src/bibletime_init.cpp" line="251"/>
         <source>Open the Bible study HowTo included with BibleTime.&lt;br/&gt;This HowTo is an introduction on how to study the Bible in an efficient way.</source>
         <translation>開啟BibleTime內附的�經研讀幫助.&lt;br/&gt;這個幫助是用來幫助你更有效率地研讀�經的簡介.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="258"/>
+        <location filename="../../src/bibletime_init.cpp" line="256"/>
         <source>Information about the BibleTime program</source>
         <translation>有關BibleTime程�的資訊</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="728"/>
-        <source>&amp;Save session</source>
-        <translation type="unfinished">儲存工作階段(&amp;S)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="729"/>
-        <source>&amp;Load session</source>
-        <translation>載入工作階段(&amp;L)</translation>
-    </message>
-    <message>
-        <location filename="../../src/bibletime_init.cpp" line="730"/>
+        <location filename="../../src/bibletime_init.cpp" line="750"/>
         <source>&amp;Delete session</source>
         <translation>刪除工作階段(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="727"/>
+        <location filename="../../src/bibletime_init.cpp" line="748"/>
         <source>&amp;Arrangement mode</source>
         <translation>排列模�(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="146"/>
+        <location filename="../../src/bibletime_init.cpp" line="144"/>
         <source>&amp;Manual mode</source>
         <translation>手動模�(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="153"/>
+        <location filename="../../src/bibletime_init.cpp" line="151"/>
         <source>Auto-tile &amp;vertically</source>
         <translation>自動垂直並排(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="160"/>
+        <location filename="../../src/bibletime_init.cpp" line="158"/>
         <source>Auto-tile &amp;horizontally</source>
         <translation>自動水平並排(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="181"/>
+        <location filename="../../src/bibletime_init.cpp" line="179"/>
         <source>Auto-&amp;cascade</source>
         <translation>自動�疊顯示(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="188"/>
+        <location filename="../../src/bibletime_init.cpp" line="186"/>
         <source>&amp;Cascade</source>
         <translation>�疊顯示(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="202"/>
+        <location filename="../../src/bibletime_init.cpp" line="200"/>
         <source>Tile &amp;vertically</source>
         <translation>垂直並排(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="209"/>
+        <location filename="../../src/bibletime_init.cpp" line="207"/>
         <source>Tile &amp;horizontally</source>
         <translation>水平並排(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="223"/>
+        <location filename="../../src/bibletime_init.cpp" line="221"/>
         <source>Cl&amp;ose all windows</source>
         <translation>關閉所有視窗(&amp;o)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="226"/>
+        <location filename="../../src/bibletime_init.cpp" line="224"/>
         <source>Close all open windows inside BibleTime</source>
         <translation>關閉所有在BibleTime內開啟的視窗</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="243"/>
+        <location filename="../../src/bibletime_init.cpp" line="241"/>
         <source>&amp;Handbook</source>
         <translation>手冊(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="250"/>
+        <location filename="../../src/bibletime_init.cpp" line="248"/>
         <source>&amp;Bible Study Howto</source>
         <translation>如何研經(&amp;B)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="556"/>
+        <location filename="../../src/bibletime_slots.cpp" line="533"/>
         <source>Please enter a name for the new session.</source>
         <translation>請輸入新工作階段的�稱.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="109"/>
+        <location filename="../../src/bibletime_slots.cpp" line="541"/>
+        <source>Session already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_slots.cpp" line="542"/>
+        <source>Session with the name &quot;%1&quot; already exists. Please provide a different name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="107"/>
         <source>Quit BibleTime</source>
         <translation>離開BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="116"/>
+        <location filename="../../src/bibletime_init.cpp" line="114"/>
         <source>Toggle fullscreen mode of the main window</source>
         <translation>切�主視窗的全螢幕模�</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="125"/>
+        <location filename="../../src/bibletime_init.cpp" line="123"/>
         <source>Search in &amp;open works...</source>
         <translation>在開啟的著作中�尋(&amp;o)...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="132"/>
+        <location filename="../../src/bibletime_init.cpp" line="130"/>
         <source>Search in standard &amp;Bible...</source>
         <translation>在�經中�尋(&amp;B)...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="139"/>
+        <location filename="../../src/bibletime_init.cpp" line="137"/>
         <source>Save as &amp;new session...</source>
         <translation>儲存新工作階段(&amp;n)...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="142"/>
+        <location filename="../../src/bibletime_init.cpp" line="140"/>
         <source>Create and save a new session</source>
         <translation>建立並儲存新工作階段</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="149"/>
+        <location filename="../../src/bibletime_init.cpp" line="147"/>
         <source>Manually arrange the open windows</source>
         <translation>手動排列開啟的視窗</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="156"/>
+        <location filename="../../src/bibletime_init.cpp" line="154"/>
         <source>Automatically tile the open windows vertically (arrange side by side)</source>
         <translation>自動垂直堆列開啟的視窗 (邊與邊排列)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="163"/>
+        <location filename="../../src/bibletime_init.cpp" line="161"/>
         <source>Automatically tile the open windows horizontally (arrange on top of each other)</source>
         <translation>自動水平堆列開啟的視窗 (一個堆著一個排列)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="167"/>
+        <location filename="../../src/bibletime_init.cpp" line="165"/>
         <source>Auto-&amp;tile</source>
         <translation>自動堆列(&amp;t)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="170"/>
+        <location filename="../../src/bibletime_init.cpp" line="168"/>
         <source>Automatically tile the open windows</source>
         <translation>自動堆列開啟的視窗</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="174"/>
+        <location filename="../../src/bibletime_init.cpp" line="172"/>
         <source>Ta&amp;bbed</source>
         <translation>分�(&amp;b)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="177"/>
+        <location filename="../../src/bibletime_init.cpp" line="175"/>
         <source>Automatically tab the open windows</source>
         <translation>自動分�開啟的視窗</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="184"/>
+        <location filename="../../src/bibletime_init.cpp" line="182"/>
         <source>Automatically cascade the open windows</source>
         <translation>自動�疊開啟的視窗</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="191"/>
+        <location filename="../../src/bibletime_init.cpp" line="189"/>
         <source>Cascade the open windows</source>
         <translation>�疊顯示開啟的視窗</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="195"/>
+        <location filename="../../src/bibletime_init.cpp" line="193"/>
         <source>&amp;Tile</source>
         <translation>堆列(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="198"/>
+        <location filename="../../src/bibletime_init.cpp" line="196"/>
         <source>Tile the open windows</source>
         <translation>堆列開啟的視窗</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="205"/>
+        <location filename="../../src/bibletime_init.cpp" line="203"/>
         <source>Vertically tile (arrange side by side) the open windows</source>
         <translation>垂直堆列(邊�邊排列)開啟的視窗</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="212"/>
+        <location filename="../../src/bibletime_init.cpp" line="210"/>
         <source>Horizontally tile (arrange on top of each other) the open windows</source>
         <translation>水平堆列(一個疊一個排列)開啟的視窗</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="216"/>
+        <location filename="../../src/bibletime_init.cpp" line="214"/>
         <source>Close &amp;window</source>
         <translation>關閉視窗(&amp;w)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="219"/>
+        <location filename="../../src/bibletime_init.cpp" line="217"/>
         <source>Close the current open window</source>
         <translation>關閉目�開啟的視窗</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="230"/>
+        <location filename="../../src/bibletime_init.cpp" line="228"/>
         <source>&amp;Configure BibleTime...</source>
         <translation>設定BibleTime(&amp;C)...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="232"/>
+        <location filename="../../src/bibletime_init.cpp" line="230"/>
         <source>Set BibleTime&apos;s preferences</source>
         <translation>設定 BibleTIme 的個人設定</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="236"/>
+        <location filename="../../src/bibletime_init.cpp" line="234"/>
         <source>Bookshelf &amp;Manager...</source>
         <translation>書架管�員(&amp;M)...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="239"/>
+        <location filename="../../src/bibletime_init.cpp" line="237"/>
         <source>Configure your bookshelf and install/update/remove/index works</source>
         <translation>設定你的書架並安�/更新/移除/建立索引 書目</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="246"/>
+        <location filename="../../src/bibletime_init.cpp" line="244"/>
         <source>Open BibleTime&apos;s handbook</source>
         <translation>開啟 BibleTime 的使用手冊</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="262"/>
+        <location filename="../../src/bibletime_init.cpp" line="260"/>
         <source>&amp;Tip of the day...</source>
         <translation>�日秘訣(&amp;T)...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="265"/>
+        <location filename="../../src/bibletime_init.cpp" line="263"/>
         <source>Show tips about BibleTime</source>
         <translation>顯示 BibleTime 的�秘訣</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="373"/>
+        <location filename="../../src/bibletime_init.cpp" line="402"/>
         <source>Toggle visibility of the bookshelf window</source>
         <translation>書架視窗�覽切�</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="377"/>
+        <location filename="../../src/bibletime_init.cpp" line="406"/>
         <source>Toggle visibility of the bookmarks window</source>
         <translation>書籤視窗�覽切�</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="381"/>
+        <location filename="../../src/bibletime_init.cpp" line="410"/>
         <source>Toggle visibility of the mag window</source>
         <translation>雜誌視窗�覽切�</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="714"/>
+        <location filename="../../src/bibletime_init.cpp" line="735"/>
         <source>Main toolbar</source>
         <translation>主�工具列</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="715"/>
+        <location filename="../../src/bibletime_init.cpp" line="736"/>
         <source>Navigation toolbar</source>
         <translation>�覽工具列</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="716"/>
+        <location filename="../../src/bibletime_init.cpp" line="737"/>
         <source>Works toolbar</source>
         <translation>書目工具列</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="717"/>
+        <location filename="../../src/bibletime_init.cpp" line="738"/>
         <source>Tools toolbar</source>
         <translation>工具組工具列</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="718"/>
+        <location filename="../../src/bibletime_init.cpp" line="739"/>
         <source>Format toolbar</source>
         <translation>格�工具列</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="752"/>
+        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <source>Sw&amp;itch session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/bibletime_init.cpp" line="777"/>
         <source>Show main toolbar</source>
         <translation>顯示主工具列</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="755"/>
+        <location filename="../../src/bibletime_init.cpp" line="780"/>
         <source>Show navigation bar</source>
         <translation>顯示�覽列</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="758"/>
+        <location filename="../../src/bibletime_init.cpp" line="783"/>
         <source>Show works toolbar</source>
         <translation>顯示書目工具列</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="761"/>
+        <location filename="../../src/bibletime_init.cpp" line="786"/>
         <source>Show tools toolbar</source>
         <translation>顯示工具組工具列</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="764"/>
+        <location filename="../../src/bibletime_init.cpp" line="789"/>
         <source>Show formatting toolbar</source>
         <translation>顯示格�化工具列</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="767"/>
+        <location filename="../../src/bibletime_init.cpp" line="792"/>
         <source>Show bookshelf</source>
         <translation>顯示書架</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="770"/>
+        <location filename="../../src/bibletime_init.cpp" line="795"/>
         <source>Show bookmarks</source>
         <translation>顯示書籤</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="773"/>
+        <location filename="../../src/bibletime_init.cpp" line="798"/>
         <source>Show mag</source>
         <translation>顯示雜誌</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="722"/>
+        <location filename="../../src/bibletime_init.cpp" line="743"/>
         <source>Toolbars</source>
         <translation>工具列</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="749"/>
+        <location filename="../../src/bibletime_init.cpp" line="774"/>
         <source>Show toolbars in text windows</source>
         <translation>以文字視窗顯示工具列</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="776"/>
+        <location filename="../../src/bibletime_init.cpp" line="801"/>
         <source>Show parallel text headers</source>
         <translation>顯示平行文字標題</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="726"/>
+        <location filename="../../src/bibletime_init.cpp" line="747"/>
         <source>O&amp;pen windows</source>
         <translation>開啟視窗(&amp;p)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="735"/>
+        <location filename="../../src/bibletime_init.cpp" line="760"/>
         <source>Show &quot;Whats this widget&quot; dialog</source>
         <translation>顯示 &quot;這是哪個工具��&quot; 訊�</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="969"/>
+        <location filename="../../src/bibletime_init.cpp" line="954"/>
         <source>Whats this widget?</source>
         <translation>這是哪個工具��?</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="128"/>
+        <location filename="../../src/bibletime_init.cpp" line="126"/>
         <source>Search in all works that are currently open</source>
         <translation>在目�開啟的所有著作中�尋</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="135"/>
+        <location filename="../../src/bibletime_init.cpp" line="133"/>
         <source>Search in the standard Bible</source>
         <translation>在標準�經中�尋</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_slots.cpp" line="555"/>
+        <location filename="../../src/bibletime_slots.cpp" line="532"/>
         <source>New Session</source>
         <translation>新工作階段</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="76"/>
+        <location filename="../../src/bibletime.cpp" line="77"/>
         <source>Initializing the SWORD engine...</source>
         <translation>SWORD 引擎正在啟動...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="84"/>
+        <location filename="../../src/bibletime.cpp" line="85"/>
         <source>Creating BibleTime&apos;s user interface...</source>
         <translation>正在建立 BibleTime 的使用者介�...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="91"/>
+        <location filename="../../src/bibletime.cpp" line="92"/>
         <source>Initializing menu- and toolbars...</source>
         <translation>正在啟動 �單 和 工具列...</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Unlock Work</source>
         <translation>�消鎖定書目</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="196"/>
+        <location filename="../../src/bibletime.cpp" line="194"/>
         <source>Enter the unlock key for %1.</source>
         <translation>替 %1 輸入解鎖密碼.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="216"/>
+        <location filename="../../src/bibletime.cpp" line="214"/>
         <source>Warning: Invalid unlock key!</source>
         <translation>警告: 無效的解鎖密碼!</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime.cpp" line="217"/>
+        <location filename="../../src/bibletime.cpp" line="215"/>
         <source>The unlock key you provided did not properly unlock this module. Please try again.</source>
         <translation>你�供的解鎖密碼無法正確�消鎖定該模組. 請�新試試.</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="257"/>
+        <location filename="../../src/bibletime_init.cpp" line="255"/>
         <source>&amp;About BibleTime</source>
         <translation>關於 BibleTime (&amp;A)</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="712"/>
+        <location filename="../../src/bibletime_init.cpp" line="733"/>
         <source>Bookmarks</source>
         <translation>書籤</translation>
     </message>
     <message>
-        <location filename="../../src/bibletime_init.cpp" line="713"/>
+        <location filename="../../src/bibletime_init.cpp" line="734"/>
         <source>Mag</source>
         <translation>雜誌</translation>
     </message>
@@ -475,7 +480,8 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BibleTimeApp</name>
     <message>
-        <location filename="../../src/bibletimeapp.cpp" line="37"/>
+        <location filename="../../src/bibletimeapp.cpp" line="59"/>
+        <location filename="../../src/mobile/bibletimeapp.cpp" line="63"/>
         <source>Fatal error!</source>
         <translation>嚴�錯誤!</translation>
     </message>
@@ -483,7 +489,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtAboutDialog</name>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
         <source>BibleTime is an easy to use but powerful Bible study tool.</source>
         <translation>BibleTime 是個好上手�好用的�經研讀工具.</translation>
     </message>
@@ -498,52 +504,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>完整�法榜定授權如下.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="109"/>
         <source>About BibleTime</source>
         <translation>關於BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="121"/>
         <source>&amp;BibleTime</source>
         <translation>&amp;BibleTime</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="126"/>
         <source>We are looking for developers and translators. If you would like to join our team, please send an email to %1.</source>
         <translation>我們正在招募開發者和翻譯者. 如果你想��與我們的團隊, 請發個電�郵件到  %1.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="133"/>
-        <source>(c)1999-2013, The BibleTime Team</source>
-        <translation>(c)1999-2013, BibleTime 團隊</translation>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="130"/>
+        <source>(c)1999-2014, The BibleTime Team</source>
+        <translation type="unfinished">(c)1999-2014, BibleTime 團隊</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="137"/>
         <source>&amp;Contributors</source>
         <translation>貢�者&amp;C</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="148"/>
         <source>The following people contributed to BibleTime:</source>
         <translation>感�以下人員為BibleTime付出:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="153"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="150"/>
         <source>documentation and translation manager</source>
         <translation>手冊與翻譯管�員</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="174"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="172"/>
         <source>project manager</source>
         <translation>專案管�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>tester</source>
         <translation>測試者</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
         <source>usability expert</source>
         <translation>�用性專家</translation>
     </message>
@@ -583,52 +589,52 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>授權&amp;L</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="140"/>
         <source>designer</source>
         <translation>設計師</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="142"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="139"/>
         <source>developer</source>
         <translation>開發者</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="151"/>
         <source>project founder</source>
         <translation>專案建立者</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="157"/>
         <source>packager</source>
         <translation>��</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="158"/>
         <source>creator of The Sword Project</source>
         <translation>The Sword Project建立者</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="163"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="160"/>
         <source>domain sponsor</source>
         <translation>網域�贈者</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="164"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="161"/>
         <source>howto</source>
         <translation>howto手冊</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="144"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="141"/>
         <source>artist</source>
         <translation>美工</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="173"/>
         <source>documentation</source>
         <translation>手冊</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btaboutdialog.cpp" line="189"/>
+        <location filename="../../src/frontend/btaboutdialog.cpp" line="188"/>
         <source>The following people translated BibleTime into their language:</source>
         <translation>以下人員將BibleTime翻譯�他們的語言:</translation>
     </message>
@@ -656,37 +662,37 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBibleKeyWidget</name>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="110"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>�動�目清單.點�按鈕並且移動滑鼠以增加或減少項目.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="112"/>
         <source>Next book</source>
         <translation>下一�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="116"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="114"/>
         <source>Previous book</source>
         <translation>上一�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="117"/>
         <source>Next chapter</source>
         <translation>下一章</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="121"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="119"/>
         <source>Previous chapter</source>
         <translation>上一章</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="122"/>
         <source>Next verse</source>
         <translation>下一節</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="126"/>
+        <location filename="../../src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp" line="124"/>
         <source>Previous verse</source>
         <translation>上一節</translation>
     </message>
@@ -765,27 +771,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfGroupingMenu</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="101"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
         <source>Category/Language</source>
         <translation>類別/語言</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="102"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
         <source>Category</source>
         <translation>類別</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="103"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
         <source>Language/Category</source>
         <translation>語言/類別</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="104"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="105"/>
         <source>Language</source>
         <translation>語言</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="107"/>
+        <location filename="../../src/frontend/btbookshelfgroupingmenu.cpp" line="108"/>
         <source>No grouping</source>
         <translation>無群組</translation>
     </message>
@@ -793,7 +799,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfModel</name>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="80"/>
+        <location filename="../../src/backend/bookshelfmodel/btbookshelfmodel.cpp" line="78"/>
         <source>Module</source>
         <translation>模組</translation>
     </message>
@@ -801,31 +807,23 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtBookshelfWidget</name>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="157"/>
         <source>Fi&amp;lter:</source>
         <translation>�濾(&amp;l):</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="163"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="158"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="160"/>
         <source>Grouping</source>
         <translation>群組</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="162"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="159"/>
         <source>Change the grouping of items in the bookshelf.</source>
         <translation>變更書架中的群組項目.</translation>
     </message>
     <message>
-        <source>Category</source>
-        <translation type="obsolete">類別</translation>
-    </message>
-    <message>
-        <source>Language</source>
-        <translation type="obsolete">語言</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="164"/>
+        <location filename="../../src/frontend/btbookshelfwidget.cpp" line="161"/>
         <source>Show/hide works</source>
         <translation>顯示/隱�書目</translation>
     </message>
@@ -839,69 +837,130 @@ This file is distributed under the same license as the Bibetime package.</transl
     </message>
 </context>
 <context>
+    <name>BtConfig</name>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="46"/>
+        <source>Old testament</source>
+        <translation type="unfinished">舊約</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="47"/>
+        <source>Moses/Pentateuch/Torah</source>
+        <translation type="unfinished">摩西五經/律法書</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="48"/>
+        <source>History</source>
+        <translation type="unfinished">歷�書</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="49"/>
+        <source>Prophets</source>
+        <translation type="unfinished">先知書</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="50"/>
+        <source>New testament</source>
+        <translation type="unfinished">æ–°ç´„</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="51"/>
+        <source>Gospels</source>
+        <translation type="unfinished">四�音書</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="52"/>
+        <source>Letters/Epistles</source>
+        <translation type="unfinished">書信</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="53"/>
+        <source>Paul&apos;s Epistles</source>
+        <translation type="unfinished">�羅書信</translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="89"/>
+        <source>Error loading configuration!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/backend/config/btconfig.cpp" line="90"/>
+        <source>Failed to load BibleTime&apos;s configuration, because it appears that the configuration file corresponds to a newer version of BibleTime. This is likely caused by BibleTime being downgraded. Loading the new configuration file may result in &lt;b&gt;loss of data&lt;/b&gt;.&lt;br/&gt;&lt;br/&gt;Do you still want to try to load the new configuration file? Press &quot;No&quot; to quit BibleTime immediately.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BtConfigCore</name>
+    <message>
+        <location filename="../../src/backend/config/btconfigcore.cpp" line="62"/>
+        <source>Default Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtDisplaySettingsButton</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="103"/>
         <source>Use linebreaks after each verse</source>
         <translation>�節後�行</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="104"/>
         <source>Show verse numbers</source>
         <translation>顯示節數</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="105"/>
         <source>Show headings</source>
         <translation>顯示標題</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="106"/>
         <source>Highlight words of Jesus</source>
         <translation>�點標示耶穌的話語</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="107"/>
         <source>Show Hebrew vowel points</source>
         <translation>顯示希伯來文元音符號</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="108"/>
         <source>Show Hebrew cantillation marks</source>
         <translation>顯示希伯來文詠誦標記</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="109"/>
         <source>Show Greek accents</source>
         <translation>顯示希臘文變音符號</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="110"/>
         <source>Use alternative textual variant</source>
         <translation>使用替代文字變體</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="111"/>
         <source>Show scripture cross-references</source>
         <translation>顯示�照經文</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="112"/>
         <source>Show footnotes</source>
         <translation>顯示註解</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="114"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="113"/>
         <source>Show morph segmentation</source>
         <translation>顯示構詞學分割</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="121"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="120"/>
         <source>Display settings</source>
         <translation>顯示設定</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/btdisplaysettingsbutton.cpp" line="123"/>
         <source>Display settings: No options available</source>
         <translation>顯示設定: 沒有�用�項</translation>
     </message>
@@ -909,27 +968,45 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtEditBookmarkDialog</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="71"/>
         <source>Edit Bookmark</source>
         <translation>編輯書籤</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="72"/>
         <source>Location:</source>
         <translation>�置:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="73"/>
         <source>Title:</source>
         <translation>標題:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="75"/>
+        <location filename="../../src/frontend/bookmarks/bteditbookmarkdialog.cpp" line="74"/>
         <source>Description:</source>
         <translation>�述:</translation>
     </message>
 </context>
 <context>
+    <name>BtFindWidget</name>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="28"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="29"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="74"/>
+        <source>Match case</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BtFontChooserWidget</name>
     <message>
         <location filename="../../src/frontend/settingsdialogs/btfontchooserwidget.cpp" line="97"/>
@@ -950,31 +1027,27 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtFontSettingsPage</name>
     <message>
-        <source>You can specify a custom font for each language.</source>
-        <translation type="obsolete">你能為�個語言自訂字體.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="151"/>
         <source>&amp;Language:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
         <source>The font selection below will apply to all texts in this language</source>
         <translation>底下的字體�擇將會套用在該語言的所有文本上</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="155"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="153"/>
         <source>Use custom font</source>
         <translation>使用自訂字型</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="156"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="154"/>
         <source>Optionally specify a custom font for each language:</source>
         <translation>為�個語言自�一個字體:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="152"/>
+        <location filename="../../src/frontend/settingsdialogs/btfontsettings.cpp" line="150"/>
         <source>Fonts</source>
         <translation>å­—é«”</translation>
     </message>
@@ -982,75 +1055,67 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtIndexPage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="108"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="107"/>
         <source>%1 KiB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="114"/>
         <source>0 KiB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="124"/>
         <source>If selected, those indexes which have no corresponding work will be deleted when BibleTime starts</source>
         <translation>如果勾�, 沒有相�應書目的索引會在BibleTime啟動時被刪除</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="125"/>
         <source>Automatically delete orphaned indexes when BibleTime starts</source>
         <translation>當Bible Time啟動時,自動刪除單�的索引</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="127"/>
         <source>Delete the selected indexes</source>
         <translation>刪除�擇的索引</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="129"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="128"/>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="130"/>
         <source>Create new indexes for the selected works</source>
         <translation>為�定的書目建立新的索引</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Work</source>
         <translation>書目</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="57"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="56"/>
         <source>Index size</source>
         <translation>索引大�</translation>
     </message>
     <message>
-        <source>Create new search indexes and delete created indexes for the installed works.</source>
-        <translation type="obsolete">建立新的�尋索引並且刪除已經建立的書目索引.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="123"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="122"/>
         <source>Search Indexes</source>
         <translation>�尋索引</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="91"/>
         <source>Indexed Works</source>
         <translation>以建立索引的書目</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="97"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="96"/>
         <source>Unindexed Works</source>
         <translation>未建立索引書目</translation>
     </message>
     <message>
-        <source>KiB</source>
-        <translation type="obsolete">KB</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="132"/>
+        <location filename="../../src/frontend/bookshelfmanager/indexpage/btindexpage.cpp" line="131"/>
         <source>Create...</source>
         <translation>建立...</translation>
     </message>
@@ -1076,17 +1141,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallModuleChooserDialogModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="92"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="88"/>
         <source>Work</source>
         <translation>著作</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="93"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="89"/>
         <source>Installation source</source>
         <translation>安�來�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="94"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp" line="90"/>
         <source>Version</source>
         <translation>版本</translation>
     </message>
@@ -1099,14 +1164,6 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>安�/更新</translation>
     </message>
     <message>
-        <source>Install and update works. Add remote or local sources, refresh them, select the works to be installed/updated and click Install.&lt;br/&gt;&lt;b&gt;WARNING:&lt;/b&gt; If you live in a persecuted country and don&apos;t want to risk detection don&apos;t use remote sources.</source>
-        <translation type="obsolete">安�且更新書目安�且更新書目. 增加�端或本地來�來�, 刷新紀錄, ���安�/更新的書目然後點�安�.&lt;br/&gt;&lt;b&gt;警告:&lt;/b&gt; 如果你�在個�迫害的國家�迫害的國家,�想冒險被逮�就��用�端來�.</translation>
-    </message>
-    <message>
-        <source>Install folder:</source>
-        <translation type="obsolete">安�資料夾:</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="265"/>
         <source>WARNING!!!</source>
         <translation>警告!!!</translation>
@@ -1187,20 +1244,16 @@ This file is distributed under the same license as the Bibetime package.</transl
         <translation>這個目的地資料夾無法寫入或�存在. 安�會失敗除�這個�題有被解決.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="393"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="388"/>
         <source>Delete Source?</source>
         <translation>刪除來�?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="394"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="389"/>
         <source>Do you really want to delete this source?</source>
         <translation>你真的想�刪除這個來�?</translation>
     </message>
     <message>
-        <source>Install...</source>
-        <translation type="obsolete">安�...</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpage.cpp" line="281"/>
         <source>Install or update selected works</source>
         <translation>安�或更新��的書目</translation>
@@ -1209,17 +1262,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPageModel</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="75"/>
         <source>Work</source>
         <translation>書目</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="76"/>
         <source>Version</source>
         <translation>版本</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="81"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp" line="77"/>
         <source>Description</source>
         <translation>�述</translation>
     </message>
@@ -1235,111 +1288,99 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallPathDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="33"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="35"/>
         <source>Bookshelf Folders</source>
         <translation>書架資料夾</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="41"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
         <source>Works can be installed in one or more folders. After setting up folders here you can choose one of them in Install page.</source>
         <translation>能從一個或多個資料夾中安�書目. 在設定資料夾以後你�以在安���中�擇.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="43"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="45"/>
         <source>BibleTime and the SWORD library find the works from  all of these folders. If a folder is removed here it still exists in the system with all the works in it.</source>
         <translation>BibleTime和SWORD圖書庫從這些資料夾中找到書目. 如果一個資料夾在此被移除,他在系統中�然會有書目在裡�.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="46"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="48"/>
         <source>Configure bookshelf folders</source>
         <translation>設定書架資料夾</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="53"/>
         <source>Configuration file for the folders is: </source>
         <translation>該資料夾的是設定檔:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="61"/>
         <source>Folders where new works can be installed</source>
         <translation>新書目將安�於以下資料夾</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
         <source>Read-only folders</source>
         <translation>唯讀的資料夾</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="64"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="66"/>
         <source>Nonexistent folders</source>
         <translation>�存在的資料夾</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="78"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="80"/>
         <source>&amp;Add...</source>
         <translation>添加&amp;A...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="86"/>
         <source>&amp;Edit...</source>
         <translation>編輯&amp;E...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="90"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="92"/>
         <source>&amp;Remove</source>
         <translation>移除&amp;R</translation>
     </message>
     <message>
-        <source>Add...</source>
-        <translation type="obsolete">添加...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="79"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="81"/>
         <source>Add new folder</source>
         <translation>添加新的資料夾</translation>
     </message>
     <message>
-        <source>Edit...</source>
-        <translation type="obsolete">編輯...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="87"/>
         <source>Edit the selected folder</source>
         <translation>編輯�定的資料夾</translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation type="obsolete">移除</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="91"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="93"/>
         <source>Remove the selected folder</source>
         <translation>移除�定的資料夾</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="167"/>
         <source>This default folder in your home directory can&apos;t be removed</source>
         <translation>在你的家目錄下的�設資料夾�能移除</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="171"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="194"/>
         <source>Choose Folder</source>
         <translation>�擇資料夾</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>Use Folder?</source>
         <translation>使用資料夾?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="180"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="182"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?</source>
         <translation>該資料夾無法寫入, BibleTime無法在此安�書目. 你想使用該資料夾而�先�的設定嗎?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp" line="202"/>
         <source>This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?</source>
         <translation>該資料夾無法寫入, BibleTime無法在此安�書目. 你想使用將該資料夾列入書架資料夾清單嗎?</translation>
     </message>
@@ -1347,52 +1388,42 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtInstallProgressDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Work</source>
         <translation>書目</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="38"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="41"/>
         <source>Progress</source>
         <translation>進度</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="56"/>
-        <source>Stop</source>
-        <translation>�止</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="80"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="60"/>
         <source>Stop All</source>
         <translation>全部�止</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="133"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Completed</source>
         <translation>完�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="139"/>
-        <source>Cancelled</source>
-        <translation>已經�消</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="66"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="55"/>
         <source>Waiting for turn...</source>
         <translation>等著...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="113"/>
         <source>Preparing install...</source>
         <translation>正在準備安�...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="34"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="37"/>
         <source>Install Progress</source>
         <translation>安�進度</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp" line="132"/>
         <source>Failed</source>
         <translation>失敗</translation>
     </message>
@@ -1400,21 +1431,17 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtLanguageSettingsPage</name>
     <message>
-        <source>Select the language in which the Biblical book names are displayed.</source>
-        <translation type="obsolete">�擇�經書�顯示的語言.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="134"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
         <source>Language for names of Bible books:</source>
         <translation>�經書�的語言:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="135"/>
-        <source>The languages which can be used for the biblical booknames</source>
-        <translation>�以用來當作�經書�的語言</translation>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="136"/>
+        <source>The languages which can be used for the biblical book names. Translations are provided by the Sword library.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="132"/>
+        <location filename="../../src/frontend/settingsdialogs/btlanguagesettings.cpp" line="133"/>
         <source>Languages</source>
         <translation>語言</translation>
     </message>
@@ -1464,7 +1491,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtModuleManagerDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp" line="57"/>
         <source>Bookshelf Manager</source>
         <translation>書架管�員</translation>
     </message>
@@ -1472,7 +1499,7 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkAction</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="106"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="103"/>
         <source>&amp;Open work</source>
         <translation>開啟書目(&amp;O)</translation>
     </message>
@@ -1480,12 +1507,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtOpenWorkActionMenu</name>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="45"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="42"/>
         <source>&amp;Grouping order</source>
         <translation>群組次�&amp;G</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/btopenworkaction.cpp" line="46"/>
+        <location filename="../../src/frontend/btopenworkaction.cpp" line="43"/>
         <source>Sets the grouping order for the items in this menu.</source>
         <translation>設定�單中的項目次�.</translation>
     </message>
@@ -1521,55 +1548,47 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtRemovePage</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="99"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="98"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
-        <source>Remove installed works. Select the works and click Remove button.</source>
-        <translation type="obsolete">移除已安�書目.  �擇書目並點�移除按鈕..</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="101"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="100"/>
         <source>Select &amp;works to uninstall:</source>
         <translation>���移除的書目&amp;w:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="102"/>
         <source>&amp;Remove...</source>
         <translation>移除&amp;R...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="111"/>
         <source>Start removal of %1 works:</source>
         <translation>開始移除%1的書目:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="115"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="114"/>
         <source>Start removal:</source>
         <translation>開始移除:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="146"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="145"/>
         <source>You selected the following work(s): </source>
         <translation>你�擇了以下書目:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="150"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="149"/>
         <source>Do you really want to remove them from your system?</source>
         <translation>你真的�從你的系統中移除他們?</translation>
     </message>
     <message>
-        <source>Remove...</source>
-        <translation type="obsolete">移除...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="103"/>
         <source>Remove the selected works</source>
         <translation>移除�定的書目</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="152"/>
+        <location filename="../../src/frontend/bookshelfmanager/removepage/btremovepage.cpp" line="151"/>
         <source>Remove Works?</source>
         <translation>移除書目?</translation>
     </message>
@@ -1590,12 +1609,12 @@ This file is distributed under the same license as the Bibetime package.</transl
 <context>
     <name>BtSearchModuleChooserDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="51"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="47"/>
         <source>Works to Search in</source>
         <translation>�尋在書目</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="53"/>
+        <location filename="../../src/frontend/searchdialog/btsearchmodulechooserdialog.cpp" line="49"/>
         <source>Select the works which should be searched.</source>
         <translation>�擇�被�尋的書目.</translation>
     </message>
@@ -1679,168 +1698,165 @@ shortcut</source>
     </message>
 </context>
 <context>
-    <name>BtSourceArea</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">著作</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation type="obsolete">添加...</translation>
-    </message>
+    <name>BtStandardWorksTab</name>
     <message>
-        <source>Refresh...</source>
-        <translation type="obsolete">刷新...</translation>
-    </message>
-    <message>
-        <source>Refresh the list of works from this source</source>
-        <translation type="obsolete">從這個來�刷新書目清單</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">刪除...</translation>
-    </message>
-    <message>
-        <source>Delete this source</source>
-        <translation type="obsolete">刪除這個來�</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="169"/>
+        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
+        <translation type="unfinished">沒有�定特定書目時將顯示標準書目，例如連�到�經或辭典的超連�被點�時。</translation>
     </message>
     <message>
-        <source>Add new source</source>
-        <translation type="obsolete">添加新的來�</translation>
-    </message>
-</context>
-<context>
-    <name>BtSourceAreaModel</name>
-    <message>
-        <source>Work</source>
-        <translation type="obsolete">書目</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="172"/>
+        <source>Bible:</source>
+        <translation type="unfinished">�經:</translation>
     </message>
     <message>
-        <source>Version</source>
-        <translation type="obsolete">版本</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="174"/>
+        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
+        <translation type="unfinished">將顯示標準�經，當點�連�到�經的超連�時</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">�述</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="176"/>
+        <source>Commentary:</source>
+        <translation type="unfinished">è©•è«–:</translation>
     </message>
-</context>
-<context>
-    <name>BtSourceWidget</name>
     <message>
-        <source>Delete Source?</source>
-        <translation type="obsolete">刪除來�?</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="178"/>
+        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
+        <translation type="unfinished">將顯示標準評論，當點�連�到評論的超連�時</translation>
     </message>
     <message>
-        <source>Do you really want to delete this source?</source>
-        <translation type="obsolete">你真的想�刪除這個來�?</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="180"/>
+        <source>Lexicon:</source>
+        <translation type="unfinished">è©žå½™:</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">�消</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="182"/>
+        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
+        <translation type="unfinished">將顯示標準辭典，當點�連�到辭典的超連�時</translation>
     </message>
     <message>
-        <source>Refreshing Source</source>
-        <translation type="obsolete">正在更新來�</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="184"/>
+        <source>Daily devotional:</source>
+        <translation type="unfinished">�日�修:</translation>
     </message>
     <message>
-        <source>Connecting...</source>
-        <translation type="obsolete">正在連接...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="186"/>
+        <source>The standard devotional will be used to display a short start up devotional</source>
+        <translation type="unfinished">標準�修將用來作為啟動顯示的簡短�修內容</translation>
     </message>
     <message>
-        <source>Refreshing...</source>
-        <translation type="obsolete">刷新...</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="188"/>
+        <source>Hebrew Strong&apos;s lexicon:</source>
+        <translation type="unfinished">希伯來文的強調詞彙:</translation>
     </message>
     <message>
-        <source>No sources were found in the SWORD configuration and BibleTime couldn&apos;t create a default source. Check your SWORD configuration and that the configuration path is writable. Then restart the Bookshelf Manager.</source>
-        <translation type="obsolete">在SWORD設定檔中找�到來�, BibleTime無法建立�設來�..檢查你的SWROD設定值並且設定的路徑為�寫入..然後�新啟動書架管�員.</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="190"/>
+        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
+        <translation type="unfinished">將顯示標準希伯來文辭典，當點�連�到希伯來文辭典的超連�時</translation>
     </message>
     <message>
-        <source>Remote:</source>
-        <translation type="obsolete">�端:</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="192"/>
+        <source>Greek Strong&apos;s lexicon:</source>
+        <translation type="unfinished">希臘文的強調詞彙:</translation>
     </message>
     <message>
-        <source>Local:</source>
-        <translation type="obsolete">本地:</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="194"/>
+        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
+        <translation type="unfinished">將顯示希臘文字典，當點�連�到希臘文字典的超連�時</translation>
     </message>
     <message>
-        <source>Not a directory!</source>
-        <translation type="obsolete">�是一個目錄!</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="196"/>
+        <source>Hebrew morphological lexicon:</source>
+        <translation type="unfinished">希伯來文構詞字彙:</translation>
     </message>
     <message>
-        <source>Not readable!</source>
-        <translation type="obsolete">無法讀�!</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="198"/>
+        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
+        <translation type="unfinished">將顯示希臘文字的標準構詞字典，當希臘文文本中的構詞學標籤超連�被點�時</translation>
     </message>
     <message>
-        <source>Warning</source>
-        <translation type="obsolete">警告</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="200"/>
+        <source>Greek morphological lexicon:</source>
+        <translation type="unfinished">希臘文構詞學詞彙:</translation>
     </message>
     <message>
-        <source>The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed.</source>
-        <translation type="obsolete">這個目的地資料夾無法寫入或�存在. 安�會失敗除�這個�題有被解決.</translation>
+        <location filename="../../src/frontend/settingsdialogs/btstandardworkstab.cpp" line="202"/>
+        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
+        <translation type="unfinished">將顯示希臘文文本的標準構詞學詞彙，當希臘文文本中的構詞學標籤超連�被點�</translation>
     </message>
 </context>
 <context>
     <name>BtTextFiltersTab</name>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="74"/>
         <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="obsolete">�濾器控制文本的呈�. 這裡你能夠調整所有�濾器的�設值. 你�以在個別顯示視窗中�行調整這些設定.</translation>
+        <translation type="unfinished">�濾器控制文本的呈�. 這裡你能夠調整所有�濾器的�設值. 你�以在個別顯示視窗中�行調整這些設定.</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="78"/>
         <source>Insert line break after each verse</source>
-        <translation type="obsolete">�節後�入�行符</translation>
+        <translation type="unfinished">�節後�入�行符</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="79"/>
         <source>Show verse numbers</source>
-        <translation type="obsolete">顯示節數</translation>
+        <translation type="unfinished">顯示節數</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="80"/>
         <source>Show section headings</source>
-        <translation type="obsolete">顯示標題</translation>
+        <translation type="unfinished">顯示標題</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="81"/>
         <source>Show scripture cross-references</source>
-        <translation type="obsolete">顯示�照經文</translation>
+        <translation type="unfinished">顯示�照經文</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="82"/>
         <source>Show Greek accents</source>
-        <translation type="obsolete">顯示希臘文變音符號</translation>
+        <translation type="unfinished">顯示希臘文變音符號</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="83"/>
         <source>Show Hebrew vowel points</source>
-        <translation type="obsolete">顯示希伯來文元音符號</translation>
+        <translation type="unfinished">顯示希伯來文元音符號</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="84"/>
         <source>Show Hebrew cantillation marks</source>
-        <translation type="obsolete">顯示希伯來文詠誦標記</translation>
+        <translation type="unfinished">顯示希伯來文詠誦標記</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="85"/>
         <source>Show morph segmentation</source>
-        <translation type="obsolete">顯示構詞學分割</translation>
+        <translation type="unfinished">顯示構詞學分割</translation>
     </message>
     <message>
+        <location filename="../../src/frontend/settingsdialogs/bttextfilterstab.cpp" line="86"/>
         <source>Use textual variants</source>
-        <translation type="obsolete">使用文字變體</translation>
+        <translation type="unfinished">使用文字變體</translation>
     </message>
 </context>
 <context>
     <name>BtTextWindowHeaderWidget</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="46"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="52"/>
         <source>Add/remove/replace</source>
         <translation>添加/移除/�代</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="148"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="153"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="154"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
         <source>Replace</source>
         <translation>�代</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="159"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="164"/>
         <source>Add</source>
         <translation>添加</translation>
     </message>
@@ -1848,94 +1864,90 @@ shortcut</source>
 <context>
     <name>BtTipDialog</name>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="67"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="69"/>
         <source>Tip Of The Day</source>
         <translation>�日秘訣</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="81"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="83"/>
         <source>Show tips at startup</source>
         <translation>在啟動時顯示�秘訣</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="92"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="94"/>
         <source>Next Tip</source>
         <translation>下一則秘訣</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
         <source>To add multiple Bible works in parallel in your active Bible window select this icon and choose another Bible work.</source>
         <translation>�在以開啟的�經視窗中添加多本�經書目,�擇該圖示並且�擇其他�經書目.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
         <source>To add multiple commentary works in parallel in your active commentary window select this icon and choose another commentary work.</source>
         <translation>�在主動評論視窗中平行添加多本評論書目,�擇該圖示並且�擇其他評論書目.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="134"/>
         <source>To learn more about the BibleTime project please go to our web site.</source>
         <translation>�更了解關於 BibleTime 專案 請上我們的網站.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="135"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="137"/>
         <source>To synchronize a commentary window with the active Bible window, activate the commentary window and select this icon.</source>
         <translation>�在使用中的�經視窗中�步顯示評論視窗, 啟用評論視窗然後�擇該圖示.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
         <source>Select the icon again to stop the synchronization.</source>
         <translation>�次��該圖示以�止�步顯示.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="140"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="142"/>
         <source>To create a bookmark drag any verse reference from a Bible or commentary work into the Bookmarks window. An arrow will indicate the position that the bookmark will go when you release the cursor. Other works will have a reference in the upper left corner that can be used to create a bookmark.</source>
         <translation>�建立一個書籤, 將�經或評論書目中任何章節拉到書籤視窗中. 當你放開游標時時,,會有一個箭頭指�書籤連�的�置. 其他書目會在左上角有�用以建立書籤的�考資料.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="145"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="147"/>
         <source>To change a bookmark title or description, right click on the bookmark and select the Edit Bookmark menu. After finishing the edit the description can be seen by hovering over the bookmark.</source>
         <translation>�改變書籤標題或�述, 在書籤上點���並�擇 &quot;編輯書籤...&quot;. 在完�編輯後, �述會在滑鼠移動經�書籤時看到.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="149"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="151"/>
         <source>To load multiple installation sources for works, go to the Bookshelf Manager, select the Add button, and then the Get List button.</source>
         <translation>�載入多�安�來�的書目，在書架管�員內，�擇 添加 按鈕，然後點下 �得清單 按鈕.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="152"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="154"/>
         <source>To find more information about a work, go the the Bookshelf window, right click on the work, and select the About menu.</source>
         <translation>想找更多關於書目的資訊，去書架視窗，在書目上點���，並�擇關於�單.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="157"/>
         <source>The Bookshelf, Bookmark, and Mag windows can be moved to new locations by dragging them from the title at the top of each window. They can be placed to the left, right, above, or below the works windows. They can be placed on top of each other and tabs will appear so each window can be selected. They can be resized by dragging the border between the window and another window.</source>
         <translation>從個別視窗上能用拖曳的方�將書架�書籤��雜誌視窗能將他們移動到新的�置. 他們會被放置到書目視窗的左方��方�上方�下方. 他們能夠放在彼此之上，也會出�分�讓個別視窗能夠被�擇. 藉由在視窗間調整邊界也能調整這些書目的大�.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="163"/>
         <source>You can search for Strong&apos;s numbers in a work. Start with a work that has Strong&apos;s numbers and hover over a word. Right click the word and use the Strong&apos;s Search menu. A search dialog will appear that allows you to see the use of the same Strong&apos;s number in other locations of the work.</source>
         <translation>你�以�尋書目中強調的行數. 用一本有強調行數的書目開始，並將滑鼠移�一個字. 在字上�點���並使用強調�尋�單. 會有一個�尋視窗出�，讓你能夠看到在該書目中有使用相�強調數目的�置.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="166"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="168"/>
         <source>You can save personal notes for specific verses references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source and look under Commentary and English. Once installed, use the Bookshelf window and right click the Personal commentary. Use either the Edit Plain Text menu or the Edit HTML menu to open the work in write mode.</source>
         <translation>你能夠儲存個人筆記作為特別的經文�考. 你必須安�個人書評. &apos;開啟書架管�員,�擇Crosswire作為來�並在Commentary與English下查閱. 一旦安�好,使用書架視窗並在個人書評上點���.使用 編輯純文字 �單 或 編輯 HTML�單以便將書目以寫入模�開啟.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
         <source>You can view Strong&apos;s number information in the MAG window by hovering over a word in a Bible work that has Strong&apos;s numbers. You should have the StrongsGreek and StrongsHebrew lexicons from Crosswire installed.</source>
         <translation>你�以在雜誌視窗中��滑鼠移動到�有強調行數的�經書目上去觀看強調行數資訊. 你應該從Crosswire�供的來�中安�好StrongGreek和StrongsHebrew 字彙.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="176"/>
+        <location filename="../../src/frontend/tips/bttipdialog.cpp" line="178"/>
         <source>You can save your open windows in a session. Such a session can easily be restored later on. You can save as many sessions as you like. The session feature can be accessed under the Window menu entry.</source>
         <translation>你能儲存您以開啟的視窗到一個工作階段內. 這個工作階段之後能夠被輕易還原.如果想�,你�以儲存許多工作階段.工作階段的功能能夠在視窗�單內存�.</translation>
     </message>
-    <message>
-        <source>To change a bookmark title or description, right click on the bookmark and select &quot;Edit Bookmark...&quot;. After finishing the edit the description can be seen by hovering over the bookmark.</source>
-        <translation type="obsolete">�改變書籤標題或�述, 在書籤上點���並�擇 &quot;編輯書籤...&quot;. 在完�編輯後, �述會在滑鼠移動經�書籤時看到.</translation>
-    </message>
 </context>
 <context>
     <name>BtVerseDropdownChooserButton</name>
@@ -1948,48 +1960,48 @@ shortcut</source>
 <context>
     <name>CAcceleratorSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="128"/>
         <source>Choose action group:</source>
         <translation>�擇動作群組:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="130"/>
         <source>Main Window</source>
         <translation>主視窗</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="136"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
         <source>All text windows</source>
         <translation>所有文字視窗</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="132"/>
         <source>Bible windows</source>
         <translation>�經視窗</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="138"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="133"/>
         <source>Commentary windows</source>
         <translation>評論視窗</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="139"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="134"/>
         <source>Lexicon windows</source>
         <translation>詞彙視窗</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="140"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="135"/>
         <source>Book windows</source>
         <translation>書目視窗</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="192"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="182"/>
         <source>
    &quot;%1&quot; in the &quot;%2&quot; group</source>
         <translation>   &quot;%1&quot; �於 &quot;%2&quot; 群組</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="131"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="126"/>
         <source>Shortcuts</source>
         <translation>�徑</translation>
     </message>
@@ -1997,103 +2009,95 @@ shortcut</source>
 <context>
     <name>CBibleReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="107"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="64"/>
         <source>Next book</source>
         <translation>下一�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="111"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="68"/>
         <source>Previous book</source>
         <translation>上一�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="115"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="72"/>
         <source>Next chapter</source>
         <translation>下一章</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="76"/>
         <source>Previous chapter</source>
         <translation>上一章</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="123"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="80"/>
         <source>Next verse</source>
         <translation>下一節</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="127"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="84"/>
         <source>Previous verse</source>
         <translation>上一節</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="89"/>
         <source>Copy chapter</source>
         <translation>複製本章</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="92"/>
         <source>Save chapter as plain text</source>
         <translation>儲存本章為純文字</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="95"/>
         <source>Save chapter as HTML</source>
         <translation>儲存本章為 HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="141"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="98"/>
         <source>Print chapter</source>
         <translation>列�本章</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="153"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="110"/>
         <source>Text of reference</source>
         <translation>�照經文</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="156"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="159"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="162"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="113"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="119"/>
         <source>Reference with text</source>
         <translation>經文連��照</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="296"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="253"/>
         <source>Bible window</source>
         <translation>�經視窗</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="306"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="263"/>
         <source>Copy...</source>
         <translation>複製...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="274"/>
         <source>Save...</source>
         <translation>儲存...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="330"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="287"/>
         <source>Print...</source>
         <translation>列�...</translation>
     </message>
     <message>
-        <source>Copy chapter to clipboard ...</source>
-        <translation type="obsolete">複製本章至剪貼簿...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="414"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="371"/>
         <source>Copying</source>
         <translation>正在複製</translation>
     </message>
     <message>
-        <source>Saving chapter ...</source>
-        <translation type="obsolete">正在儲存本章...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="433"/>
-        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="451"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="390"/>
+        <location filename="../../src/frontend/displaywindow/cbiblereadwindow.cpp" line="408"/>
         <source>Saving</source>
         <translation>正在儲存</translation>
     </message>
@@ -2101,7 +2105,7 @@ shortcut</source>
 <context>
     <name>CBookReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="80"/>
+        <location filename="../../src/frontend/displaywindow/cbookreadwindow.cpp" line="70"/>
         <source>Toggle tree view</source>
         <translation>切�樹狀檢視</translation>
     </message>
@@ -2109,93 +2113,93 @@ shortcut</source>
 <context>
     <name>CBookmarkIndex</name>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="88"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
         <source>Bookmarks</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="90"/>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="582"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="92"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="583"/>
         <source>New folder</source>
         <translation>新資料夾</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="91"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
         <source>Rename folder</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="702"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
         <source>Delete Items</source>
         <translation>刪除項目</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="703"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="704"/>
         <source>Do you really want to delete the selected items and child-items?</source>
         <translation>你真的想刪除已�項目��項目嗎?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="813"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="814"/>
         <source>The work to which the bookmark points to is not installed.</source>
         <translation>書籤指�的著作尚未安�.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
         <source>Print bookmarks...</source>
         <translation>列�書籤...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="101"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="103"/>
         <source>Remove selected items...</source>
         <translation>移除��的項目...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="99"/>
         <source>Import to folder...</source>
         <translation>匯出到資料夾...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="93"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
         <source>Edit bookmark...</source>
         <translation>編輯書籤...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="95"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="97"/>
         <source>Sort folder bookmarks...</source>
         <translation>排�資料夾書籤...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="96"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
         <source>Sort all bookmarks...</source>
         <translation>排�所有書籤...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="98"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="100"/>
         <source>Export from folder...</source>
         <translation>從資料夾匯出...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="392"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="393"/>
         <source>Can drop only bookmarks or one folder</source>
         <translation>無法拖曳唯一的書籤或資料夾</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="397"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="398"/>
         <source>Can&apos;t drop folder into the folder itself or into its subfolder</source>
         <translation>無法拖曳資料夾到資料夾本身或�資料夾</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="404"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="405"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="406"/>
         <source>Move</source>
         <translation>移動</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="466"/>
+        <location filename="../../src/frontend/bookmarks/cbookmarkindex.cpp" line="467"/>
         <source>Drag references from text views to this view</source>
         <translation>從文本�拖曳�考資料到這個�塊</translation>
     </message>
@@ -2203,42 +2207,42 @@ shortcut</source>
 <context>
     <name>CCommentaryReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="37"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="31"/>
         <source>Next book</source>
         <translation>下一�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="41"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="35"/>
         <source>Previous book</source>
         <translation>上一�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="45"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="39"/>
         <source>Next chapter</source>
         <translation>下一章</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="49"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="43"/>
         <source>Previous chapter</source>
         <translation>上一章</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="53"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="47"/>
         <source>Next verse</source>
         <translation>下一節</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="57"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="51"/>
         <source>Previous verse</source>
         <translation>上一節</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="62"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="56"/>
         <source>Synchronize</source>
         <translation>�步</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="65"/>
+        <location filename="../../src/frontend/displaywindow/ccommentaryreadwindow.cpp" line="59"/>
         <source>Synchronize the displayed entry of this work with the active Bible window</source>
         <translation>以使用中的�經視窗�步顯示這本書的�目</translation>
     </message>
@@ -2246,7 +2250,7 @@ shortcut</source>
 <context>
     <name>CConfigurationDialog</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/settingsdialogs/cconfigurationdialog.cpp" line="41"/>
         <source>Configure BibleTime</source>
         <translation>設定 BibleTime</translation>
     </message>
@@ -2254,67 +2258,67 @@ shortcut</source>
 <context>
     <name>CDisplaySettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="104"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
         <source>Display templates</source>
         <translation>顯示範本</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="111"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
         <source>Available display styles:</source>
         <translation>�用的顯示樣�:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="112"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="113"/>
         <source>Style preview</source>
         <translation>樣��覽</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="130"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="131"/>
         <source>For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.</source>
         <translation>　神愛世人，甚至把他的�生�賜給他們，�一切信他的，�至滅亡，�得永生。</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="137"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="138"/>
         <source>For God didn&apos;t send his Son into the world to judge the world, but that the world should be saved through him.</source>
         <translation>因為　神差他的兒�到世上來，�是�定世人的罪，而是�使世人藉著他得救。</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="144"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="145"/>
         <source>He who believes in him is not judged. He who doesn&apos;t believe has been judged already, because he has not believed in the name of the one and only Son of God.</source>
         <translation>信他的，�被定罪；�信的，罪已經定了，因為他�信　神�生�的�。</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="154"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="155"/>
         <source>For everyone who does evil hates the light, and doesn&apos;t come to the light, lest his works would be exposed.</source>
         <translation>凡作惡的都�光，�來接近光，�得他的惡行暴露出來。</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="160"/>
         <source>But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.</source>
         <translation>凡行真�的，就來接近光，好顯明他所作的都是�著　神而作的。</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="105"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="106"/>
         <source>Display templates define how text is displayed.</source>
         <translation>顯示定義文本如何顯示的範本.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="110"/>
         <source>Show the BibleTime logo on startup</source>
         <translation>在啟動時顯示BibleTime圖示</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="108"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="109"/>
         <source>Show startup logo</source>
         <translation>顯示啟動圖示</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="149"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="150"/>
         <source>This is the judgement, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.</source>
         <translation>這就是審判, 光來到世上, 世人因為自己的行為邪惡, �愛光倒愛黑暗, 定他們罪的原因, 就在這裡。</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="100"/>
+        <location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="101"/>
         <source>Display</source>
         <translation>顯示</translation>
     </message>
@@ -2322,147 +2326,124 @@ shortcut</source>
 <context>
     <name>CDisplayWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="139"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="215"/>
         <source>Back in history</source>
         <translation>上一步</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="147"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="223"/>
         <source>Forward in history</source>
         <translation>下一步</translation>
     </message>
     <message>
-        <source>Zoom in</source>
-        <translation type="obsolete">放大</translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation type="obsolete">縮�</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="116"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="192"/>
         <source>Select all</source>
         <translation>全�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="120"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="196"/>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="124"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="200"/>
         <source>Find...</source>
         <translation>找尋...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="128"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="204"/>
         <source>Change location</source>
         <translation>改變�置</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="133"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="209"/>
         <source>Search with works of this window</source>
         <translation>�尋這個視窗中的著作</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="317"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="393"/>
         <source>Work chooser buttons</source>
         <translation>書目挑�按鈕</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="327"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="403"/>
         <source>Text area header</source>
         <translation>書目標題</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="377"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="453"/>
         <source>Navigation</source>
         <translation>�覽</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="383"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="459"/>
         <source>Tool</source>
         <translation>工具</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="389"/>
+        <location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="465"/>
         <source>Format</source>
         <translation>格�</translation>
     </message>
 </context>
 <context>
-    <name>CFontChooser</name>
-    <message>
-        <source>Size:</source>
-        <translation type="obsolete">大�:</translation>
-    </message>
-    <message>
-        <source>Font name:</source>
-        <translation type="obsolete">字型�稱:</translation>
-    </message>
-    <message>
-        <source>Font style:</source>
-        <translation type="obsolete">字型風格:</translation>
-    </message>
-</context>
-<context>
     <name>CHTMLWriteDisplay</name>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="38"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="42"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
         <source>Bold</source>
         <translation>ç²—é«”</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="48"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="53"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="60"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="67"/>
         <source>Italic</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="58"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="63"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="79"/>
         <source>Underline</source>
         <translation>底線</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="68"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="84"/>
         <source>Left</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="77"/>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="81"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="94"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="99"/>
         <source>Center</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="86"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="104"/>
         <source>Right</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="198"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="231"/>
         <source>Font</source>
         <translation>å­—é«”</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="208"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="243"/>
         <source>Font size</source>
         <translation>字體大�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="217"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="255"/>
         <source>Font color</source>
         <translation>字體�色</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="72"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="89"/>
         <source>Align left</source>
         <translation>�左�齊</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="90"/>
+        <location filename="../../src/frontend/display/chtmlwritedisplay.cpp" line="109"/>
         <source>Align right</source>
         <translation>���齊</translation>
     </message>
@@ -2470,67 +2451,40 @@ shortcut</source>
 <context>
     <name>CHTMLWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="132"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="122"/>
         <source>Module not writable</source>
         <translation>�能寫入模組</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="134"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="124"/>
         <source>Module is not writable.</source>
         <translation>�能寫入模組.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/chtmlwritewindow.cpp" line="125"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>模組��被編輯, 或你沒有寫入權�.</translation>
     </message>
 </context>
 <context>
-    <name>CKeyReferenceWidget</name>
-    <message>
-        <source>Next book</source>
-        <translation type="obsolete">下一�</translation>
-    </message>
-    <message>
-        <source>Previous book</source>
-        <translation type="obsolete">上一�</translation>
-    </message>
-    <message>
-        <source>Next chapter</source>
-        <translation type="obsolete">下一章</translation>
-    </message>
-    <message>
-        <source>Previous chapter</source>
-        <translation type="obsolete">上一章</translation>
-    </message>
-    <message>
-        <source>Next verse</source>
-        <translation type="obsolete">下一節</translation>
-    </message>
-    <message>
-        <source>Previous verse</source>
-        <translation type="obsolete">上一節</translation>
-    </message>
-</context>
-<context>
     <name>CLexiconKeyChooser</name>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
         <source>Scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.</source>
         <translation>�動清單�目�目.  點�按鈕並且移動滑鼠以增加或減少項目項目.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="45"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
         <source>Entries of the current work</source>
         <translation>目�書目的�目</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="46"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="47"/>
         <source>Next entry</source>
         <translation>下一�目</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="48"/>
+        <location filename="../../src/frontend/keychooser/clexiconkeychooser.cpp" line="49"/>
         <source>Previous entry</source>
         <translation>上一�目</translation>
     </message>
@@ -2538,74 +2492,70 @@ shortcut</source>
 <context>
     <name>CLexiconReadWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="50"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="47"/>
         <source>Next entry</source>
         <translation>下一項目</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="54"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="51"/>
         <source>Previous entry</source>
         <translation>上一項目</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="55"/>
         <source>Copy reference only</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="58"/>
         <source>Save entry as HTML</source>
         <translation>儲存項目為 HTML</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="61"/>
         <source>Print reference only</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="76"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
         <source>Strong&apos;s Search</source>
         <translation>Strong&apos;s �尋</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="73"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="64"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
         <source>Entry with text</source>
         <translation>項目文字</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="70"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="67"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="134"/>
         <source>Entry as plain text</source>
         <translation>項目為純文字</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="268"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="265"/>
         <source>Lexicon window</source>
         <translation>辭典視窗</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="275"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="272"/>
         <source>Copy...</source>
         <translation>複製...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="284"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="281"/>
         <source>Save...</source>
         <translation>儲存...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="300"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="297"/>
         <source>Print...</source>
         <translation>列�...</translation>
     </message>
     <message>
-        <source>Saving entry ...</source>
-        <translation type="obsolete">正在儲存項目...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="343"/>
-        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="367"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="340"/>
+        <location filename="../../src/frontend/displaywindow/clexiconreadwindow.cpp" line="364"/>
         <source>Saving</source>
         <translation>正在儲存</translation>
     </message>
@@ -2613,91 +2563,112 @@ shortcut</source>
 <context>
     <name>CPlainWriteWindow</name>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="210"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="235"/>
         <source>Sync with active Bible</source>
         <translation>與使用中�經�步處�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="220"/>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="224"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="245"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="249"/>
         <source>Save text</source>
         <translation>儲存文字</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="229"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="254"/>
         <source>Delete current entry</source>
         <translation>刪除目�項目</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="238"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="263"/>
         <source>Restore original text</source>
         <translation>還原原來文字</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="135"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="163"/>
         <source>Module not writable</source>
         <translation>�能寫入模組</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="137"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="165"/>
         <source>Module is not writable.</source>
         <translation>�能寫入模組.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="138"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="166"/>
         <source>Either the module may not be edited, or you do not have write permission.</source>
         <translation>模組��被編輯, 或你沒有寫入權�.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="215"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="240"/>
         <source>Synchronize (show the same verse) with the active Bible window</source>
         <translation>在使用中的�經視窗中�步(顯示一樣的節次)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="233"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="258"/>
         <source>Delete current entry (no undo)</source>
         <translation>刪除目�的�目(�能復原)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="242"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="267"/>
         <source>Restore original text, new text will be lost</source>
         <translation>復原原本的文字, 新文本會消失</translation>
     </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save Text?</source>
+        <translation type="unfinished">儲存文字?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="280"/>
+        <source>Save text before closing?</source>
+        <translation type="unfinished">關閉�儲存文字?</translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/displaywindow/cplainwritewindow.cpp" line="310"/>
+        <source>Save changed text?</source>
+        <translation type="unfinished">儲存已更改文字?</translation>
+    </message>
 </context>
 <context>
     <name>CSearchAnalysisScene</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="232"/>
         <source>Save Search Analysis</source>
         <translation>儲存�尋分�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="228"/>
-        <source>HTML files (*.html;*.HTML;*.HTM;*.htm)</source>
-        <translation>HTML 檔案 (*.html;*.HTML;*.HTM;*.htm)</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="245"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="243"/>
         <source>BibleTime Search Analysis</source>
         <translation>BibleTimee�尋分�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="246"/>
-        <source>Search text :</source>
-        <translation>�索文字 :</translation>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="234"/>
+        <source>XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="248"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="259"/>
+        <source>Search text:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="263"/>
+        <source>Results by work and book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="265"/>
         <source>Book</source>
         <translation>書目</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="249"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="293"/>
         <source>Total hits</source>
         <translation>總點閱次數</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="283"/>
+        <location filename="../../src/frontend/searchdialog/analysis/csearchanalysisscene.cpp" line="303"/>
         <source>Created by &lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;</source>
         <translation>由&lt;a href=&quot;http://www.bibletime.info/&quot;&gt;BibleTime&lt;/a&gt;建立</translation>
     </message>
@@ -2705,169 +2676,169 @@ shortcut</source>
 <context>
     <name>CSwordModuleInfo</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="777"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="763"/>
         <source>Version</source>
         <translation>版本</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="783"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="766"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="774"/>
         <source>unknown</source>
         <translation>未知的</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="781"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="771"/>
         <source>Markup</source>
         <translation>標記</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="786"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="778"/>
         <source>Location</source>
         <translation>�置</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="790"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="782"/>
         <source>Language</source>
         <translation>語言</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="795"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="787"/>
         <source>Category</source>
         <translation>類別</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="800"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="792"/>
         <source>LCSH</source>
         <translation>LCSH</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="804"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="796"/>
         <source>Writable</source>
         <translation>�寫入</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>yes</source>
         <translation>是</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="805"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="797"/>
         <source>no</source>
         <translation>�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="809"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="801"/>
         <source>Unlock key</source>
         <translation>解鎖鑰</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="828"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="822"/>
         <source>Features</source>
         <translation>特點</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="836"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="830"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>�心, 此著作包�未經驗證的內容!</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="839"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="834"/>
         <source>About</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="856"/>
         <source>Distribution license</source>
         <translation>發行許�證</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="857"/>
         <source>Distribution source</source>
         <translation>發行來�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="858"/>
         <source>Distribution notes</source>
         <translation>發行備註</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="859"/>
         <source>Text source</source>
         <translation>文字來�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="860"/>
         <source>Copyright notes</source>
         <translation>版權備註</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="866"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="861"/>
         <source>Copyright holder</source>
         <translation>版權�有人</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="867"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="862"/>
         <source>Copyright date</source>
         <translation>版權日期</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="868"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="863"/>
         <source>Copyright contact name</source>
         <translation>版權連絡人姓�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="869"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="864"/>
         <source>Copyright contact address</source>
         <translation>版權連絡人地�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="870"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="865"/>
         <source>Copyright contact email</source>
         <translation>版權連絡人電�郵件</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="978"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="956"/>
         <source>Bibles</source>
         <translation>�經</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="980"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="958"/>
         <source>Commentaries</source>
         <translation>è©•è«–</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="982"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="960"/>
         <source>Books</source>
         <translation>書目</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="984"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="962"/>
         <source>Cults/Unorthodox</source>
         <translatorcomment>並�屬於邪教.僅被�為�正統.所以改為其他教派</translatorcomment>
         <translation>其他教派</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="986"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="964"/>
         <source>Maps and Images</source>
         <translation>地圖與圖片</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="988"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="966"/>
         <source>Daily Devotionals</source>
         <translation>�日�修</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="990"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="968"/>
         <source>Lexicons and Dictionaries</source>
         <translation>詞彙與字典</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="992"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="970"/>
         <source>Glossaries</source>
         <translation>字彙表</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="994"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="972"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
@@ -2875,17 +2846,17 @@ shortcut</source>
 <context>
     <name>CSwordSettingsPage</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="329"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="43"/>
         <source>Standard works</source>
         <translation>標準著作</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="330"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="44"/>
         <source>Text filters</source>
         <translation>文字�濾器</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="327"/>
+        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="41"/>
         <source>Desk</source>
         <translation>桌�</translation>
     </message>
@@ -2893,32 +2864,32 @@ shortcut</source>
 <context>
     <name>CSwordSetupInstallSourcesDialog</name>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="44"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="47"/>
         <source>Caption</source>
         <translation>標題</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="59"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
         <source>Type</source>
         <translation>é¡žåž‹</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="62"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
         <source>Server</source>
         <translation>伺�器</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="65"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="68"/>
         <source>Path</source>
         <translation>路徑</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="85"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="91"/>
         <source>Get list...</source>
         <translation>�得清單...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="160"/>
         <source>List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don&apos;t want to keep.
 
 Do you want to continue?</source>
@@ -2929,145 +2900,126 @@ Do you want to continue?</source>
 你�繼續嗎?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="155"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
         <source>Get source list from remote server?</source>
         <translation>從�端伺�器�得來�清單?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="167"/>
         <source>Cancel</source>
         <translation>�消</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="162"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="168"/>
         <source>Downloading List</source>
         <translation>下載清單</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="172"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="178"/>
         <source>Connecting...</source>
         <translation>連接中...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="191"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="197"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="198"/>
         <source>Refreshing...</source>
         <translation>刷新資料中...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="112"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="86"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="92"/>
         <source>Download a list of sources from CrossWire server and add sources</source>
         <translation>從CrossWire伺�器下載來�清單並且加入來�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="98"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="104"/>
         <source>Please provide a caption.</source>
         <translation>請�供標題.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
         <source>A source with this caption already exists. Please provide a different caption.</source>
         <translation>有這個標題的來�已經存在.請�供��的標題.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="113"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="119"/>
         <source>Please provide a server name.</source>
         <translation>請�供伺�器�稱.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="120"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="126"/>
         <source>Please provide a valid, readable path.</source>
         <translation>請�供有效的, �讀的路徑.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="130"/>
         <source>Please provide a path.</source>
         <translation>請�供路徑.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="36"/>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="39"/>
         <source>New  Installation Source</source>
         <translation>新的 安�來�</translation>
     </message>
 </context>
 <context>
-    <name>CWriteWindow</name>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <source>Save text before closing?</source>
-        <translation>關閉�儲存文字?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save changed text?</source>
-        <translation>儲存已更改文字?</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="110"/>
-        <location filename="../../src/frontend/displaywindow/cwritewindow.cpp" line="140"/>
-        <source>Save Text?</source>
-        <translation>儲存文字?</translation>
-    </message>
-</context>
-<context>
     <name>InfoDisplay::CInfoDisplay</name>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="175"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="178"/>
         <source>&lt;div class=&quot;moduleinfo&quot;&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Version: %3&lt;/p&gt;&lt;/div&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="195"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="194"/>
         <source>Abbreviation</source>
         <translation>縮寫</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="206"/>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="305"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="203"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="290"/>
         <source>Cross references</source>
         <translation>�照</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="361"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="343"/>
         <source>Footnote</source>
         <translation>注釋</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="392"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="374"/>
         <source>Strongs</source>
         <translation>Strongs</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="474"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="451"/>
         <source>Morphology</source>
         <translation>構詞學</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="498"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="472"/>
         <source>Word lookup</source>
         <translation>詞彙查詢</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="60"/>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="51"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="55"/>
         <source>Select all</source>
         <translation>全�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cinfodisplay.cpp" line="76"/>
+        <location filename="../../src/frontend/cinfodisplay.cpp" line="80"/>
         <source>&lt;small&gt;This is the Mag viewer area. Hover the mouse over links or other items which include some data and the contents appear in the Mag after a short delay. Move the mouse into Mag rapidly or lock the view by pressing and holding Shift while moving the mouse.&lt;/small&gt;</source>
         <translation>&lt;small&gt;這是雜誌閱覽�. ��包�一些資料內容的滑鼠效果連�或其他項目會�微慢一點出�在雜誌�內 快速移動滑鼠到雜誌�或按著在移動滑鼠的�時按�Shift�來鎖�閱覽內容.&lt;/small&gt;</translation>
     </message>
@@ -3075,28 +3027,28 @@ Do you want to continue?</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="412"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="422"/>
         <source>Indexing aborted</source>
         <translation>建立索引被中斷</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="408"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="413"/>
         <source>An internal error occurred while building the index: %1</source>
         <translation>在建立索引%1 時發生內部錯誤</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="415"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="423"/>
         <source>An internal error occurred while building the index.</source>
         <translation>在建立索引的�程中發生內部錯誤.</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="522"/>
         <source>Search aborted</source>
         <translation>�尋被中斷</translation>
     </message>
     <message>
-        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="509"/>
+        <location filename="../../src/backend/drivers/cswordmoduleinfo.cpp" line="523"/>
         <source>An internal error occurred while executing your search.</source>
         <translation>在執行�索時發生一個內部錯誤.</translation>
     </message>
@@ -3137,7 +3089,7 @@ Do you want to continue?</source>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="131"/>
         <location filename="../../src/backend/btmoduletreeitem.cpp" line="239"/>
         <location filename="../../src/frontend/displaywindow/btmodulechooserbutton.cpp" line="93"/>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="117"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="122"/>
         <source>Bibles</source>
         <translation>�經</translation>
     </message>
@@ -3154,740 +3106,740 @@ Do you want to continue?</source>
         <translation>書�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="391"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="390"/>
         <source>Added text</source>
         <translation>附加文字</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="164"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="143"/>
         <source>Names of languages</source>
         <comment>No need to translate - see the longer comment (If there is no longer comment, it doesn&apos;t work yet :)) ------ </comment>
         <extracomment>The string &quot;Names of languages&quot; doesn&apos;t actually need translation. It is put here to help translators notice this help text. ------- The names of the languages should follow the conventions of your language. You can write the names with a capital first letter even if your language uses non-capitalized language names (they look better with capital first letter when they are listed). ------- To find the names of all languages from internet try searching for &quot;names of languages in language_x&quot; but in your own language, e.g. &quot;kielten nimet suomeksi&quot; in Finnish or &quot;names of languages in english&quot; in English. ------- You can find the language codes and names by googling for the standards mentioned below. ------- Preference order for locale codes are: ------- ISO 639-1 ------- ISO 639-2 ------- ISO 639-3 ------- x-E-XXX form is deprecated and no modules in repositories use it. If you find a module with x-E-XXX language, update the module.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="169"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="148"/>
         <source>Afrikaans</source>
         <extracomment>Language name af</extracomment>
         <translation>���蘭文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="172"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="151"/>
         <source>Amuzgo, Guerrero</source>
         <extracomment>Language name amu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="174"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="153"/>
         <source>English, Old (ca.450-1100)</source>
         <extracomment>Language name ang</extracomment>
         <translation>英文, �代 (約450-1100)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="176"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="155"/>
         <source>Arabic</source>
         <extracomment>Language name ar</extracomment>
         <translation>阿拉伯文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="179"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="158"/>
         <source>Azerbaijani</source>
         <extracomment>Language name az</extracomment>
         <translation>亞塞拜然文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="181"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="160"/>
         <source>Azerbaijani, South</source>
         <extracomment>Language name azb</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="165"/>
         <source>Belarusian</source>
         <extracomment>Language name be</extracomment>
         <translation>白俄羅斯文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="167"/>
         <source>Bulgarian</source>
         <extracomment>Language name bg</extracomment>
         <translation>�加利亞文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="194"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="173"/>
         <source>Breton</source>
         <extracomment>Language name br</extracomment>
         <translation>布里敦文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="196"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="175"/>
         <source>Bosnian</source>
         <extracomment>Language name bs</extracomment>
         <translation>波士尼亞文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="198"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="177"/>
         <source>Catalan</source>
         <extracomment>Language name ca</extracomment>
         <translation>��隆尼亞文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="180"/>
         <source>Chinantec, Comaltepec</source>
         <extracomment>Language name cco</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="182"/>
         <source>Cebuano</source>
         <extracomment>Language name ceb</extracomment>
         <translation>宿霧文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
         <source>Chamorro</source>
         <extracomment>Language name ch</extracomment>
         <translation>查莫羅文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="186"/>
         <source>Chontal, Highland Oaxaca</source>
         <extracomment>Language name chd</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="188"/>
         <source>Chinantec, Quiotepec</source>
         <extracomment>Language name chq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="211"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="190"/>
         <source>Chinantec, Ozumacu00edn</source>
         <extracomment>Language name chz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="193"/>
         <source>Cakchiquel, Western</source>
         <extracomment>Language name ckw</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="195"/>
         <source>Chinantec, Lalana</source>
         <extracomment>Language name cnl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="197"/>
         <source>Chinantec, Tepetotutla</source>
         <extracomment>Language name cnt</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="220"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="199"/>
         <source>Coptic</source>
         <extracomment>Language name cop</extracomment>
         <translation>科普特文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="222"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="201"/>
         <source>Czech</source>
         <extracomment>Language name cs</extracomment>
         <translation>�克文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="224"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="203"/>
         <source>Chinantec, Sochiapan</source>
         <extracomment>Language name cso</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="226"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="205"/>
         <source>Chol, Tila</source>
         <extracomment>Language name cti</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="228"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="207"/>
         <source>Chatino, Western Highland</source>
         <extracomment>Language name ctp</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="230"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="209"/>
         <source>Church Slavic</source>
         <extracomment>Language name cu</extracomment>
         <translation>教會斯拉夫文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="212"/>
         <source>Welsh</source>
         <extracomment>Language name cy</extracomment>
         <translation>�爾斯文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="214"/>
         <source>Danish</source>
         <extracomment>Language name da</extracomment>
         <translation>丹麥文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="216"/>
         <source>German</source>
         <extracomment>Language name de</extracomment>
         <translation>å¾·æ–‡</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="218"/>
         <source>Duruma</source>
         <extracomment>Language name dug</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="242"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="221"/>
         <source>Greek, Modern (1453-)</source>
         <extracomment>Language name el</extracomment>
         <translation>希臘文, �代 (1453-)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="244"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
         <source>English</source>
         <extracomment>Language name en</extracomment>
         <translation>英文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="246"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="225"/>
         <source>American English</source>
         <extracomment>Language name en_US</extracomment>
         <translation>美國英文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="248"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="227"/>
         <source>English, Middle (1100-1500)</source>
         <extracomment>Language name enm</extracomment>
         <translation>英文, 中世紀 (1100-1500)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="250"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="229"/>
         <source>Esperanto</source>
         <extracomment>Language name eo</extracomment>
         <translation>世界語</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="252"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="231"/>
         <source>Spanish</source>
         <extracomment>Language name es</extracomment>
         <translation>西�牙文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="254"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="233"/>
         <source>Estonian</source>
         <extracomment>Language name et</extracomment>
         <translation>愛沙尼亞文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="235"/>
         <source>Basque</source>
         <extracomment>Language name eu</extracomment>
         <translation>巴斯克文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="237"/>
         <source>Persian</source>
         <extracomment>Language name fa</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="239"/>
         <source>Finnish</source>
         <extracomment>Language name fi</extracomment>
         <translation>芬蘭文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="243"/>
         <source>French</source>
         <extracomment>Language name fr</extracomment>
         <translation>法文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="245"/>
         <source>Frisian</source>
         <extracomment>Language name fy</extracomment>
         <translation>弗里西文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="247"/>
         <source>Irish</source>
         <extracomment>Language name ga</extracomment>
         <translation>愛爾蘭文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="270"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="249"/>
         <source>Gaelic (Scots)</source>
         <extracomment>Language name gd</extracomment>
         <translation>蓋爾文 (蘇格蘭)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="272"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="251"/>
         <source>Geez</source>
         <extracomment>Language name gez</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="256"/>
         <source>Gothic</source>
         <extracomment>Language name got</extracomment>
         <translation>哥德文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="258"/>
         <source>Manx</source>
         <extracomment>Language name gv</extracomment>
         <translation>曼島文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="260"/>
         <source>Greek, Ancient (to 1453)</source>
         <extracomment>Language name grc</extracomment>
         <translation>希臘文, �代 (至1453)</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="262"/>
         <source>Hebrew</source>
         <extracomment>Language name he</extracomment>
         <translation>希伯來文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="285"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="264"/>
         <source>Hausa</source>
         <extracomment>Language name hau</extracomment>
         <translation>豪薩文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="266"/>
         <source>Hawaiian</source>
         <extracomment>Language name haw</extracomment>
         <translation>��夷文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="268"/>
         <source>Hindi</source>
         <extracomment>Language name hi</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="292"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="271"/>
         <source>Croatian</source>
         <extracomment>Language name hr</extracomment>
         <translation>克羅埃西亞文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="275"/>
         <source>Hungarian</source>
         <extracomment>Language name hu</extracomment>
         <translation>匈牙利文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="277"/>
         <source>Huave, San Mateo Del Mar</source>
         <extracomment>Language name huv</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="279"/>
         <source>Armenian</source>
         <extracomment>Language name hy</extracomment>
         <translation>亞美尼亞文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="283"/>
         <source>Indonesian</source>
         <extracomment>Language name id</extracomment>
         <translation>�尼文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="308"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="287"/>
         <source>Icelandic</source>
         <extracomment>Language name is</extracomment>
         <translation>冰島文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="310"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="289"/>
         <source>Italian</source>
         <extracomment>Language name it</extracomment>
         <translation>義大利文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="291"/>
         <source>Itzu00e1</source>
         <extracomment>Language name itz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="314"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="293"/>
         <source>Ixil, San Juan Cotzal</source>
         <extracomment>Language name ixl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="317"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="296"/>
         <source>Japanese</source>
         <extracomment>Language name ja</extracomment>
         <translation>日文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="298"/>
         <source>Jacalteco, Eastern</source>
         <extracomment>Language name jac</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="300"/>
         <source>Javanese, Caribbean</source>
         <extracomment>Language name jvn</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="302"/>
         <source>Georgian</source>
         <extracomment>Language name ka</extracomment>
         <translation>喬治亞文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="312"/>
         <source>Korean</source>
         <extracomment>Language name ko</extracomment>
         <translation>韓文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="336"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="315"/>
         <source>Kurdish</source>
         <extracomment>Language name ku</extracomment>
         <translation>庫爾德文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="340"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="319"/>
         <source>Kirghiz</source>
         <extracomment>Language name ky</extracomment>
         <translation>�爾�斯文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="342"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="321"/>
         <source>Latin</source>
         <extracomment>Language name la</extracomment>
         <translation>拉�文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="344"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="323"/>
         <source>Lacandon</source>
         <extracomment>Language name lac</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="351"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
         <source>Lithuanian</source>
         <extracomment>Language name lt</extracomment>
         <translation>立陶宛文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="332"/>
         <source>Latvian</source>
         <extracomment>Language name lv</extracomment>
         <translation>拉脫維亞文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="334"/>
         <source>Malagasy</source>
         <extracomment>Language name mg</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="358"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="337"/>
         <source>Maori</source>
         <extracomment>Language name mi</extracomment>
         <translation>毛利文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="360"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="339"/>
         <source>Mixe, Isthmus</source>
         <extracomment>Language name mir</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="362"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="341"/>
         <source>Mixtec, Coatzospan</source>
         <extracomment>Language name miz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="364"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="343"/>
         <source>Macedonian</source>
         <extracomment>Language name mk</extracomment>
         <translation>馬其頓文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="366"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="345"/>
         <source>Mixtec, Silacayoapan</source>
         <extracomment>Language name mks</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="371"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="350"/>
         <source>More</source>
         <extracomment>Language name mos</extracomment>
         <translation>更多</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="374"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="353"/>
         <source>Malay</source>
         <extracomment>Language name ms</extracomment>
         <translation>馬來文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="376"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="355"/>
         <source>Maltese</source>
         <extracomment>Language name mt</extracomment>
         <translation>馬爾他文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="396"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="375"/>
         <source>Low German; Low Saxon</source>
         <extracomment>Language name nds</extracomment>
         <translation>低地德文; 低地薩克�文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="398"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="377"/>
         <source>Nepali</source>
         <extracomment>Language name ne</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="379"/>
         <source>Nahuatl, Guerrero</source>
         <extracomment>Language name ngu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
         <source>Nahuatl, Northern Oaxaca</source>
         <extracomment>Language name nhy</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
         <source>Dutch</source>
         <extracomment>Language name nl</extracomment>
         <translation>�蘭文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
         <source>Norwegian Nynorsk</source>
         <extracomment>Language name nn</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
         <source>Norwegian</source>
         <extracomment>Language name no</extracomment>
         <translation>挪�文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="418"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="397"/>
         <source>Otomi, Queru00e9taro</source>
         <extracomment>Language name otq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="421"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="400"/>
         <source>Papiamento</source>
         <extracomment>Language name pap</extracomment>
         <translation>帕皮亞門托文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="405"/>
         <source>Polish</source>
         <extracomment>Language name pl</extracomment>
         <translation>波蘭文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="432"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="411"/>
         <source>Persian (Dari)</source>
         <extracomment>Language name prs</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="436"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="415"/>
         <source>Portuguese</source>
         <extracomment>Language name pt</extracomment>
         <translation>葡�牙文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="438"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
         <source>Brasilian Portuguese</source>
         <extracomment>Language name pt_BR</extracomment>
         <translation>巴西葡�牙文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="441"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
         <source>Quichu00e9, West Central</source>
         <extracomment>Language name qut</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
         <source>Romanian</source>
         <extracomment>Language name ro</extracomment>
         <translation>羅馬尼亞文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="447"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="426"/>
         <source>Russian</source>
         <extracomment>Language name ru</extracomment>
         <translation>ä¿„æ–‡</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="452"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="431"/>
         <source>Scots</source>
         <extracomment>Language name sco</extracomment>
         <translation>蘇格蘭文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="458"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="437"/>
         <source>Slovak</source>
         <extracomment>Language name sk</extracomment>
         <translation>斯洛�克文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="460"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="439"/>
         <source>Slovenian</source>
         <extracomment>Language name sl</extracomment>
         <translation>斯洛文尼亞文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="464"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="443"/>
         <source>Somali</source>
         <extracomment>Language name so</extracomment>
         <translation>索馬里文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="445"/>
         <source>Albanian</source>
         <extracomment>Language name sq</extracomment>
         <translation>阿爾巴尼亞文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="474"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="453"/>
         <source>Swedish</source>
         <extracomment>Language name sv</extracomment>
         <translation>瑞典文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="455"/>
         <source>Swahili</source>
         <extracomment>Language name sw</extracomment>
         <translation>斯瓦希里文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="478"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="457"/>
         <source>Syriac</source>
         <extracomment>Language name syr</extracomment>
         <translation>�敘利亞文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="480"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="459"/>
         <source>Tamil</source>
         <extracomment>Language name ta</extracomment>
         <translation>泰米爾文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="463"/>
         <source>Thai</source>
         <extracomment>Language name th</extracomment>
         <translation>æ³°æ–‡</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="466"/>
         <source>Tagalog</source>
         <extracomment>Language name tl</extracomment>
         <translation>塔加洛文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="491"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="470"/>
         <source>Tswana</source>
         <extracomment>Language name tn</extracomment>
         <translation>茨瓦�文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="493"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="472"/>
         <source>Turkish</source>
         <extracomment>Language name tr</extracomment>
         <translation>土耳其文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="497"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="476"/>
         <source>Tektiteko</source>
         <extracomment>Language name ttc</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="479"/>
         <source>Tahitian</source>
         <extracomment>Language name ty</extracomment>
         <translation>大溪地文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="481"/>
         <source>Tzotzil, Zinacantu00e1n</source>
         <extracomment>Language name tzz</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="484"/>
         <source>Ukrainian</source>
         <extracomment>Language name uk</extracomment>
         <translation>�克蘭文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="508"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="487"/>
         <source>Orya</source>
         <extracomment>Language name ury</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="510"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
         <source>Uspanteco</source>
         <extracomment>Language name usp</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="492"/>
         <source>Vietnamese</source>
         <extracomment>Language name vi</extracomment>
         <translation>越�文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="496"/>
         <source>Xhosa</source>
         <extracomment>Language name xh</extracomment>
         <translation>科薩文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="184"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="163"/>
         <source>Bavarian</source>
         <extracomment>Language name bar</extracomment>
         <translation>巴�利亞文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="347"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="326"/>
         <source>Lombard</source>
         <extracomment>Language name lmo</extracomment>
         <translation>倫巴底文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="424"/>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="430"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="403"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="409"/>
         <source>Uma</source>
         <extracomment>Language name ppk
 ----------
@@ -3895,453 +3847,421 @@ Language name ppk</extracomment>
         <translation>Uma æ–‡</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="469"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="448"/>
         <source>Sranan</source>
         <extracomment>Language name srn</extracomment>
         <translation>蘇利�文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="500"/>
         <source>Yiddish</source>
         <extracomment>Language name yi</extracomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="526"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="505"/>
         <source>Zapotec, San Juan Guelavu00eda</source>
         <extracomment>Language name zab</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="528"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="507"/>
         <source>Zapotec, Mitla</source>
         <extracomment>Language name zaw</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="530"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="509"/>
         <source>Chinese</source>
         <extracomment>Language name zh</extracomment>
         <translation>中文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="532"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="511"/>
         <source>Zapotec, Amatlu00e1n</source>
         <extracomment>Language name zpo</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="534"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="513"/>
         <source>Zapotec, Zoogocho</source>
         <extracomment>Language name zpq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="536"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="515"/>
         <source>Zapotec, Yalu00e1lag</source>
         <extracomment>Language name zpu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="538"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="517"/>
         <source>Zapotec, Chichicapan</source>
         <extracomment>Language name zpv</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="540"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
         <source>Zapotec, Southern Rincon</source>
         <extracomment>Language name zsr</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="542"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="521"/>
         <source>Zapotec, Quioquitani-Quieru00ed</source>
         <extracomment>Language name ztq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="544"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
         <source>Zapotec, Yatee</source>
         <extracomment>Language name zty</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="546"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="525"/>
         <source>Zulu</source>
         <extracomment>Language name zu</extracomment>
         <translation>祖魯文</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="337"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="314"/>
         <source>Footnotes</source>
         <translation>注釋</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="339"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="316"/>
         <source>Strong&apos;s numbers</source>
         <translation>Strong&apos;s numbers</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="341"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="318"/>
         <source>Headings</source>
         <translation>標題</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="343"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="320"/>
         <source>Morphological tags</source>
         <translation>構詞學標記</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="345"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="322"/>
         <source>Lemmas</source>
         <translation>è©žå½¢</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="347"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="324"/>
         <source>Hebrew vowel points</source>
         <translation>希伯來文元音符號</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="349"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="326"/>
         <source>Hebrew cantillation marks</source>
         <translation>希伯來文詠誦標記</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="351"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="328"/>
         <source>Greek accents</source>
         <translation>希臘文變音符號</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="353"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="330"/>
         <source>Red letter words</source>
         <translation>紅字版本</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="355"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="332"/>
         <source>Textual variants</source>
         <translation>文字變體</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="357"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="334"/>
         <source>Scripture cross-references</source>
         <translation>經文�照</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cswordbackend.cpp" line="359"/>
+        <location filename="../../src/backend/managers/cswordbackend.cpp" line="336"/>
         <source>Morph segmentation</source>
         <translation>構詞學分割</translation>
     </message>
     <message>
-        <location filename="../../src/backend/rendering/chtmlexportrendering.cpp" line="240"/>
-        <source>Export</source>
-        <translation></translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="30"/>
         <source>Local</source>
         <translation>本機</translation>
     </message>
     <message>
         <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="31"/>
-        <source>Remote</source>
-        <translation>�端</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="417"/>
-        <source>Old testament</source>
-        <translation>舊約</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="418"/>
-        <source>Moses/Pentateuch/Torah</source>
-        <translation>摩西五經/律法書</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="419"/>
-        <source>History</source>
-        <translation>歷�書</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="420"/>
-        <source>Prophets</source>
-        <translation>先知書</translation>
-    </message>
-    <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="421"/>
-        <source>New testament</source>
-        <translation>æ–°ç´„</translation>
+        <source>Remote FTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="422"/>
-        <source>Gospels</source>
-        <translation>四�音書</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="32"/>
+        <source>Remote SFTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="423"/>
-        <source>Letters/Epistles</source>
-        <translation>書信</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="33"/>
+        <source>Remote HTTP</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/config/cbtconfig.cpp" line="424"/>
-        <source>Paul&apos;s Epistles</source>
-        <translation>�羅書信</translation>
+        <location filename="../../src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp" line="34"/>
+        <source>Remote HTTPS</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
         <source>HTML files</source>
         <translation>HTML 檔案</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="437"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="441"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="137"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="434"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="438"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="123"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>All files</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="439"/>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="140"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="436"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="126"/>
         <source>Text files</source>
         <translation>文字檔案</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/cexportmanager.cpp" line="447"/>
+        <location filename="../../src/frontend/cexportmanager.cpp" line="444"/>
         <source>Save file</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/cdisplay.cpp" line="144"/>
+        <location filename="../../src/frontend/display/cdisplay.cpp" line="130"/>
         <source>Save document ...</source>
         <translation>儲存文件...</translation>
     </message>
     <message>
-        <source>Print keys</source>
-        <translation type="obsolete">列��</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="37"/>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="48"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
         <source>BibleTime bookmark files</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="125"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="127"/>
         <location filename="../../src/frontend/bookmarks/btbookmarkitem.cpp" line="142"/>
-        <location filename="../../src/frontend/profile/cprofile.cpp" line="24"/>
         <source>unknown</source>
         <translation>未知的</translation>
     </message>
     <message>
-        <source>Change description ...</source>
-        <translation type="obsolete">更改�述...</translation>
-    </message>
-    <message>
-        <source>Enter a new description for the chosen bookmark.</source>
-        <translation type="obsolete">請為已�書籤輸入新�述.</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="59"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="60"/>
         <source>New folder</source>
         <translation>新資料夾</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="35"/>
+        <location filename="../../src/util/tool.cpp" line="48"/>
         <source>The file already exists.</source>
         <translation>這個檔案已經存在.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="36"/>
+        <location filename="../../src/util/tool.cpp" line="49"/>
         <source>Do you want to overwrite it?</source>
         <translation>你是��覆蓋它?</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="55"/>
+        <location filename="../../src/util/tool.cpp" line="69"/>
+        <location filename="../../src/util/tool.cpp" line="75"/>
         <source>Error</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="57"/>
-        <source>The file couldn&apos;t be saved.</source>
-        <translation>�能儲存檔案.</translation>
-    </message>
-    <message>
-        <location filename="../../src/util/tool.cpp" line="58"/>
+        <location filename="../../src/util/tool.cpp" line="78"/>
         <source>Please check permissions etc.</source>
         <translation>請檢查權�等.</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="177"/>
+        <location filename="../../src/util/tool.cpp" line="197"/>
         <source>Take care, this work contains cult / questionable material!</source>
         <translation>�心, 此著作包�異端或�疑的內容!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="198"/>
+        <location filename="../../src/util/tool.cpp" line="218"/>
         <source>Version</source>
         <translation>版本</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="187"/>
+        <location filename="../../src/util/tool.cpp" line="207"/>
         <source>Encrypted - needs unlock key</source>
         <translation>加密�.- 需�解鎖密碼</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="211"/>
+        <location filename="../../src/util/tool.cpp" line="71"/>
+        <source>Error while writing to file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="72"/>
+        <source>Please check that enough disk space is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="77"/>
+        <source>The file couldn&apos;t be opened for saving.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/util/tool.cpp" line="231"/>
         <source>Double click for more information</source>
         <translation>連點兩下�得更多資訊</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="193"/>
+        <location filename="../../src/util/tool.cpp" line="213"/>
         <source>Updated version available!</source>
         <translation>有�更新的版本!</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="206"/>
+        <location filename="../../src/util/tool.cpp" line="226"/>
         <source>Installed version</source>
         <translation>已安�版本</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="294"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="273"/>
         <source>Haitian Creole</source>
         <extracomment>Language name ht</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
         <source>Kekchu00ed</source>
         <comment>kek</comment>
         <extracomment>Language name kek</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="378"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="357"/>
         <source>(Multiple languages)</source>
         <extracomment>Language name mul (meaning that the work has multiple languages)</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="380"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="359"/>
         <source>Mam, Central</source>
         <extracomment>Language name mvc</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="382"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
         <source>Mam, Todos Santos Cuchumatu00e1n</source>
         <extracomment>Language name mvj</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="384"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="363"/>
         <source>Mixe, Juquila</source>
         <extracomment>Language name mxq</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="386"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="365"/>
         <source>Mixtec, Jamiltepec</source>
         <extracomment>Language name mxt</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="388"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="367"/>
         <source>Burmese</source>
         <extracomment>Language name my</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="391"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="370"/>
         <source>Norwegian Bokmu00e5l</source>
         <extracomment>Language name nb</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="393"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="372"/>
         <source>Nahuatl, Michoacu00e1n</source>
         <extracomment>Language name ncl</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="428"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="407"/>
         <source>Potawatomi</source>
         <extracomment>Language name pot</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="489"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="468"/>
         <source>Klingon</source>
         <extracomment>Language name tlh</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="519"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="498"/>
         <source>Mixtec, Diuxi-Tilantongo</source>
         <extracomment>Language name xtd</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="523"/>
+        <location filename="../../src/backend/managers/clanguagemgr.cpp" line="502"/>
         <source>Yoryba</source>
         <extracomment>Language name yo</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/filters/osistohtml.cpp" line="408"/>
+        <location filename="../../src/backend/filters/osistohtml.cpp" line="407"/>
         <source>Verb tense changed</source>
         <translation>動詞時態變更�</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>Can&apos;t write file</source>
         <translation>無法寫入檔案</translation>
     </message>
     <message>
-        <location filename="../../src/backend/btinstallbackend.cpp" line="174"/>
+        <location filename="../../src/backend/btinstallbackend.cpp" line="181"/>
         <source>The Sword config file can&apos;t be written!</source>
         <translation>Sword設定檔無法寫入!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="38"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="39"/>
         <source>Export Bookmarks</source>
         <translation>匯出書籤</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="49"/>
+        <location filename="../../src/frontend/bookmarks/btbookmarkfolder.cpp" line="50"/>
         <source>Import bookmarks</source>
         <translation>匯入書籤</translation>
     </message>
     <message>
-        <location filename="../../src/util/tool.cpp" line="33"/>
+        <location filename="../../src/util/tool.cpp" line="46"/>
         <source>Overwrite File?</source>
         <translation>複寫檔案?</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="556"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="276"/>
         <source>Parsing Strong&apos;s Numbers</source>
         <translation>分� Strong 的編號</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="154"/>
         <source>This shortcut conflicts with the shortcut for the following actions:</source>
         <translation>該�徑與以下動作�徑��:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="166"/>
+        <location filename="../../src/frontend/settingsdialogs/cacceleratorsettings.cpp" line="159"/>
         <source>Do you want to clear the conflicting shortcuts and continue?</source>
         <translation>你�清除��的�徑並繼續?</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="27"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="23"/>
         <source>Indexed works</source>
         <translation>已建立索引書目</translation>
     </message>
     <message>
-        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="30"/>
+        <location filename="../../src/backend/bookshelfmodel/indexingitem.cpp" line="24"/>
         <source>Unindexed works</source>
         <translation>未建立索引書目</translation>
     </message>
@@ -4371,10 +4291,6 @@ Language name ppk</extracomment>
         <translation>�照&apos; --幫助以�得細節.</translation>
     </message>
     <message>
-        <source>open a clean session</source>
-        <translation type="obsolete">開啟一個�徑的工作階段</translation>
-    </message>
-    <message>
         <location filename="../../src/main.cpp" line="53"/>
         <source>Open the default Bible with the reference &lt;ref&gt;</source>
         <translation>以�考資料 &lt;ref&gt; 開啟�設�經</translation>
@@ -4385,30 +4301,22 @@ Language name ppk</extracomment>
         <translation>�知� Qt 工具組解�的命令列�數, 請�照 %1.</translation>
     </message>
     <message>
-        <source>All command-line arguments not recognized by BibleTime or Qt will be silently ignored.</source>
-        <translation type="obsolete">所有命令列�數無法被 BibleTime 辨識 或 Qt 將會被略�.</translation>
-    </message>
-    <message>
-        <source>Error: %1 expects an argument. See --help for details.</source>
-        <translation type="obsolete">錯誤: %1 需�接�一個�數. �照 --幫助 以�得細節.</translation>
-    </message>
-    <message>
         <location filename="../../src/main.cpp" line="111"/>
         <source>Error: Invalid command-line argument: %1</source>
         <translation>錯誤: 無效的命令列�數: %1</translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="48"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="57"/>
         <source>CSS base template not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="65"/>
+        <location filename="../../src/backend/managers/cdisplaytemplatemgr.cpp" line="74"/>
         <source>Default template &quot;%1&quot; not found!</source>
         <translation>�設模� &quot;%1&quot; 沒有找到!</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="108"/>
+        <location filename="../../src/frontend/displaywindow/bttextwindowheaderwidget.cpp" line="113"/>
         <source>Replace</source>
         <translation>�代</translation>
     </message>
@@ -4416,92 +4324,92 @@ Language name ppk</extracomment>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="50"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="58"/>
         <source>OK</source>
         <comment>Dialog Button</comment>
         <translation>好</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="51"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="59"/>
         <source>Open</source>
         <comment>Dialog Button</comment>
         <translation>é–‹å•Ÿ</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="52"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="60"/>
         <source>Save</source>
         <comment>Dialog Button</comment>
         <translation>儲存</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="53"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="61"/>
         <source>Cancel</source>
         <comment>Dialog Button</comment>
         <translation>�消</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="54"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="62"/>
         <source>Close</source>
         <comment>Dialog Button</comment>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="55"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="63"/>
         <source>Discard</source>
         <comment>Dialog Button</comment>
         <translation>�棄</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="56"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="64"/>
         <source>Apply</source>
         <comment>Dialog Button</comment>
         <translation>套用</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="57"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="65"/>
         <source>Reset</source>
         <comment>Dialog Button</comment>
         <translation>�設</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="58"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="66"/>
         <source>Restore defaults</source>
         <comment>Dialog Button</comment>
         <translation>回復�設值</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="59"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="67"/>
         <source>Help</source>
         <comment>Dialog Button</comment>
         <translation>幫助</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="60"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="68"/>
         <source>Save All</source>
         <comment>Dialog Button</comment>
         <translation>全部儲存</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="61"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="69"/>
         <source>Yes</source>
         <comment>Dialog Button</comment>
         <translation>是</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="62"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="70"/>
         <source>Yes to all</source>
         <comment>Dialog Button</comment>
         <translation>全部皆是</translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="63"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="71"/>
         <source>No</source>
         <comment>Dialog Button</comment>
         <translation>�
 </translation>
     </message>
     <message>
-        <location filename="../../src/util/dialogutil.cpp" line="64"/>
+        <location filename="../../src/frontend/messagedialog.cpp" line="72"/>
         <source>No to all</source>
         <comment>Dialog Button</comment>
         <translation>全部��</translation>
@@ -4510,102 +4418,102 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchOptionsArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="98"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="97"/>
         <source>Search for:</source>
         <translation>�索:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="104"/>
         <source>&amp;Search</source>
         <translation>�尋(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="106"/>
         <source>Start to search the text in the chosen works</source>
         <translation>開始在�定的書目中�尋字串</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="110"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="109"/>
         <source>Ch&amp;oose...</source>
         <translation>挑�(&amp;o)...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="112"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="111"/>
         <source>Choose works for the search</source>
         <translation>�擇��尋的書目</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="114"/>
         <source>S&amp;etup...</source>
         <translation>設定(&amp;e)...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="133"/>
         <source>All of the words (AND is added between the words)</source>
         <translation>所有文字(在詞和詞中間加入 AND)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="137"/>
         <source> (&lt;a href=&apos;syntax_help&apos;&gt;full syntax&lt;/a&gt;)</source>
         <translation> (&lt;a href=&apos;syntax_help&apos;&gt;全文&lt;/a&gt;)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="149"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="148"/>
         <source>Scope:</source>
         <translation>�塊:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="170"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="169"/>
         <source>The text you want to search for</source>
         <translation>你想��尋的文字</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="173"/>
         <source>Works:</source>
         <translation>書目:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="347"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="346"/>
         <source>No search scope</source>
         <translation>沒有�尋範�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="128"/>
         <source>All words</source>
         <translation>所有字詞</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="116"/>
         <source>Configure predefined scopes for search</source>
         <translation>為�尋設定�先定義的�塊</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="130"/>
         <source>Some words</source>
         <translation>部份字詞</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="131"/>
         <source>Free</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="134"/>
         <source>Some of the words (OR is added between the words)</source>
         <translation>一些字詞 (在詞與詞中間加入 OR)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="135"/>
         <source>Full lucene syntax</source>
         <translation>全 lucene 語法</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="139"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="138"/>
         <source>Click the link to get help for search syntax</source>
         <translation>點�連��得�尋語法的幫助</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="160"/>
+        <location filename="../../src/frontend/searchdialog/btsearchoptionsarea.cpp" line="159"/>
         <source>Choose the scope (books/chapters/verses to search in).&lt;br /&gt;Applicable for Bibles and commentaries.</source>
         <translation>�擇�塊. (��尋的書目/章節/行數). &lt;br /&gt;�用於 �經 和 評論.</translation>
     </message>
@@ -4613,17 +4521,17 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchResultArea</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="80"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="85"/>
         <source>Text of the selected search result item</source>
         <translation>�定的�尋�果的文字</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="83"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="88"/>
         <source>Select all</source>
         <translation>全�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="87"/>
+        <location filename="../../src/frontend/searchdialog/btsearchresultarea.cpp" line="92"/>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
@@ -4631,242 +4539,242 @@ Language name ppk</extracomment>
 <context>
     <name>Search::BtSearchSyntaxHelpDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="52"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="47"/>
         <source>Search Syntax Help</source>
         <translation>�尋語法幫助</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="94"/>
         <source>This help is mainly for &apos;Full syntax&apos; option. &apos;All words&apos; and &apos;Some words&apos; options have more limited syntax; &lt;a href=&apos;#wildcards&apos;&gt;wildcards&lt;/a&gt; and &lt;a href=&apos;#fields&apos;&gt;text fields&lt;/a&gt; are supported for them. Some other syntax features may give strange or wrong results with All words/Some words.</source>
         <translation>這個幫助主�用來說明&quot;全語法&quot;�項.所有字詞�部分字詞�項有比較�定的使用語法;有支�&lt;a href=&apos;#wildcards&apos;&gt;�用字元&lt;/a&gt;� &lt;a href=&apos;#fields&apos;&gt;文字�塊&lt;/a&gt;. 部分其他語法與所有字詞/部分字詞�併使用，則會查出奇怪或錯誤的�果.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="104"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="115"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="99"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
         <source>Which words to find</source>
         <translation>想找哪個字</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="106"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="101"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
         <source>Grouping and order</source>
         <translation>分組與排�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="108"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="159"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="103"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
         <source>Wildcards (partial words)</source>
         <translation>�用字元(部份字詞)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="110"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="182"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="105"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
         <source>Text fields (different parts of text)</source>
         <translation>文字�塊 (字的��部份)</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="213"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="107"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="208"/>
         <source>Other syntax features</source>
         <translation>其他語法特色</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="117"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="112"/>
         <source>Search terms are separated by spaces. &lt;strong&gt;AND&lt;/strong&gt; (all words), &lt;strong&gt;OR&lt;/strong&gt; (some words) and &lt;strong&gt;NOT&lt;/strong&gt; (not the following word) can be added between the words. If none is added explicitly OR is used automatically. &apos;&lt;strong&gt;+&lt;/strong&gt;word&apos; means the word must be in the results, &apos;&lt;strong&gt;-&lt;/strong&gt;word&apos; means it must not be in the results.</source>
         <comment>Do not translate &quot;AND&quot;, &quot;OR&quot; or &quot;NOT&quot;.</comment>
         <translation>�尋�項以空格分開. &lt;strong&gt;AND&lt;/strong&gt; (所有字)�&lt;strong&gt;OR&lt;/strong&gt; (一些字) � &lt;strong&gt;NOT&lt;/strong&gt; (�包�其後的字) 能在字之間添加��尋.. 如果沒有添加任何�尋�項,自動會使用 OR. &apos;&lt;strong&gt;+&lt;/strong&gt;表示接在其後的字也需�在�尋�果內, &apos;&lt;strong&gt;-&lt;/strong&gt;表示接在其後的字�能在�果之內.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="124"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="119"/>
         <source>jesus AND god</source>
         <comment>Do not translate &quot;AND&quot;.</comment>
         <translation>耶穌 AND 神</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="126"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="121"/>
         <source>Finds verses with both &apos;Jesus&apos; and &apos;God&apos;</source>
         <translation>�尋具有&apos;耶穌&apos; 和神&apos; 的經文</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="123"/>
         <source>jesus OR god</source>
         <comment>Do not translate &quot;OR&quot;.</comment>
         <translation>耶穌 OR 神</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="130"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="125"/>
         <source>Finds verses with &apos;Jesus&apos; or &apos;God&apos; or both</source>
         <translation>�尋具有&apos;耶穌&apos; 或 &apos;神&apos; 或 兩者的經文</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="132"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="127"/>
         <source>jesus NOT god</source>
         <comment>Do not translate &quot;NOT&quot;.</comment>
         <translation>耶穌 NOT 神</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="134"/>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="133"/>
         <source>Finds verses with &apos;Jesus&apos; but with no &apos;God&apos;</source>
         <translation>�尋有寫到&apos;耶穌&apos;�沒有寫到&apos;神&apos;的經文</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="136"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="131"/>
         <source>+jesus -god</source>
         <translation>+耶穌 -神</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="138"/>
         <source>Words can be grouped with &lt;strong&gt;parenthesis&lt;/strong&gt;. Strict word order can be defined with &lt;strong&gt;quotes&lt;/strong&gt;.</source>
         <translation>��併��一組�尋�以使用&lt;strong&gt;括弧&lt;/strong&gt;. 若��定字的順�則�以使用 &lt;strong&gt;引號&lt;/strong&gt;.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="146"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="141"/>
         <source>(a AND b) OR c</source>
         <comment>Do not translate &quot;AND&quot; or &quot;OR&quot;.</comment>
         <translation>(a AND b) OR c</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="148"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="143"/>
         <source>Finds verses with both &apos;a&apos; AND &apos;b&apos;, and verses with &apos;c&apos;</source>
         <translation>(a AND b) OR c</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="150"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="145"/>
         <source>&quot;says lord&quot;</source>
         <translation>&quot;主說&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="154"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="149"/>
         <source>&quot;says the lord&quot;</source>
         <translation>&quot;主說&quot;</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="151"/>
         <source>Finds all verses with &apos;says the LORD&apos;</source>
         <translation>�尋所有有寫到&apos;主這麼說&apos;的經文</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="161"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="156"/>
         <source>&apos;&lt;strong&gt;*&lt;/strong&gt;&apos; matches any sequence of 0 or more characters, while &apos;&lt;strong&gt;?&lt;/strong&gt;&apos; matches any single character. A wildcard can not be used in the beginning of a word.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="165"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="160"/>
         <source>a*</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="167"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="162"/>
         <source>All words beginning with &apos;a&apos;</source>
         <translation>所有 &apos;a&apos;開頭的字</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="169"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="164"/>
         <source>a*a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="171"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="166"/>
         <source>&apos;Assyria&apos;, &apos;aroma&apos;, &apos;abba&apos; etc.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="173"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="168"/>
         <source>a?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="175"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="170"/>
         <source>&apos;at&apos; and &apos;an&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="177"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="172"/>
         <source>a??a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="174"/>
         <source>&apos;abba&apos;, &apos;area&apos;, &apos;Asia&apos; etc.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="184"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="179"/>
         <source>Available text fields:</source>
         <translation>�用的文字�塊:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="186"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="181"/>
         <source>Searches headings</source>
         <translation>�尋標題</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="188"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="183"/>
         <source>Searches footnotes</source>
         <translation>�尋註解</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="190"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="185"/>
         <source>Searches Strong&apos;s numbers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="192"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="187"/>
         <source>Searches morphology codes</source>
         <translation>�尋構詞編碼</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="189"/>
         <source>Examples:</source>
         <translation>例�:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="196"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="191"/>
         <source>heading:Jesus</source>
         <comment>Do not translate &quot;heading:&quot;.</comment>
         <translation>標題:耶穌</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="193"/>
         <source>Finds headings with &apos;Jesus&apos;</source>
         <translation>�尋有&apos;耶穌&apos;的標題</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="195"/>
         <source>footnote:Jesus AND footnote:said</source>
         <comment>Do not translate &quot;footnote:&quot; or &quot;AND&quot;.</comment>
         <translation>footnote:耶穌 AND footnote:說</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="203"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="198"/>
         <source>Finds footnotes with &apos;Jesus&apos; and &apos;said&apos;</source>
         <translation>�尋具有&apos;耶穌&apos; 和說&apos; 的註腳</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="205"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="200"/>
         <source>strong:G846</source>
         <comment>Do not translate &quot;strong:&quot;.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="207"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="202"/>
         <source>Finds verses with Strong&apos;s Greek number 846</source>
         <translation>�尋具有 Strong&apos;s Greek number 846的經文</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="209"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="204"/>
         <source>morph:&quot;N-NSF&quot;</source>
         <comment>Do not translate &quot;morph:&quot;.</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="211"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="206"/>
         <source>Finds verses with morphology code &apos;N-NSF&apos;</source>
         <translation>�尋具有 構詞編碼 &apos;N-NSF&apos;的經文</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="215"/>
+        <location filename="../../src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp" line="210"/>
         <source>BibleTime uses the CLucene search engine. You can read more on the &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; (in external browser).</source>
         <translation>BibleTime 使用 CLucene �尋引擎. 你�以到 &lt;a href=&apos;%1&apos;&gt;lucene syntax web page&lt;/a&gt; �得更多資訊。(用外部�覽器開啟).</translation>
     </message>
@@ -4912,31 +4820,19 @@ Language name ppk</extracomment>
         <translation>列�...</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">複製�尋�果...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="234"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="244"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="231"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="241"/>
         <source>Copying search result</source>
         <translation>正在複製�尋�果</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">儲存�尋�果...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="253"/>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="262"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="250"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="259"/>
         <source>Saving search result</source>
         <translation>正在儲存�尋�果</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">列��尋�果...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="271"/>
+        <location filename="../../src/frontend/searchdialog/cmoduleresultview.cpp" line="268"/>
         <source>Printing search result</source>
         <translation>正在列��尋�果</translation>
     </message>
@@ -4984,14 +4880,6 @@ Language name ppk</extracomment>
         <translation>新範�</translation>
     </message>
     <message>
-        <source>&lt;invalid name of search range&gt;</source>
-        <translation type="obsolete">&lt;無效的�尋範��稱&gt;</translation>
-    </message>
-    <message>
-        <source>Select a scope from the list to edit the search ranges</source>
-        <translation type="obsolete">從清單中�擇�塊來編輯�尋範�</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="140"/>
         <source>&amp;Add new scope</source>
         <translation>增加新�塊&amp;A</translation>
@@ -5017,10 +4905,6 @@ Language name ppk</extracomment>
         <translation>變更�定的�尋�塊的�字</translation>
     </message>
     <message>
-        <source>Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.</source>
-        <translation type="obsolete">更改已��尋項目的範�. 查看已�先定義的�尋範�, 以了解�尋範�的組�.</translation>
-    </message>
-    <message>
         <location filename="../../src/frontend/searchdialog/crangechooserdialog.cpp" line="158"/>
         <source>The search ranges which will be used for the search, parsed to the canonical form</source>
         <translation>用以�尋的�索範�,  分��標注形�</translation>
@@ -5034,42 +4918,42 @@ Language name ppk</extracomment>
 <context>
     <name>Search::CSearchDialog</name>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="127"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="130"/>
         <source>Missing indices</source>
         <translation>��的索引</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="84"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="87"/>
         <source>Search</source>
         <translation>�尋</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="128"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="131"/>
         <source>The following modules need to be indexed before they can be searched in:</source>
         <translation>以下模組在能被�索以�需�建立索引:</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="129"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="132"/>
         <source>Indexing could take a long time. Click &quot;Yes&quot; to index the modules and start the search, or &quot;No&quot; to cancel the search.</source>
         <translation>建立索引會花一段時間. 點�&quot;是&quot;建立模組索引並且開始�索, 或&quot;�&quot;�消�索.</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="234"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="236"/>
         <source>Drag any verse reference onto an open Bible window</source>
         <translation>拖曳任何章節索引到開啟中的�經視窗</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="239"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="241"/>
         <source>&amp;Analyze results...</source>
         <translation>分��果&amp;A...</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="240"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="242"/>
         <source>Show a graphical analysis of the search result</source>
         <translation>顯示�尋�果的圖形化分�報告</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="246"/>
+        <location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="248"/>
         <source>&amp;Close</source>
         <translation>關閉&amp;C</translation>
     </message>
@@ -5110,31 +4994,19 @@ Language name ppk</extracomment>
         <translation>列�...</translation>
     </message>
     <message>
-        <source>Print search result...</source>
-        <translation type="obsolete">列��尋�果...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="166"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="164"/>
         <source>Printing search result</source>
         <translation>正在列��尋�果</translation>
     </message>
     <message>
-        <source>Save search result...</source>
-        <translation type="obsolete">儲存�尋�果...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="176"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="194"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="174"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="192"/>
         <source>Saving search result</source>
         <translation>正在儲存�尋�果</translation>
     </message>
     <message>
-        <source>Copy search result...</source>
-        <translation type="obsolete">複製�尋�果...</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="212"/>
-        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="230"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="210"/>
+        <location filename="../../src/frontend/searchdialog/csearchresultview.cpp" line="228"/>
         <source>Copying search result</source>
         <translation>正在複製�尋�果</translation>
     </message>
@@ -5145,197 +5017,91 @@ Language name ppk</extracomment>
     </message>
 </context>
 <context>
-    <name>StandardWorksTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="204"/>
-        <source>Standard works are used when no particular work is specified, for example when a hyperlink into a Bible or lexicon was clicked.</source>
-        <translation>沒有�定特定書目時將顯示標準書目，例如連�到�經或辭典的超連�被點�時。</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="207"/>
-        <source>Bible:</source>
-        <translation>�經:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="208"/>
-        <source>The standard Bible is used when a hyperlink into a Bible is clicked</source>
-        <translation>將顯示標準�經，當點�連�到�經的超連�時</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="210"/>
-        <source>Commentary:</source>
-        <translation>è©•è«–:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="211"/>
-        <source>The standard commentary is used when a hyperlink into a commentary is clicked</source>
-        <translation>將顯示標準評論，當點�連�到評論的超連�時</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="213"/>
-        <source>Lexicon:</source>
-        <translation>è©žå½™:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="214"/>
-        <source>The standard lexicon is used when a hyperlink into a lexicon is clicked</source>
-        <translation>將顯示標準辭典，當點�連�到辭典的超連�時</translation>
-    </message>
+    <name>btm::InstallProgress</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="216"/>
-        <source>Daily devotional:</source>
-        <translation>�日�修:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="217"/>
-        <source>The standard devotional will be used to display a short start up devotional</source>
-        <translation>標準�修將用來作為啟動顯示的簡短�修內容</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="219"/>
-        <source>Hebrew Strong&apos;s lexicon:</source>
-        <translation>希伯來文的強調詞彙:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="220"/>
-        <source>The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked</source>
-        <translation>將顯示標準希伯來文辭典，當點�連�到希伯來文辭典的超連�時</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="222"/>
-        <source>Greek Strong&apos;s lexicon:</source>
-        <translation>希臘文的強調詞彙:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="223"/>
-        <source>The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked</source>
-        <translation>將顯示希臘文字典，當點�連�到希臘文字典的超連�時</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="225"/>
-        <source>Hebrew morphological lexicon:</source>
-        <translation>希伯來文構詞字彙:</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="226"/>
-        <source>The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked</source>
-        <translation>將顯示希臘文字的標準構詞字典，當希臘文文本中的構詞學標籤超連�被點�時</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="81"/>
+        <source>Failed</source>
+        <translation type="unfinished">失敗</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="228"/>
-        <source>Greek morphological lexicon:</source>
-        <translation>希臘文構詞學詞彙:</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="84"/>
+        <source>Completed</source>
+        <translation type="unfinished">完�</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="229"/>
-        <source>The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked</source>
-        <translation>將顯示希臘文文本的標準構詞學詞彙，當希臘文文本中的構詞學標籤超連�被點�</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installprogress.cpp" line="90"/>
+        <source>Cancelled</source>
+        <translation type="unfinished">已經�消</translation>
     </message>
 </context>
 <context>
-    <name>TextFiltersTab</name>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="291"/>
-        <source>Insert line break after each verse</source>
-        <translation type="unfinished">�節後�入�行符</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="292"/>
-        <source>Show verse numbers</source>
-        <translation type="unfinished">顯示節數</translation>
-    </message>
+    <name>btm::InstallSources</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="293"/>
-        <source>Show section headings</source>
-        <translation type="unfinished">顯示標題</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="294"/>
-        <source>Show scripture cross-references</source>
-        <translation type="unfinished">顯示�照經文</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="295"/>
-        <source>Show Greek accents</source>
-        <translation type="unfinished">顯示希臘文變音符號</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="296"/>
-        <source>Show Hebrew vowel points</source>
-        <translation type="unfinished">顯示希伯來文元音符號</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="297"/>
-        <source>Show Hebrew cantillation marks</source>
-        <translation type="unfinished">顯示希伯來文詠誦標記</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="298"/>
-        <source>Show morph segmentation</source>
-        <translation type="unfinished">顯示構詞學分割</translation>
-    </message>
-    <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="299"/>
-        <source>Use textual variants</source>
-        <translation type="unfinished">使用文字變體</translation>
+        <location filename="../../src/mobile/bookshelfmanager/installsources.cpp" line="63"/>
+        <source>Failed to refresh source %1</source>
+        <translation type="unfinished">無法刷新來�%1</translation>
     </message>
+</context>
+<context>
+    <name>findWidget</name>
     <message>
-        <location filename="../../src/frontend/settingsdialogs/cswordsettings.cpp" line="287"/>
-        <source>Filters control the appearance of text. Here you can specify default settings for all filters. You can override these settings in each display window.</source>
-        <translation type="unfinished">�濾器控制文本的呈�. 這裡你能夠調整所有�濾器的�設值. 你�以在個別顯示視窗中�行調整這些設定.</translation>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="59"/>
+        <location filename="../../src/frontend/display/btfindwidget.cpp" line="62"/>
+        <source>The text you want to search for</source>
+        <translation type="unfinished">你想��尋的文字</translation>
     </message>
 </context>
 <context>
-    <name>findTextDialog</name>
+    <name>main</name>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="13"/>
-        <source>Find Text</source>
-        <translation>找尋文字</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="135"/>
+        <source>New Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="41"/>
-        <source>The text you want to search for</source>
-        <translation>你想��尋的文字</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="136"/>
+        <source>View Window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="51"/>
-        <source>Search with case sensitivity</source>
-        <translation>�分大�寫來�尋</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="137"/>
+        <source>Text Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="54"/>
-        <source>Case &amp;sensitive</source>
-        <translation>�分大�寫&amp;s</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="138"/>
+        <source>User Interface Font Size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="92"/>
-        <source>Find the previous location of the text</source>
-        <translation>找尋出�該文字的上一個�置</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="141"/>
+        <source>Bookshelf Manager</source>
+        <translation type="unfinished">書架管�員</translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="95"/>
-        <source>&amp;Previous</source>
-        <translation>�一個&amp;P</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="187"/>
+        <source>Single</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="102"/>
-        <source>Find the next location of the text</source>
-        <translation>找尋出�該文字的下一個�置</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="188"/>
+        <source>Tabbed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="105"/>
-        <source>&amp;Next</source>
-        <translation>下一個&amp;N</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="189"/>
+        <source>Auto-tile</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="115"/>
-        <source>Close the dialog</source>
-        <translation>關閉訊�</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="190"/>
+        <source>Auto-tile horizontally</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/frontend/display/bthtmlfindtext.ui" line="118"/>
-        <source>&amp;Close</source>
-        <translation>關閉關閉&amp;C</translation>
+        <location filename="../../src/mobile/qml/main.qml" line="191"/>
+        <source>Auto-tile vertically</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/src/backend/bookshelfmodel/btbookshelffiltermodel.cpp b/src/backend/bookshelfmodel/btbookshelffiltermodel.cpp
index 182d337..320d693 100644
--- a/src/backend/bookshelfmodel/btbookshelffiltermodel.cpp
+++ b/src/backend/bookshelfmodel/btbookshelffiltermodel.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -15,25 +15,26 @@
 #include "backend/bookshelfmodel/btbookshelfmodel.h"
 
 
-BtBookshelfFilterModel::BtBookshelfFilterModel(QObject *parent)
-    : QSortFilterProxyModel(parent), m_enabled(true),
-      m_nameFilterRole(BtBookshelfModel::ModuleNameRole), m_nameFilterColumn(0),
-      m_nameFilterCase(Qt::CaseInsensitive),
-      m_hiddenFilterRole(BtBookshelfModel::ModuleHiddenRole),
-      m_hiddenFilterColumn(0), m_showHidden(false), m_showShown(true),
-      m_categoryFilter(CSwordModuleInfo::AllCategories),
-      m_categoryFilterRole(BtBookshelfModel::ModuleCategoryRole),
-      m_categoryFilterColumn(0)
+BtBookshelfFilterModel::BtBookshelfFilterModel(QObject * parent)
+    : QSortFilterProxyModel(parent)
+    , m_enabled(true)
+    , m_nameFilterRole(BtBookshelfModel::ModuleNameRole)
+    , m_nameFilterColumn(0)
+    , m_nameFilterCase(Qt::CaseInsensitive)
+    , m_hiddenFilterRole(BtBookshelfModel::ModuleHiddenRole)
+    , m_hiddenFilterColumn(0)
+    , m_showHidden(false)
+    , m_showShown(true)
+    , m_categoryFilter(CSwordModuleInfo::AllCategories)
+    , m_categoryFilterRole(BtBookshelfModel::ModuleCategoryRole)
+    , m_categoryFilterColumn(0)
 {
     setDynamicSortFilter(true);
 }
 
-BtBookshelfFilterModel::~BtBookshelfFilterModel() {
-    // Intentionally empty
-}
-
 void BtBookshelfFilterModel::setEnabled(bool enable) {
-    if (enable == m_enabled) return;
+    if (enable == m_enabled)
+        return;
     m_enabled = enable;
     invalidateFilter();
 }
@@ -41,25 +42,29 @@ void BtBookshelfFilterModel::setEnabled(bool enable) {
 // Name filter:
 
 void BtBookshelfFilterModel::setNameFilterRole(int role) {
-    if (m_nameFilterRole == role) return;
+    if (m_nameFilterRole == role)
+        return;
     m_nameFilterRole = role;
     invalidateFilter();
 }
 
 void BtBookshelfFilterModel::setNameFilterKeyColumn(int column) {
-    if (m_nameFilterColumn == column) return;
+    if (m_nameFilterColumn == column)
+        return;
     m_nameFilterColumn = column;
     invalidateFilter();
 }
 
 void BtBookshelfFilterModel::setNameFilterFixedString(const QString &filter) {
-    if (m_nameFilter == filter) return;
+    if (m_nameFilter == filter)
+        return;
     m_nameFilter = filter;
     invalidateFilter();
 }
 
 void BtBookshelfFilterModel::setNameFilterCase(Qt::CaseSensitivity value) {
-    if (m_nameFilterCase == value) return;
+    if (m_nameFilterCase == value)
+        return;
     m_nameFilterCase = value;
     invalidateFilter();
 }
@@ -67,25 +72,29 @@ void BtBookshelfFilterModel::setNameFilterCase(Qt::CaseSensitivity value) {
 // Hidden filter:
 
 void BtBookshelfFilterModel::setHiddenFilterRole(int role) {
-    if (m_hiddenFilterRole == role) return;
+    if (m_hiddenFilterRole == role)
+        return;
     m_hiddenFilterRole = role;
     invalidateFilter();
 }
 
 void BtBookshelfFilterModel::setHiddenFilterKeyColumn(int column) {
-    if (m_hiddenFilterColumn == column) return;
+    if (m_hiddenFilterColumn == column)
+        return;
     m_hiddenFilterColumn = column;
     invalidateFilter();
 }
 
 void BtBookshelfFilterModel::setShowHidden(bool show) {
-    if (m_showHidden == show) return;
+    if (m_showHidden == show)
+        return;
     m_showHidden = show;
     invalidateFilter();
 }
 
 void BtBookshelfFilterModel::setShowShown(bool show) {
-    if (m_showShown == show) return;
+    if (m_showShown == show)
+        return;
     m_showShown = show;
     invalidateFilter();
 }
@@ -93,21 +102,24 @@ void BtBookshelfFilterModel::setShowShown(bool show) {
 // Category filter:
 
 void BtBookshelfFilterModel::setCategoryFilterRole(int role) {
-    if (m_categoryFilterRole == role) return;
+    if (m_categoryFilterRole == role)
+        return;
     m_categoryFilterRole = role;
     invalidateFilter();
 }
 
 void BtBookshelfFilterModel::setCategoryFilterKeyColumn(int column) {
-    if (m_categoryFilterColumn == column) return;
+    if (m_categoryFilterColumn == column)
+        return;
     m_categoryFilterColumn = column;
     invalidateFilter();
 }
 
 void BtBookshelfFilterModel::setShownCategories(
-        const CSwordModuleInfo::Categories &categories)
+        const CSwordModuleInfo::Categories & categories)
 {
-    if (m_categoryFilter == categories) return;
+    if (m_categoryFilter == categories)
+        return;
     m_categoryFilter = categories;
     invalidateFilter();
 }
@@ -115,20 +127,27 @@ void BtBookshelfFilterModel::setShownCategories(
 // Filtering:
 
 bool BtBookshelfFilterModel::filterAcceptsRow(int row,
-        const QModelIndex &parent) const
+                                              const QModelIndex & parent) const
 {
-    if (!m_enabled) return true;
+    if (!m_enabled)
+        return true;
 
-    if (!hiddenFilterAcceptsRow(row, parent)) return false;
-    if (!nameFilterAcceptsRow(row, parent)) return false;
-    if (!categoryFilterAcceptsRow(row, parent)) return false;
+    if (!hiddenFilterAcceptsRow(row, parent))
+        return false;
+    if (!nameFilterAcceptsRow(row, parent))
+        return false;
+    if (!categoryFilterAcceptsRow(row, parent))
+        return false;
     return true;
 }
 
-bool BtBookshelfFilterModel::nameFilterAcceptsRow(int row, const QModelIndex &parent) const {
-    if (m_nameFilter.isEmpty()) return true;
+bool BtBookshelfFilterModel::nameFilterAcceptsRow(int row,
+                                                  const QModelIndex & parent) const
+{
+    if (m_nameFilter.isEmpty())
+        return true;
 
-    const QAbstractItemModel *m(sourceModel());
+    const QAbstractItemModel * const m = sourceModel();
     Q_ASSERT(m != 0);
 
     QModelIndex itemIndex(m->index(row, m_nameFilterColumn, parent));
@@ -137,59 +156,54 @@ bool BtBookshelfFilterModel::nameFilterAcceptsRow(int row, const QModelIndex &pa
         QVariant data(m->data(itemIndex, m_nameFilterRole));
         return data.toString().contains(m_nameFilter, m_nameFilterCase);
     }
-    else {
-        for (int i(0); i < numChildren; i++) {
-            if (filterAcceptsRow(i, itemIndex)) return true;
-        }
-        return false;
-    }
+
+    for (int i = 0; i < numChildren; i++)
+        if (filterAcceptsRow(i, itemIndex))
+            return true;
+    return false;
 }
 
-bool BtBookshelfFilterModel::hiddenFilterAcceptsRow(int row, const QModelIndex &parent) const
+bool BtBookshelfFilterModel::hiddenFilterAcceptsRow(int row,
+                                                    const QModelIndex & parent) const
 {
-    if (m_showHidden && m_showShown) return true;
+    if (m_showHidden && m_showShown)
+        return true;
 
-    typedef Qt::CheckState CS;
-
-    QAbstractItemModel *m(sourceModel());
+    const QAbstractItemModel * const m = sourceModel();
     Q_ASSERT(m != 0);
 
-    QModelIndex itemIndex(m->index(row, m_hiddenFilterColumn, parent));
-    int numChildren(m->rowCount(itemIndex));
+    const QModelIndex itemIndex = m->index(row, m_hiddenFilterColumn, parent);
+    const int numChildren = m->rowCount(itemIndex);
     if (numChildren == 0) {
-        if ((CS) m->data(itemIndex, m_hiddenFilterRole).toBool()) {
+        if (static_cast<Qt::CheckState>(m->data(itemIndex, m_hiddenFilterRole).toBool()))
             return m_showHidden;
-        }
-        else {
-            return m_showShown;
-        }
-    }
-    else {
-        for (int i(0); i < numChildren; i++) {
-            if (filterAcceptsRow(i, itemIndex)) return true;
-        }
-        return false;
+        return m_showShown;
     }
+
+    for (int i = 0; i < numChildren; i++)
+        if (filterAcceptsRow(i, itemIndex))
+            return true;
+    return false;
 }
 
 bool BtBookshelfFilterModel::categoryFilterAcceptsRow(int row,
-        const QModelIndex &parent) const
+                                                      const QModelIndex & parent) const
 {
-    if (m_categoryFilter == CSwordModuleInfo::AllCategories) return true;
+    if (m_categoryFilter == CSwordModuleInfo::AllCategories)
+        return true;
 
-    QAbstractItemModel *m(sourceModel());
+    const QAbstractItemModel * const m = sourceModel();
     Q_ASSERT(m != 0);
 
-    QModelIndex itemIndex(m->index(row, m_categoryFilterColumn, parent));
-    int numChildren(m->rowCount(itemIndex));
+    const QModelIndex itemIndex(m->index(row, m_categoryFilterColumn, parent));
+    const int numChildren(m->rowCount(itemIndex));
     if (numChildren == 0) {
-        int cat = m->data(itemIndex, m_categoryFilterRole).toInt();
-        return m_categoryFilter.testFlag((CSwordModuleInfo::Category) cat);
-    }
-    else {
-        for (int i(0); i < numChildren; i++) {
-            if (filterAcceptsRow(i, itemIndex)) return true;
-        }
-        return false;
+        const int cat = m->data(itemIndex, m_categoryFilterRole).toInt();
+        return m_categoryFilter.testFlag(static_cast<CSwordModuleInfo::Category>(cat));
     }
+
+    for (int i = 0; i < numChildren; i++)
+        if (filterAcceptsRow(i, itemIndex))
+            return true;
+    return false;
 }
diff --git a/src/backend/bookshelfmodel/btbookshelffiltermodel.h b/src/backend/bookshelfmodel/btbookshelffiltermodel.h
index 55322ed..b1b22e6 100644
--- a/src/backend/bookshelfmodel/btbookshelffiltermodel.h
+++ b/src/backend/bookshelfmodel/btbookshelffiltermodel.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -19,109 +19,113 @@
 
 
 class BtBookshelfFilterModel: public QSortFilterProxyModel {
+
     Q_OBJECT
-    public:
-        BtBookshelfFilterModel(QObject *parent = 0);
-        virtual ~BtBookshelfFilterModel();
-
-        // Common methods:
-        inline bool enabled() const {
-            return m_enabled;
-        }
-
-        virtual bool filterAcceptsRow(int row, const QModelIndex &parent) const;
-
-        // Name filter:
-        inline int nameFilterRole() const {
-            return m_nameFilterRole;
-        }
-
-        inline int nameFilterKeyColumn() const {
-            return m_nameFilterColumn;
-        }
-
-        inline const QString &nameFilter() const {
-            return m_nameFilter;
-        }
-
-        inline const Qt::CaseSensitivity nameFilterCase() const {
-            return m_nameFilterCase;
-        }
-
-        // Hidden filter:
-        int hiddenFilterRole() const {
-            return m_hiddenFilterRole;
-        }
-
-        int hiddenFilterKeyColumn() const {
-            return m_hiddenFilterColumn;
-        }
-
-        inline bool showHidden() const {
-            return m_showHidden;
-        }
-
-        inline bool showShown() const {
-            return m_showShown;
-        }
-
-        // Category filter:
-        int categoryFilterRole() const {
-            return m_categoryFilterRole;
-        }
-
-        int categoryFilterKeyColumn() const {
-            return m_categoryFilterColumn;
-        }
-
-        inline CSwordModuleInfo::Categories shownCategories() const {
-            return m_categoryFilter;
-        }
-
-    public slots:
-        void setEnabled(bool enable);
-
-        // Name filter:
-        void setNameFilterRole(int role);
-        void setNameFilterKeyColumn(int column);
-        void setNameFilterFixedString(const QString &nameFilter);
-        void setNameFilterCase(Qt::CaseSensitivity value);
-
-        // Hidden filter:
-        void setHiddenFilterRole(int role);
-        void setHiddenFilterKeyColumn(int column);
-        void setShowHidden(bool show);
-        void setShowShown(bool show);
-
-        // Category filter:
-        void setCategoryFilterRole(int role);
-        void setCategoryFilterKeyColumn(int column);
-        void setShownCategories(const CSwordModuleInfo::Categories &categories);
-
-    protected:
-        bool nameFilterAcceptsRow(int row, const QModelIndex &parent) const;
-        bool hiddenFilterAcceptsRow(int row, const QModelIndex &parent) const;
-        bool categoryFilterAcceptsRow(int row, const QModelIndex &parent) const;
-
-    protected:
-        bool m_enabled;
-
-        // Name filter:
-        QString m_nameFilter;
-        int m_nameFilterRole;
-        int m_nameFilterColumn;
-        Qt::CaseSensitivity  m_nameFilterCase;
-
-        // Hidden filter:
-        int m_hiddenFilterRole;
-        int m_hiddenFilterColumn;
-        bool m_showHidden;
-        bool m_showShown;
-
-        // Categories filter:
-        CSwordModuleInfo::Categories m_categoryFilter;
-        int m_categoryFilterRole;
-        int m_categoryFilterColumn;
+
+public: /* Methods: */
+
+    BtBookshelfFilterModel(QObject * parent = 0);
+
+    inline bool enabled() const {
+        return m_enabled;
+    }
+
+    virtual bool filterAcceptsRow(int row, const QModelIndex & parent) const;
+
+    // Name filter:
+    inline int nameFilterRole() const {
+        return m_nameFilterRole;
+    }
+
+    inline int nameFilterKeyColumn() const {
+        return m_nameFilterColumn;
+    }
+
+    inline const QString &nameFilter() const {
+        return m_nameFilter;
+    }
+
+    inline Qt::CaseSensitivity nameFilterCase() const {
+        return m_nameFilterCase;
+    }
+
+    // Hidden filter:
+    int hiddenFilterRole() const {
+        return m_hiddenFilterRole;
+    }
+
+    int hiddenFilterKeyColumn() const {
+        return m_hiddenFilterColumn;
+    }
+
+    inline bool showHidden() const {
+        return m_showHidden;
+    }
+
+    inline bool showShown() const {
+        return m_showShown;
+    }
+
+    // Category filter:
+    int categoryFilterRole() const {
+        return m_categoryFilterRole;
+    }
+
+    int categoryFilterKeyColumn() const {
+        return m_categoryFilterColumn;
+    }
+
+    inline CSwordModuleInfo::Categories shownCategories() const {
+        return m_categoryFilter;
+    }
+
+public slots:
+    void setEnabled(bool enable);
+
+    // Name filter:
+    void setNameFilterRole(int role);
+    void setNameFilterKeyColumn(int column);
+    void setNameFilterFixedString(const QString & nameFilter);
+    void setNameFilterCase(Qt::CaseSensitivity value);
+
+    // Hidden filter:
+    void setHiddenFilterRole(int role);
+    void setHiddenFilterKeyColumn(int column);
+    void setShowHidden(bool show);
+    void setShowShown(bool show);
+
+    // Category filter:
+    void setCategoryFilterRole(int role);
+    void setCategoryFilterKeyColumn(int column);
+    void setShownCategories(const CSwordModuleInfo::Categories & categories);
+
+private: /* Methods: */
+
+    bool nameFilterAcceptsRow(int row, const QModelIndex & parent) const;
+    bool hiddenFilterAcceptsRow(int row, const QModelIndex & parent) const;
+    bool categoryFilterAcceptsRow(int row, const QModelIndex & parent) const;
+
+private: /* Fields: */
+
+    bool m_enabled;
+
+    // Name filter:
+    QString m_nameFilter;
+    int m_nameFilterRole;
+    int m_nameFilterColumn;
+    Qt::CaseSensitivity  m_nameFilterCase;
+
+    // Hidden filter:
+    int m_hiddenFilterRole;
+    int m_hiddenFilterColumn;
+    bool m_showHidden;
+    bool m_showShown;
+
+    // Categories filter:
+    CSwordModuleInfo::Categories m_categoryFilter;
+    int m_categoryFilterRole;
+    int m_categoryFilterColumn;
+
 };
 
 #endif // BTBOOKSHELFFILTERMODEL_H
diff --git a/src/backend/bookshelfmodel/btbookshelfmodel.cpp b/src/backend/bookshelfmodel/btbookshelfmodel.cpp
index 322b22a..c19e429 100644
--- a/src/backend/bookshelfmodel/btbookshelfmodel.cpp
+++ b/src/backend/bookshelfmodel/btbookshelfmodel.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -17,29 +17,22 @@
 #include "util/macros.h"
 
 
-BtBookshelfModel::BtBookshelfModel(QObject *parent)
-        : QAbstractListModel(parent) {
-    // Intentionally empty
-}
-
-BtBookshelfModel::~BtBookshelfModel() {
-    // Intentionally empty
-}
-
-int BtBookshelfModel::rowCount(const QModelIndex &parent) const {
-    if (parent.isValid()) return 0;
+int BtBookshelfModel::rowCount(const QModelIndex & parent) const {
+    if (parent.isValid())
+        return 0;
 
     return m_data.size();
 }
 
-QVariant BtBookshelfModel::data(CSwordModuleInfo *module, int role) const {
+QVariant BtBookshelfModel::data(CSwordModuleInfo * module, int role) const {
+    Q_ASSERT(module);
     switch (role) {
         case ModuleNameRole: // Qt::DisplayRole
             return module->name();
         case ModuleIconRole: // Qt::DecorationRole
-            return CSwordModuleInfo::moduleIcon(module);
+            return CSwordModuleInfo::moduleIcon(*module);
         case ModulePointerRole:
-            return qVariantFromValue((void*) module);
+            return qVariantFromValue(static_cast<void *>(module));
         case ModuleCategoryRole:
             return QVariant::fromValue(module->category());
         case ModuleLanguageRole:
@@ -64,30 +57,40 @@ QVariant BtBookshelfModel::data(CSwordModuleInfo *module, int role) const {
 }
 
 QVariant BtBookshelfModel::data(const QModelIndex &index, int role) const {
-    if (!index.isValid() || index.column() != 0 || index.parent().isValid()) {
+    if (!index.isValid() || index.column() != 0 || index.parent().isValid())
+        return QVariant();
+
+    int row = index.row();
+    if (row >= m_data.size())
         return QVariant();
-    }
-    int row(index.row());
-    if (row >= m_data.size()) return QVariant();
 
     return data(m_data.at(row), role);
 }
 
-QVariant BtBookshelfModel::headerData(int section, Qt::Orientation orientation,
-                                      int role) const {
-    if (role == Qt::DisplayRole && orientation == Qt::Horizontal &&
-            section == 0) {
+QVariant BtBookshelfModel::headerData(int section,
+                                      Qt::Orientation orientation,
+                                      int role) const
+{
+    if (role == Qt::DisplayRole
+       && orientation == Qt::Horizontal
+       && section == 0)
+    {
         return tr("Module");
     }
 
     return QVariant();
 }
 
-bool BtBookshelfModel::setData(const QModelIndex &index, const QVariant &value,
-                               int role) {
-    int row(index.row());
-    if (role == ModuleHiddenRole && row >= 0 && row < m_data.size()
-            && index.column() == 0) {
+bool BtBookshelfModel::setData(const QModelIndex & index,
+                               const QVariant & value,
+                               int role)
+{
+    int row = index.row();
+    if (role == ModuleHiddenRole
+        && row >= 0
+        && row < m_data.size()
+        && index.column() == 0)
+    {
         /*
           Emitting dataChanged here is actually mandatory, but were not doing it
           directly. Since we're connected to the module, changing its hidden
@@ -100,12 +103,12 @@ bool BtBookshelfModel::setData(const QModelIndex &index, const QVariant &value,
 }
 
 void BtBookshelfModel::clear(bool destroy) {
-    if (m_data.size() <= 0) return;
+    if (m_data.size() <= 0)
+        return;
 
     beginRemoveRows(QModelIndex(), 0, m_data.size() - 1);
-    if (destroy) {
+    if (destroy)
         qDeleteAll(m_data);
-    }
     m_data.clear();
     endRemoveRows();
 }
@@ -113,7 +116,8 @@ void BtBookshelfModel::clear(bool destroy) {
 void BtBookshelfModel::addModule(CSwordModuleInfo * const module) {
     Q_ASSERT(module != 0);
 
-    if (m_data.contains(module)) return;
+    if (m_data.contains(module))
+        return;
 
     const int index(m_data.size());
     beginInsertRows(QModelIndex(), index, index);
@@ -127,23 +131,23 @@ void BtBookshelfModel::addModule(CSwordModuleInfo * const module) {
     endInsertRows();
 }
 
-void BtBookshelfModel::addModules(const QList<CSwordModuleInfo *> &modules) {
+void BtBookshelfModel::addModules(const QList<CSwordModuleInfo *> & modules) {
     addModules(modules.toSet());
 }
 
-void BtBookshelfModel::addModules(const QSet<CSwordModuleInfo *> &modules) {
+void BtBookshelfModel::addModules(const QSet<CSwordModuleInfo *> & modules) {
     QList<CSwordModuleInfo *> newModules;
-    Q_FOREACH(CSwordModuleInfo *module, modules) {
-        if (!m_data.contains(module)) {
+    Q_FOREACH (CSwordModuleInfo * module, modules)
+        if (!m_data.contains(module))
             newModules.append(module);
-        }
-    }
 
-    if (newModules.isEmpty()) return;
+    if (newModules.isEmpty())
+        return;
 
-    beginInsertRows(QModelIndex(), m_data.size(),
+    beginInsertRows(QModelIndex(),
+                    m_data.size(),
                     m_data.size() + newModules.size() - 1);
-    Q_FOREACH(CSwordModuleInfo *module, newModules) {
+    Q_FOREACH (CSwordModuleInfo * module, newModules) {
         m_data.append(module);
         connect(module, SIGNAL(hiddenChanged(bool)),
                 this, SLOT(moduleHidden(bool)));
@@ -157,8 +161,9 @@ void BtBookshelfModel::addModules(const QSet<CSwordModuleInfo *> &modules) {
 
 void BtBookshelfModel::removeModule(CSwordModuleInfo * const module,
                                     bool destroy) {
-    const int index(m_data.indexOf(module));
-    if (index == -1) return;
+    const int index = m_data.indexOf(module);
+    if (index == -1)
+        return;
 
     beginRemoveRows(QModelIndex(), index, index);
     disconnect(module, SIGNAL(hiddenChanged(bool)),
@@ -169,48 +174,51 @@ void BtBookshelfModel::removeModule(CSwordModuleInfo * const module,
                this,   SLOT(moduleUnlocked(bool)));
     m_data.removeAt(index);
     endRemoveRows();
-    if (destroy) delete module;
+    if (destroy)
+        delete module;
 }
 
-void BtBookshelfModel::removeModules(const QList<CSwordModuleInfo *> &modules,
-                                     bool destroy) {
+void BtBookshelfModel::removeModules(const QList<CSwordModuleInfo *> & modules,
+                                     bool destroy)
+{
     removeModules(modules.toSet(), destroy);
 }
 
-void BtBookshelfModel::removeModules(const QSet<CSwordModuleInfo *> &modules,
-                                     bool destroy) {
+void BtBookshelfModel::removeModules(const QSet<CSwordModuleInfo *> & modules,
+                                     bool destroy)
+{
     // This is inefficient, since signals are emitted for each removed module:
-    Q_FOREACH(CSwordModuleInfo *module, modules) {
+    Q_FOREACH (CSwordModuleInfo * module, modules)
         removeModule(module, destroy);
-    }
 }
 
-CSwordModuleInfo* BtBookshelfModel::getModule(const QString &name) const {
-    Q_FOREACH(CSwordModuleInfo *module, m_data) {
-        if (UNLIKELY(module->name() == name)) return module;
-    }
+CSwordModuleInfo * BtBookshelfModel::getModule(const QString & name) const {
+    Q_FOREACH (CSwordModuleInfo * module, m_data)
+        if (UNLIKELY(module->name() == name))
+            return module;
+
     return 0;
 }
 
 void BtBookshelfModel::moduleHidden(bool) {
-    Q_ASSERT(qobject_cast<CSwordModuleInfo*>(sender()) != 0);
+    Q_ASSERT(qobject_cast<CSwordModuleInfo *>(sender()) != 0);
 
-    moduleDataChanged(static_cast<CSwordModuleInfo*>(sender()));
+    moduleDataChanged(static_cast<CSwordModuleInfo *>(sender()));
 }
 
 void BtBookshelfModel::moduleIndexed(bool) {
-    Q_ASSERT(qobject_cast<CSwordModuleInfo*>(sender()) != 0);
+    Q_ASSERT(qobject_cast<CSwordModuleInfo *>(sender()) != 0);
 
-    moduleDataChanged(static_cast<CSwordModuleInfo*>(sender()));
+    moduleDataChanged(static_cast<CSwordModuleInfo *>(sender()));
 }
 
 void BtBookshelfModel::moduleUnlocked(bool) {
-    Q_ASSERT(qobject_cast<CSwordModuleInfo*>(sender()) != 0);
+    Q_ASSERT(qobject_cast<CSwordModuleInfo *>(sender()) != 0);
 
-    moduleDataChanged(static_cast<CSwordModuleInfo*>(sender()));
+    moduleDataChanged(static_cast<CSwordModuleInfo *>(sender()));
 }
 
-void BtBookshelfModel::moduleDataChanged(CSwordModuleInfo *module) {
+void BtBookshelfModel::moduleDataChanged(CSwordModuleInfo * module) {
     Q_ASSERT(m_data.count(module) == 1);
 
     QModelIndex i(index(m_data.indexOf(module), 0));
diff --git a/src/backend/bookshelfmodel/btbookshelfmodel.h b/src/backend/bookshelfmodel/btbookshelfmodel.h
index 20f2b3d..0884b4c 100644
--- a/src/backend/bookshelfmodel/btbookshelfmodel.h
+++ b/src/backend/bookshelfmodel/btbookshelfmodel.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -25,148 +25,157 @@
   BtBookshelfTreeModel might be a better choice, since it also provides sorting and grouping.
 */
 class BtBookshelfModel: public QAbstractListModel {
-        Q_OBJECT
-    public:
-        enum ModuleRole {
-            ModuleNameRole = Qt::DisplayRole,
-            ModuleIconRole = Qt::DecorationRole,
-            ModulePointerRole  = Qt::UserRole,
-            ModuleCategoryRole = Qt::UserRole + 1,
-            ModuleLanguageRole = Qt::UserRole + 2,
-            ModuleHiddenRole = Qt::UserRole + 3,
-            ModuleInstallPathRole = Qt::UserRole + 4,
-            ModuleHasIndexRole = Qt::UserRole + 5,
-            ModuleIndexSizeRole = Qt::UserRole + 6,
-            ModuleDescriptionRole = Qt::UserRole + 7,
-            UserRole = Qt::UserRole + 100
-        };
-
-    public:
-        BtBookshelfModel(QObject *parent = 0);
-        ~BtBookshelfModel();
-
-        // Virtual methods implemented from QAbstractListModel:
-        int rowCount(const QModelIndex &parent = QModelIndex()) const;
-        QVariant data(CSwordModuleInfo *module, int role) const;
-        QVariant data(const QModelIndex &index, int role) const;
-        QVariant headerData(int section, Qt::Orientation orientation,
-                                    int role = Qt::DisplayRole) const;
-        bool setData(const QModelIndex &index, const QVariant &value,
-                     int role = ModuleHiddenRole);
-
-        /**
-          Given an index of this model, this method returns a pointer to the underlying
-          CSwordModuleInfo instance corresponding to the given index.
-          \param[in] index An index to this model.
-        */
-        inline CSwordModuleInfo *module(const QModelIndex &index) const {
-            return (CSwordModuleInfo *)
-                   data(index, BtBookshelfModel::ModulePointerRole)
-                   .value<void *>();
-        }
-
-        /**
-          Clears the data of the whole model by removing all items.
-          \param[in] destroy If true, all CSwordModuleInfo instances in this model are also
-                             destroyed.
-        */
-        void clear(bool destroy = false);
-
-        /**
-          Appends the given module to this model.
-          \param[in] module Module to add.
-        */
-        void addModule(CSwordModuleInfo * const module);
-
-        /**
-          Appends the all the modules in the given set to this model.
-          \param[in] modules Set of modules to add.
-        */
-        void addModules(const QSet<CSwordModuleInfo *> &modules);
-
-        /**
-          Appends the all the modules in the given list to this model.
-          \param[in] modules Set of modules to add.
-        */
-        void addModules(const QList<CSwordModuleInfo *> &modules);
-
-        /**
-          Removes the given module from this model and optionally destroys it.
-          \param[in] module The module to remove from this model.
-          \param[in] destroy If true, the given CSwordModuleInfo instance is destroyed.
-        */
-        void removeModule(CSwordModuleInfo * const module,
-                          bool destroy = false);
-
-        /**
-          Removes all modules from the given set from this model and optionally destroys
-          them.
-          \param[in] modules The set of modules to remove from this model.
-          \param[in] destroy If true, the given CSwordModuleInfo instances are destroyed.
-        */
-        void removeModules(const QSet<CSwordModuleInfo *> &modules,
-                           bool destroy = false);
-
-        /**
-          Removes all modules from the given list from this model and optionally destroys
-          them.
-          \param[in] modules The list of modules to remove from this model.
-          \param[in] destroy If true, the given CSwordModuleInfo instances are destroyed.
-        */
-        void removeModules(const QList<CSwordModuleInfo *> &modules,
-                           bool destroy = false);
-
-        /**
-          Returns the first module found with the given name.
-          \param[in] name Name of the module to find.
-        */
-        CSwordModuleInfo* getModule(const QString &name) const;
-
-        /**
-          Returns the list of handled modules as a list of CSwordModuleInfo* pointers.
-        */
-        inline const QList<CSwordModuleInfo *> &moduleList() const {
-            return m_data;
-        }
-
-    protected slots:
-        /**
-          Slot DIRECTLY called by CSwordModuleInfo when the hidden status of the respective
-          module changes.
-          \param[in] hidden True, if the module was hidden; false, if the module was shown.
-        */
-        void moduleHidden(bool hidden);
-
-        /**
-          Slot DIRECTLY called by CSwordModuleInfo when the indexed status of the respective
-          module changes.
-          \param[in] indexed True, if the module was indexed; false if the index was deleted.
-        */
-        void moduleIndexed(bool indexed);
-
-        /**
-          Slot DIRECTLY called by CSwordModuleInfo when the locked status of the respective
-          module changes.
-          \param[in] unlocked True, if the module was unlocked; false if the module was
-                     locked.
-        */
-        void moduleUnlocked(bool unlocked);
-
-    protected:
-        /**
-          Called internally when module data changes. This method emits any neccessary
-          signals for this model.
-          \pre The givem module is handled by this model.
-          \param[in] module The module that changed status.
-        */
-        void moduleDataChanged(CSwordModuleInfo *module);
-
-    protected:
-        /**
-          The underlying data as a list of pointers to the respective CSwordModuleInfo
-          instances.
-        */
-        QList<CSwordModuleInfo *> m_data;
+
+    Q_OBJECT
+
+public: /* Types: */
+
+    enum ModuleRole {
+        ModuleNameRole = Qt::DisplayRole,
+        ModuleIconRole = Qt::DecorationRole,
+        ModulePointerRole  = Qt::UserRole,
+        ModuleCategoryRole = Qt::UserRole + 1,
+        ModuleLanguageRole = Qt::UserRole + 2,
+        ModuleHiddenRole = Qt::UserRole + 3,
+        ModuleInstallPathRole = Qt::UserRole + 4,
+        ModuleHasIndexRole = Qt::UserRole + 5,
+        ModuleIndexSizeRole = Qt::UserRole + 6,
+        ModuleDescriptionRole = Qt::UserRole + 7,
+        UserRole = Qt::UserRole + 100
+    };
+
+public: /* Methods: */
+
+    inline BtBookshelfModel(QObject * const parent = 0)
+        : QAbstractListModel(parent) {}
+
+    // Virtual methods implemented from QAbstractListModel:
+    int rowCount(const QModelIndex & parent = QModelIndex()) const;
+    QVariant data(CSwordModuleInfo * module, int role) const;
+    QVariant data(const QModelIndex & index, int role) const;
+    QVariant headerData(int section,
+                        Qt::Orientation orientation,
+                        int role = Qt::DisplayRole) const;
+    bool setData(const QModelIndex & index,
+                 const QVariant & value,
+                 int role = ModuleHiddenRole);
+
+    /**
+      Given an index of this model, this method returns a pointer to the underlying
+      CSwordModuleInfo instance corresponding to the given index.
+      \param[in] index An index to this model.
+    */
+    inline CSwordModuleInfo * module(const QModelIndex & index) const {
+        return static_cast<CSwordModuleInfo *>(
+               data(index, BtBookshelfModel::ModulePointerRole).value<void *>());
+    }
+
+    /**
+      Clears the data of the whole model by removing all items.
+      \param[in] destroy If true, all CSwordModuleInfo instances in this model are also
+                         destroyed.
+    */
+    void clear(bool destroy = false);
+
+    /**
+      Appends the given module to this model.
+      \param[in] module Module to add.
+    */
+    void addModule(CSwordModuleInfo * const module);
+
+    /**
+      Appends the all the modules in the given set to this model.
+      \param[in] modules Set of modules to add.
+    */
+    void addModules(const QSet<CSwordModuleInfo *> & modules);
+
+    /**
+      Appends the all the modules in the given list to this model.
+      \param[in] modules Set of modules to add.
+    */
+    void addModules(const QList<CSwordModuleInfo *> & modules);
+
+    /**
+      Removes the given module from this model and optionally destroys it.
+      \param[in] module The module to remove from this model.
+      \param[in] destroy If true, the given CSwordModuleInfo instance is destroyed.
+    */
+    void removeModule(CSwordModuleInfo * const module,
+                      bool destroy = false);
+
+    /**
+      Removes all modules from the given set from this model and optionally destroys
+      them.
+      \param[in] modules The set of modules to remove from this model.
+      \param[in] destroy If true, the given CSwordModuleInfo instances are destroyed.
+    */
+    void removeModules(const QSet<CSwordModuleInfo *> & modules,
+                       bool destroy = false);
+
+    /**
+      Removes all modules from the given list from this model and optionally destroys
+      them.
+      \param[in] modules The list of modules to remove from this model.
+      \param[in] destroy If true, the given CSwordModuleInfo instances are destroyed.
+    */
+    void removeModules(const QList<CSwordModuleInfo *> & modules,
+                       bool destroy = false);
+
+    /**
+      Returns the first module found with the given name.
+      \param[in] name Name of the module to find.
+    */
+    CSwordModuleInfo* getModule(const QString & name) const;
+
+    /**
+      Returns the list of handled modules as a list of CSwordModuleInfo* pointers.
+    */
+    inline const QList<CSwordModuleInfo *> & moduleList() const {
+        return m_data;
+    }
+
+protected slots:
+
+    /**
+      Slot DIRECTLY called by CSwordModuleInfo when the hidden status of the respective
+      module changes.
+      \param[in] hidden True, if the module was hidden; false, if the module was shown.
+    */
+    void moduleHidden(bool hidden);
+
+    /**
+      Slot DIRECTLY called by CSwordModuleInfo when the indexed status of the respective
+      module changes.
+      \param[in] indexed True, if the module was indexed; false if the index was deleted.
+    */
+    void moduleIndexed(bool indexed);
+
+    /**
+      Slot DIRECTLY called by CSwordModuleInfo when the locked status of the respective
+      module changes.
+      \param[in] unlocked True, if the module was unlocked; false if the module was
+                 locked.
+    */
+    void moduleUnlocked(bool unlocked);
+
+private: /* Methods: */
+
+    /**
+      Called internally when module data changes. This method emits any neccessary
+      signals for this model.
+      \pre The givem module is handled by this model.
+      \param[in] module The module that changed status.
+    */
+    void moduleDataChanged(CSwordModuleInfo * module);
+
+private: /* Fields: */
+
+    /**
+      The underlying data as a list of pointers to the respective CSwordModuleInfo
+      instances.
+    */
+    QList<CSwordModuleInfo *> m_data;
+
 };
 
 #endif // BTBOOKSHELFMODEL_H
diff --git a/src/backend/bookshelfmodel/btbookshelftreemodel.cpp b/src/backend/bookshelfmodel/btbookshelftreemodel.cpp
index 0fcd14e..f3dbc4a 100644
--- a/src/backend/bookshelfmodel/btbookshelftreemodel.cpp
+++ b/src/backend/bookshelfmodel/btbookshelftreemodel.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -13,20 +13,19 @@
 #include "backend/bookshelfmodel/btbookshelftreemodel.h"
 
 #include <QSet>
-#include <QSettings>
 #include "backend/bookshelfmodel/categoryitem.h"
 #include "backend/bookshelfmodel/indexingitem.h"
 #include "backend/bookshelfmodel/languageitem.h"
 #include "backend/bookshelfmodel/moduleitem.h"
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "util/macros.h"
 
 
 using namespace BookshelfModel;
 
-bool BtBookshelfTreeModel::Grouping::loadFrom(const QString &configKey) {
+bool BtBookshelfTreeModel::Grouping::loadFrom(const QString & configKey) {
     Q_ASSERT(!configKey.isNull());
-    QVariant v = CBTConfig::getConfig()->value(configKey);
+    QVariant v = btConfig().qVariantValue(configKey, QVariant());
     if (!v.canConvert<Grouping>())
         return false;
 
@@ -34,141 +33,142 @@ bool BtBookshelfTreeModel::Grouping::loadFrom(const QString &configKey) {
     return true;
 }
 
-void BtBookshelfTreeModel::Grouping::saveTo(const QString &configKey) const {
+void BtBookshelfTreeModel::Grouping::saveTo(const QString & configKey) const {
     Q_ASSERT(!configKey.isNull());
-    CBTConfig::getConfig()->setValue(configKey, QVariant::fromValue(*this));
-}
-
-
-BtBookshelfTreeModel::BtBookshelfTreeModel(QObject *parent)
-    : QAbstractItemModel(parent), m_sourceModel(0), m_rootItem(new RootItem),
-    m_defaultChecked(MODULE_HIDDEN), m_checkable(false)
-{
-    // Intentionally empty
-}
-
-BtBookshelfTreeModel::BtBookshelfTreeModel(const QString &configKey,
-                                           QObject *parent)
-       : QAbstractItemModel(parent), m_sourceModel(0), m_rootItem(new RootItem),
-       m_groupingOrder(configKey), m_defaultChecked(MODULE_HIDDEN),
-       m_checkable(false)
-{
-    // Intentionally empty
-}
-
-BtBookshelfTreeModel::BtBookshelfTreeModel(const Grouping &g, QObject *parent)
-        : QAbstractItemModel(parent), m_sourceModel(0), m_rootItem(new RootItem),
-        m_groupingOrder(g), m_defaultChecked(MODULE_HIDDEN), m_checkable(false)
-{
-    // Intentionally empty
-}
+    btConfig().setValue(configKey, QVariant::fromValue(*this));
+}
+
+BtBookshelfTreeModel::BtBookshelfTreeModel(QObject * parent)
+    : QAbstractItemModel(parent)
+    , m_sourceModel(0)
+    , m_rootItem(new RootItem)
+    , m_defaultChecked(MODULE_HIDDEN)
+    , m_checkable(false) {}
+
+BtBookshelfTreeModel::BtBookshelfTreeModel(const QString & configKey,
+                                           QObject * parent)
+       : QAbstractItemModel(parent)
+       , m_sourceModel(0)
+       , m_rootItem(new RootItem)
+       , m_groupingOrder(configKey)
+       , m_defaultChecked(MODULE_HIDDEN)
+       , m_checkable(false) {}
+
+BtBookshelfTreeModel::BtBookshelfTreeModel(const Grouping & grouping,
+                                           QObject * parent)
+        : QAbstractItemModel(parent)
+        , m_sourceModel(0)
+        , m_rootItem(new RootItem)
+        , m_groupingOrder(grouping)
+        , m_defaultChecked(MODULE_HIDDEN)
+        , m_checkable(false) {}
 
 BtBookshelfTreeModel::~BtBookshelfTreeModel() {
     delete m_rootItem;
 }
 
-int BtBookshelfTreeModel::rowCount(const QModelIndex &parent) const {
-    return getItem(parent)->children().size();
+int BtBookshelfTreeModel::rowCount(const QModelIndex & parent) const {
+    return getItem(parent).children().size();
 }
 
-int BtBookshelfTreeModel::columnCount(const QModelIndex &parent) const {
+int BtBookshelfTreeModel::columnCount(const QModelIndex & parent) const {
     Q_UNUSED(parent);
 
     return 1;
 }
 
-bool BtBookshelfTreeModel::hasChildren(const QModelIndex &parent) const {
-    return !getItem(parent)->children().isEmpty();
+bool BtBookshelfTreeModel::hasChildren(const QModelIndex & parent) const {
+    return !getItem(parent).children().isEmpty();
 }
 
 QModelIndex BtBookshelfTreeModel::index(int row, int column,
-                                        const QModelIndex &parent) const {
+                                        const QModelIndex & parent) const
+{
     if (!hasIndex(row, column, parent)) return QModelIndex();
 
-    Item *parentItem(getItem(parent));
-    Item *childItem(parentItem->children().at(row));
-    if (childItem != 0) {
-        return createIndex(row, column, childItem);
-    }
-    else {
+    Item & parentItem = getItem(parent);
+    Item * const childItem = parentItem.children().at(row);
+    if (!childItem)
         return QModelIndex();
-    }
+
+    return createIndex(row, column, childItem);
 }
 
-QModelIndex BtBookshelfTreeModel::parent(const QModelIndex &index) const {
-    if (!index.isValid()) return QModelIndex();
+QModelIndex BtBookshelfTreeModel::parent(const QModelIndex & index) const {
+    if (!index.isValid())
+        return QModelIndex();
 
-    Item *childItem(static_cast<Item*>(index.internalPointer()));
+    Item * childItem(static_cast<Item*>(index.internalPointer()));
     Q_ASSERT(childItem != 0);
-    Item *parentItem(childItem->parent());
+    Item * parentItem(childItem->parent());
     Q_ASSERT(parentItem != 0);
 
-    if (parentItem == m_rootItem) {
+    if (parentItem == m_rootItem)
         return QModelIndex();
-    }
+
     return createIndex(parentItem->childIndex(), 0, parentItem);
 }
 
-QVariant BtBookshelfTreeModel::data(const QModelIndex &index, int role) const {
-    if (!index.isValid() || index.column() != 0) {
+QVariant BtBookshelfTreeModel::data(const QModelIndex & index, int role) const {
+    if (!index.isValid() || index.column() != 0)
         return QVariant();
-    }
 
-    Item *i(static_cast<Item*>(index.internalPointer()));
+    const Item * const i = static_cast<Item*>(index.internalPointer());
     Q_ASSERT(i != 0);
     switch (role) {
+
         case Qt::CheckStateRole:
-            if (!m_checkable) break;
+            if (!m_checkable)
+                break;
+
         case BtBookshelfTreeModel::CheckStateRole:
             return i->checkState();
+
         case BtBookshelfModel::ModulePointerRole:
             /* This case is just an optimization. */
             if (i->type() == Item::ITEM_MODULE) {
-                ModuleItem *mi(static_cast<ModuleItem *>(i));
-                return qVariantFromValue((void*) mi->moduleInfo());
+                const ModuleItem & mi = *static_cast<const ModuleItem *>(i);
+                return qVariantFromValue(static_cast<void *>(&mi.moduleInfo()));
             }
             return 0;
+
         case Qt::DisplayRole:
         case Qt::DecorationRole:
         case BtBookshelfModel::ModuleHiddenRole:
         default:
-            if (i->type() == Item::ITEM_MODULE) {
-                ModuleItem *item(static_cast<ModuleItem *>(i));
-                CSwordModuleInfo* m(item->moduleInfo());
-                return data(m, role);
-            }
-            else {
-                return i->data(role);
-            }
+            if (i->type() == Item::ITEM_MODULE)
+                return data(static_cast<const ModuleItem *>(i)->moduleInfo(), role);
+
+            return i->data(role);
+
     }
     return QVariant();
 }
 
-QVariant BtBookshelfTreeModel::data(CSwordModuleInfo *module, int role) const {
-    Q_ASSERT(m_sourceIndexMap.contains(module));
-    return m_sourceModel->data(m_sourceIndexMap.value(module), role);
+QVariant BtBookshelfTreeModel::data(CSwordModuleInfo & module, int role) const {
+    Q_ASSERT(m_sourceIndexMap.contains(&module));
+    return m_sourceModel->data(m_sourceIndexMap.value(&module), role);
 }
 
-bool BtBookshelfTreeModel::setData(const QModelIndex &itemIndex,
-                                   const QVariant &value,
+bool BtBookshelfTreeModel::setData(const QModelIndex & itemIndex,
+                                   const QVariant & value,
                                    int role) {
     Q_ASSERT(itemIndex.isValid());
     typedef QPair<Item *, QModelIndex> IP;
 
-    Qt::CheckState newState;
-    if (LIKELY(role == Qt::CheckStateRole)) {
-        bool ok;
-        newState = (Qt::CheckState) value.toInt(&ok);
-        if (UNLIKELY(!ok)) return false;
-    }
-    else {
+    if (UNLIKELY(role != Qt::CheckStateRole))
+        return false;
+
+    bool ok;
+    Qt::CheckState newState = static_cast<Qt::CheckState>(value.toInt(&ok));
+    if (UNLIKELY(!ok))
         return false;
-    }
 
     // Handle partially checked as checked here in setData():
-    if (newState == Qt::PartiallyChecked) newState = Qt::Checked;
+    if (newState == Qt::PartiallyChecked)
+        newState = Qt::Checked;
 
-    Item *item(static_cast<Item*>(itemIndex.internalPointer()));
+    Item * item = static_cast<Item *>(itemIndex.internalPointer());
     Q_ASSERT(item != 0);
     if (item->checkState() == newState) return false;
 
@@ -180,25 +180,23 @@ bool BtBookshelfTreeModel::setData(const QModelIndex &itemIndex,
             item->setCheckState(newState);
             emit dataChanged(p.second, p.second);
             if (item->type() == Item::ITEM_MODULE) {
-                ModuleItem *mItem(static_cast<ModuleItem*>(item));
-                CSwordModuleInfo *mInfo(mItem->moduleInfo());
+                ModuleItem & mItem = *static_cast<ModuleItem *>(item);
+                CSwordModuleInfo & mInfo = mItem.moduleInfo();
                 if (newState == Qt::Checked) {
-                    m_checkedModulesCache.insert(mInfo);
-                    emit moduleChecked(mInfo, true);
-                }
-                else {
-                    m_checkedModulesCache.remove(mInfo);
-                    emit moduleChecked(mInfo, false);
+                    m_checkedModulesCache.insert(&mInfo);
+                    emit moduleChecked(&mInfo, true);
+                } else {
+                    m_checkedModulesCache.remove(&mInfo);
+                    emit moduleChecked(&mInfo, false);
                 }
-            }
-            else {
-                const QList<Item*> &children(item->children());
-                for (int i(0); i < children.size(); i++) {
+            } else {
+                const QList<Item *> & children = item->children();
+                for (int i = 0; i < children.size(); i++)
                     q.append(IP(children.at(i), index(i, 0, p.second)));
-                }
             }
         }
-        if (q.empty()) break;
+        if (q.empty())
+            break;
         p = q.takeFirst();
         item = p.first;
     }
@@ -209,36 +207,36 @@ bool BtBookshelfTreeModel::setData(const QModelIndex &itemIndex,
     return true;
 }
 
-Qt::ItemFlags BtBookshelfTreeModel::flags(const QModelIndex &index) const {
-    if (!index.isValid()) return 0;
+Qt::ItemFlags BtBookshelfTreeModel::flags(const QModelIndex & index) const {
+    if (!index.isValid())
+        return 0;
 
     Qt::ItemFlags f(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
 
     if (m_checkable) {
         f |= Qt::ItemIsUserCheckable;
 
-        Item *i(static_cast<Item*>(index.internalPointer()));
-        Q_ASSERT(i != 0);
-
-        if (i->type() != Item::ITEM_MODULE) {
+        const Item & i = *static_cast<Item*>(index.internalPointer());
+        if (i.type() != Item::ITEM_MODULE)
             f |= Qt::ItemIsTristate;
-        }
     }
 
     return f;
 }
 
 QVariant BtBookshelfTreeModel::headerData(int section,
-        Qt::Orientation orientation,
-        int role) const {
-    if (orientation == Qt::Horizontal) {
+                                          Qt::Orientation orientation,
+                                          int role) const
+{
+    if (orientation == Qt::Horizontal)
         return m_sourceModel->headerData(section, orientation, role);
-    }
+
     return QVariant();
 }
 
-void BtBookshelfTreeModel::setSourceModel(QAbstractItemModel *sourceModel) {
-    if (m_sourceModel == sourceModel) return;
+void BtBookshelfTreeModel::setSourceModel(QAbstractItemModel * sourceModel) {
+    if (m_sourceModel == sourceModel)
+        return;
 
     if (m_sourceModel != 0) {
         disconnect(this, SLOT(moduleInserted(QModelIndex, int, int)));
@@ -263,43 +261,38 @@ void BtBookshelfTreeModel::setSourceModel(QAbstractItemModel *sourceModel) {
         connect(sourceModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
                 this,        SLOT(moduleDataChanged(QModelIndex, QModelIndex)));
 
-        for (int i(0); i < sourceModel->rowCount(); i++) {
-            typedef BtBookshelfModel::ModuleRole MRole;
-            static const MRole HR(BtBookshelfModel::ModuleHiddenRole);
-            static const MRole PR(BtBookshelfModel::ModulePointerRole);
-            static const MRole IR(BtBookshelfModel::ModuleHasIndexRole);
-
-            QModelIndex moduleIndex(sourceModel->index(i, 0));
-            CSwordModuleInfo *module(
-                static_cast<CSwordModuleInfo *>(
-                    sourceModel->data(moduleIndex, PR).value<void*>()
-                )
-            );
-            Q_ASSERT(module != 0);
+        for (int i = 0; i < sourceModel->rowCount(); i++) {
+            const QModelIndex moduleIndex(sourceModel->index(i, 0));
+            CSwordModuleInfo & module = *static_cast<CSwordModuleInfo *>(
+                sourceModel->data(moduleIndex,
+                                  BtBookshelfModel::ModulePointerRole).value<void*>());
+
             bool checked;
             if (m_defaultChecked == MODULE_HIDDEN) {
-                checked = !sourceModel->data(moduleIndex, HR).toBool();
-            }
-            else if (m_defaultChecked == MODULE_INDEXED) {
-                checked = !sourceModel->data(moduleIndex, IR).toBool();
-            }
-            else {
+                checked = !sourceModel->data(moduleIndex,
+                                             BtBookshelfModel::ModuleHiddenRole).toBool();
+            } else if (m_defaultChecked == MODULE_INDEXED) {
+                checked = !sourceModel->data(moduleIndex,
+                                             BtBookshelfModel::ModuleHasIndexRole).toBool();
+            } else {
                 checked = (m_defaultChecked == CHECKED);
             }
-            m_sourceIndexMap[module] = moduleIndex;
+            m_sourceIndexMap[&module] = moduleIndex;
             addModule(module, checked);
         }
     }
 }
 
-void BtBookshelfTreeModel::setGroupingOrder(const Grouping &groupingOrder,
+void BtBookshelfTreeModel::setGroupingOrder(const Grouping & groupingOrder,
                                             bool emitSignal)
 {
-    if (m_groupingOrder == groupingOrder) return;
+    if (m_groupingOrder == groupingOrder)
+        return;
+
     m_groupingOrder = groupingOrder;
 
     if (m_sourceModel != 0) {
-        QSet<CSwordModuleInfo*> checked(m_checkedModulesCache);
+        const QSet<CSwordModuleInfo *> checked(m_checkedModulesCache);
         m_checkedModulesCache.clear();
 
         beginRemoveRows(QModelIndex(), 0, m_rootItem->children().size() - 1);
@@ -308,42 +301,39 @@ void BtBookshelfTreeModel::setGroupingOrder(const Grouping &groupingOrder,
         m_rootItem = new RootItem;
         endRemoveRows();
 
-        for (int i(0); i < m_sourceModel->rowCount(); i++) {
-            QModelIndex sourceIndex(m_sourceModel->index(i, 0));
-            CSwordModuleInfo *module(
-                static_cast<CSwordModuleInfo *>(
-                    m_sourceModel->data(
-                        sourceIndex,
-                        BtBookshelfModel::ModulePointerRole
-                    ).value<void*>()
-                )
-            );
-            Q_ASSERT(module != 0);
-            m_sourceIndexMap[module] = sourceIndex;
-            addModule(module, checked.contains(module));
+        for (int i = 0; i < m_sourceModel->rowCount(); i++) {
+            const QModelIndex sourceIndex(m_sourceModel->index(i, 0));
+            CSwordModuleInfo & module = *static_cast<CSwordModuleInfo *>(
+                m_sourceModel->data(sourceIndex,
+                                    BtBookshelfModel::ModulePointerRole).value<void *>());
+            m_sourceIndexMap[&module] = sourceIndex;
+            addModule(module, checked.contains(&module));
         }
     }
 
-    if (emitSignal) emit groupingOrderChanged(groupingOrder);
+    if (emitSignal)
+        emit groupingOrderChanged(groupingOrder);
 }
 
 void BtBookshelfTreeModel::setCheckable(bool checkable) {
-    if (m_checkable == checkable) return;
+    if (m_checkable == checkable)
+        return;
     m_checkable = checkable;
-    if (m_sourceModel == 0) return;
+    if (m_sourceModel == 0)
+        return;
 
     // Notify views that flags changed for all items:
     resetData();
 }
 
-void BtBookshelfTreeModel::setCheckedModules(const QSet<CSwordModuleInfo*> &modules) {
+void BtBookshelfTreeModel::setCheckedModules(const QSet<CSwordModuleInfo *> & modules) {
     typedef ModuleItemMap::const_iterator MIMCI;
 
-    for (MIMCI it(m_modules.constBegin()); it != m_modules.constEnd(); it++) {
+    for (MIMCI it = m_modules.constBegin(); it != m_modules.constEnd(); ++it) {
         if (modules.contains(it.key())) {
-            setData(getIndex(it.value()), Qt::Checked, Qt::CheckStateRole);
+            setData(getIndex(*it.value()), Qt::Checked, Qt::CheckStateRole);
         } else {
-            setData(getIndex(it.value()), Qt::Unchecked, Qt::CheckStateRole);
+            setData(getIndex(*it.value()), Qt::Unchecked, Qt::CheckStateRole);
         }
     }
 }
@@ -355,18 +345,17 @@ void BtBookshelfTreeModel::resetData() {
         QModelIndex parent(queue.takeFirst());
         emit dataChanged(index(0, 0, parent),
                          index(rowCount(parent) - 1, columnCount() - 1, parent));
-        for (int i(0); i < rowCount(parent); i++) {
-            QModelIndex childIndex(index(i, 0, parent));
-            if (rowCount(childIndex) > 0) {
+        for (int i = 0; i < rowCount(parent); i++) {
+            const QModelIndex childIndex(index(i, 0, parent));
+            if (rowCount(childIndex) > 0)
                 queue.append(childIndex);
-            }
         }
-    }
-    while (!queue.isEmpty());
+    } while (!queue.isEmpty());
 }
 
-void BtBookshelfTreeModel::addModule(CSwordModuleInfo *module, bool checked) {
-    if (m_modules.contains(module)) return;
+void BtBookshelfTreeModel::addModule(CSwordModuleInfo & module, bool checked) {
+    if (m_modules.contains(&module))
+        return;
 
 #if QT_VERSION >= 0x040600
     beginResetModel();
@@ -388,42 +377,43 @@ void BtBookshelfTreeModel::addModule(CSwordModuleInfo *module, bool checked) {
 #endif
 }
 
-void BtBookshelfTreeModel::addModule(CSwordModuleInfo *module,
+void BtBookshelfTreeModel::addModule(CSwordModuleInfo & module,
                                      QModelIndex parentIndex,
-                                     Grouping &intermediateGrouping,
-                                     bool checked) {
-    Q_ASSERT(module != 0);
-
+                                     Grouping & intermediateGrouping,
+                                     bool checked)
+{
     if (!intermediateGrouping.empty()) {
         QModelIndex newIndex;
         switch (intermediateGrouping.front()) {
+
             case GROUP_CATEGORY:
                 newIndex = getGroup<CategoryItem>(module, parentIndex);
                 break;
+
             case GROUP_LANGUAGE:
                 newIndex = getGroup<LanguageItem>(module, parentIndex);
                 break;
+
             case GROUP_INDEXING:
                 newIndex = getGroup<IndexingItem>(module, parentIndex);
                 break;
+
         }
         intermediateGrouping.pop_front();
         addModule(module, newIndex, intermediateGrouping, checked);
-    }
-    else {
-        Item *parentItem(getItem(parentIndex));
-        ModuleItem *newItem(new ModuleItem(module, this));
+    } else {
+        Item & parentItem = getItem(parentIndex);
+        ModuleItem * const newItem = new ModuleItem(module, *this);
         newItem->setCheckState(checked ? Qt::Checked : Qt::Unchecked);
-        const int newIndex(parentItem->indexFor(newItem));
+        const int newIndex(parentItem.indexFor(newItem));
 
         // Actually do the insertion:
         beginInsertRows(parentIndex, newIndex, newIndex);
-        parentItem->insertChild(newIndex, newItem);
-        m_modules.insert(module, newItem);
-        if (checked) {
-            // Add to checked modules cache
-            m_checkedModulesCache.insert(module);
-        }
+        parentItem.insertChild(newIndex, newItem);
+        m_modules.insert(&module, newItem);
+        if (checked) // Add to checked modules cache
+            m_checkedModulesCache.insert(&module);
+
         endInsertRows();
 
         // Reset parent item check states, if needed:
@@ -431,85 +421,84 @@ void BtBookshelfTreeModel::addModule(CSwordModuleInfo *module,
     }
 }
 
-void BtBookshelfTreeModel::removeModule(CSwordModuleInfo *module) {
-    if (!m_modules.contains(module)) return;
+void BtBookshelfTreeModel::removeModule(CSwordModuleInfo & module) {
+    typedef ModuleItemMap::iterator MIMI;
+    const MIMI it = m_modules.find(&module);
+    if (it == m_modules.end())
+        return;
 
-    Item *i(m_modules[module]);
+    Item * i = it.value();
 
     // Set i to be the lowest item (including empty groups) to remove:
-    Q_ASSERT(i->parent() != 0);
-    while (i->parent() != m_rootItem && i->parent()->children().size() <= 1) {
+    Q_ASSERT(i->parent());
+    while (i->parent() != m_rootItem && i->parent()->children().size() <= 1)
         i = i->parent();
-    }
-    Q_ASSERT(i != 0);
-    Q_ASSERT(i->parent() != 0);
+    Q_ASSERT(i);
+    Q_ASSERT(i->parent());
 
     // Calculate item indexes:
-    int index(i->childIndex());
-    QModelIndex parentIndex(getIndex(i->parent()));
+    const int index = i->childIndex();
+    const QModelIndex parentIndex(getIndex(*i->parent()));
 
     // Actually remove the item:
     beginRemoveRows(parentIndex, index, index);
     delete i->parent()->children().takeAt(index);
-    m_modules.remove(module);
-    m_checkedModulesCache.remove(module);
+    m_modules.erase(it);
+    m_checkedModulesCache.remove(&module);
     endRemoveRows();
 
     // Reset parent item check states, if needed:
     resetParentCheckStates(parentIndex);
 }
 
-Item *BtBookshelfTreeModel::getItem(const QModelIndex &index) const {
-    if (LIKELY(index.isValid())) {
-        Item *item(static_cast<Item*>(index.internalPointer()));
-        Q_ASSERT(item != 0);
-        return item;
-    }
-    else {
-        return m_rootItem;
-    }
-}
+Item & BtBookshelfTreeModel::getItem(const QModelIndex & index) const {
+    if (UNLIKELY(!index.isValid()))
+        return *m_rootItem;
 
-QModelIndex BtBookshelfTreeModel::getIndex(const BookshelfModel::Item *item) {
-    Q_ASSERT(item != 0);
+    Item * const item = static_cast<Item *>(index.internalPointer());
+    Q_ASSERT(item);
+    return *item;
+}
 
+QModelIndex BtBookshelfTreeModel::getIndex(const BookshelfModel::Item & item) {
+    const BookshelfModel::Item * it = &item;
     QList<int> indexes;
     for (;;) {
-        int i(item->childIndex());
-        if (i < 0) break;
+        const int i = it->childIndex();
+        if (i < 0)
+            break;
         indexes.append(i);
-        item = item->parent();
+        it = it->parent();
     }
 
     QModelIndex i;
-    while (!indexes.isEmpty()) {
+    while (!indexes.isEmpty())
         i = index(indexes.takeLast(), 0, i);
-    }
     return i;
 }
 
 void BtBookshelfTreeModel::resetParentCheckStates(QModelIndex parentIndex) {
     for ( ; parentIndex.isValid(); parentIndex = parentIndex.parent()) {
-        Item *parentItem(static_cast<Item*>(parentIndex.internalPointer()));
-        Q_ASSERT(parentItem != 0);
-
-        Qt::CheckState oldState(parentItem->checkState());
-        bool haveCheckedChildren(false);
-        bool haveUncheckedChildren(false);
-        for (int i(0); i < parentItem->children().size(); i++) {
-            Qt::CheckState state(parentItem->children().at(i)->checkState());
+        Item & parentItem = *static_cast<Item *>(parentIndex.internalPointer());
+
+        const Qt::CheckState oldState = parentItem.checkState();
+        bool haveCheckedChildren = false;
+        bool haveUncheckedChildren = false;
+        for (int i = 0; i < parentItem.children().size(); i++) {
+            const Qt::CheckState state = parentItem.children().at(i)->checkState();
             if (state == Qt::PartiallyChecked) {
                 haveCheckedChildren = true;
                 haveUncheckedChildren = true;
                 break;
-            }
-            else if (state == Qt::Checked) {
+            } else if (state == Qt::Checked) {
                 haveCheckedChildren = true;
-                if (haveUncheckedChildren) break;
-            }
-            else if (state == Qt::Unchecked) {
+                if (haveUncheckedChildren)
+                    break;
+            } else {
+                Q_ASSERT(state == Qt::Unchecked);
                 haveUncheckedChildren = true;
-                if (haveCheckedChildren) break;
+                if (haveCheckedChildren)
+                    break;
             }
         }
 
@@ -517,35 +506,34 @@ void BtBookshelfTreeModel::resetParentCheckStates(QModelIndex parentIndex) {
         if (haveCheckedChildren) {
             if (haveUncheckedChildren) {
                 newState = Qt::PartiallyChecked;
-            }
-            else {
+            } else {
                 newState = Qt::Checked;
             }
-        }
-        else {
+        } else {
             newState = Qt::Unchecked;
         }
-        if (newState == oldState) break;
+        if (newState == oldState)
+            break;
 
-        parentItem->setCheckState(newState);
+        parentItem.setCheckState(newState);
         emit dataChanged(parentIndex, parentIndex);
     } // for ( ; parentIndex.isValid(); parentIndex = parentIndex.parent())
 }
 
-void BtBookshelfTreeModel::moduleDataChanged(const QModelIndex &topLeft,
-        const QModelIndex &bottomRight) {
-    typedef BtBookshelfModel BM;
-    static const BM::ModuleRole PR(BM::ModulePointerRole);
-
+void BtBookshelfTreeModel::moduleDataChanged(const QModelIndex & topLeft,
+                                             const QModelIndex & bottomRight)
+{
     Q_ASSERT(!topLeft.parent().isValid());
     Q_ASSERT(!bottomRight.parent().isValid());
-    Q_ASSERT(topLeft.column() == 0 && bottomRight.column() == 0);
-
-    for (int i(topLeft.row()); i <= bottomRight.row(); i++) {
-        QModelIndex moduleIndex(m_sourceModel->index(i, 0, topLeft.parent()));
-        QVariant data(m_sourceModel->data(moduleIndex, PR));
-        CSwordModuleInfo *module((CSwordModuleInfo *) (data.value<void*>()));
-        QModelIndex itemIndex(getIndex(m_modules[module]));
+    Q_ASSERT(topLeft.column() == 0);
+    Q_ASSERT(bottomRight.column() == 0);
+
+    for (int i = topLeft.row(); i <= bottomRight.row(); i++) {
+        const QModelIndex moduleIndex(m_sourceModel->index(i, 0, topLeft.parent()));
+        const QVariant data(m_sourceModel->data(moduleIndex,
+                                                BtBookshelfModel::ModulePointerRole));
+        CSwordModuleInfo & module = *static_cast<CSwordModuleInfo *>(data.value<void *>());
+        QModelIndex itemIndex(getIndex(*m_modules[&module]));
         Q_ASSERT(itemIndex.isValid());
 
         emit dataChanged(itemIndex, itemIndex);
@@ -557,67 +545,73 @@ void BtBookshelfTreeModel::moduleDataChanged(const QModelIndex &topLeft,
         do {
             itemIndex = itemIndex.parent();
             emit dataChanged(itemIndex, itemIndex);
-        }
-        while (itemIndex.isValid());
+        } while (itemIndex.isValid());
     }
 }
 
-void BtBookshelfTreeModel::moduleInserted(const QModelIndex &parent, int start, int end) {
-    typedef BtBookshelfModel BM;
-    static const BM::ModuleRole PR(BM::ModulePointerRole);
-    static const BM::ModuleRole HR(BM::ModuleHiddenRole);
-    static const BM::ModuleRole IR(BM::ModuleHasIndexRole);
+void BtBookshelfTreeModel::moduleInserted(const QModelIndex & parent,
+                                          int start,
+                                          int end)
+{
+    Q_ASSERT(start <= end);
 
-    for (int i(start); i <= end; i++) {
-        QModelIndex moduleIndex(m_sourceModel->index(i, 0, parent));
-        QVariant data(m_sourceModel->data(moduleIndex, PR));
-        CSwordModuleInfo *module((CSwordModuleInfo *) (data.value<void*>()));
+    for (int i = start; i <= end; i++) {
+        const QModelIndex moduleIndex(m_sourceModel->index(i, 0, parent));
+        const QVariant data(m_sourceModel->data(moduleIndex,
+                                                BtBookshelfModel::ModulePointerRole));
+        CSwordModuleInfo & module = *static_cast<CSwordModuleInfo *>(data.value<void *>());
 
         bool checked;
         if (m_defaultChecked == MODULE_HIDDEN) {
-            checked = !m_sourceModel->data(moduleIndex, HR).toBool();
-        }
-        else if (m_defaultChecked == MODULE_INDEXED) {
-            checked = !m_sourceModel->data(moduleIndex, IR).toBool();
-        }
-        else {
+            checked = !m_sourceModel->data(moduleIndex,
+                                           BtBookshelfModel::ModuleHiddenRole).toBool();
+        } else if (m_defaultChecked == MODULE_INDEXED) {
+            checked = !m_sourceModel->data(moduleIndex,
+                                           BtBookshelfModel::ModuleHasIndexRole).toBool();
+        } else {
+            Q_ASSERT(m_defaultChecked == CHECKED || m_defaultChecked == UNCHECKED);
             checked = (m_defaultChecked == CHECKED);
         }
-        m_sourceIndexMap[module] = moduleIndex;
+        m_sourceIndexMap[&module] = moduleIndex;
         addModule(module, checked);
     }
 }
 
-void BtBookshelfTreeModel::moduleRemoved(const QModelIndex &parent, int start, int end) {
-    typedef BtBookshelfModel BM;
-    static const BM::ModuleRole PR(BM::ModulePointerRole);
-
-    for (int i(start); i <= end; i++) {
-        QModelIndex moduleIndex(m_sourceModel->index(i, 0, parent));
-        QVariant data(m_sourceModel->data(moduleIndex, PR));
-        CSwordModuleInfo *module((CSwordModuleInfo *) (data.value<void*>()));
+void BtBookshelfTreeModel::moduleRemoved(const QModelIndex & parent,
+                                         int start,
+                                         int end)
+{
+    Q_ASSERT(start <= end);
 
+    for (int i = start; i <= end; i++) {
+        const QModelIndex moduleIndex(m_sourceModel->index(i, 0, parent));
+        const QVariant data(m_sourceModel->data(moduleIndex,
+                                                BtBookshelfModel::ModulePointerRole));
+        CSwordModuleInfo & module = *static_cast<CSwordModuleInfo *>(data.value<void*>());
         removeModule(module);
-        m_sourceIndexMap.remove(module);
+        m_sourceIndexMap.remove(&module);
     }
 }
 
-QDataStream &operator<<(QDataStream &os, const BtBookshelfTreeModel::Grouping &o) {
+QDataStream & operator <<(QDataStream & os,
+                          const BtBookshelfTreeModel::Grouping & o)
+{
     os << o.size();
-    Q_FOREACH(BtBookshelfTreeModel::Group g, o) {
-        os << (int) g;
-    }
+    Q_FOREACH(BtBookshelfTreeModel::Group g, o)
+        os << static_cast<int>(g);
     return os;
 }
 
-QDataStream &operator>>(QDataStream &is, BtBookshelfTreeModel::Grouping &o) {
+QDataStream & operator >>(QDataStream & is,
+                          BtBookshelfTreeModel::Grouping & o)
+{
     int s;
     is >> s;
     o.clear();
-    for (int i(0); i < s; i++) {
+    for (int i = 0; i < s; i++) {
         int g;
         is >> g;
-        o.append((BtBookshelfTreeModel::Group) g);
+        o.append(static_cast<BtBookshelfTreeModel::Group>(g));
     }
     return is;
 }
diff --git a/src/backend/bookshelfmodel/btbookshelftreemodel.h b/src/backend/bookshelfmodel/btbookshelftreemodel.h
index 085095d..14c3289 100644
--- a/src/backend/bookshelfmodel/btbookshelftreemodel.h
+++ b/src/backend/bookshelfmodel/btbookshelftreemodel.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -23,157 +23,181 @@
 #include "backend/bookshelfmodel/item.h"
 
 
-namespace BookshelfModel {
-class ModuleItem;
-}
+namespace BookshelfModel { class ModuleItem; }
 class CSwordModuleInfo;
 class QDataStream;
 
 class BtBookshelfTreeModel: public QAbstractItemModel {
-        Q_OBJECT
-        Q_ENUMS(Group)
-
-        typedef QMap<CSwordModuleInfo*, BookshelfModel::ModuleItem*> ModuleItemMap;
-        typedef QMap<CSwordModuleInfo*, QPersistentModelIndex> SourceIndexMap;
-
-    public: /* Types: */
-        enum ModuleRole {
-            CheckStateRole = BtBookshelfModel::UserRole,
-            UserRole = BtBookshelfModel::UserRole + 100
-        };
-        enum Group {
-            GROUP_CATEGORY = 0,
-            GROUP_LANGUAGE = 1,
-            GROUP_INDEXING
-        };
-        enum CheckedBehavior {
-            CHECKED,        /**< Check all added modules by default. */
-            UNCHECKED,      /**< Uncheck all added modules by default. */
-            MODULE_HIDDEN,  /**< By default, check only added modules that are not hidden. */
-            MODULE_INDEXED  /**< By default, check only added modules that are indexed. */
-        };
-
-        class Grouping: public QList<Group> {
-            public:
-                /**
-                  \warning Be careful using this constructor!
-                */
-                explicit inline Grouping(bool empty = false) {
-                    if (empty)
-                        return;
-                    push_back(GROUP_CATEGORY);
-                    push_back(GROUP_LANGUAGE);
-                }
-                explicit inline Grouping(Group group) { push_back(group); }
-                explicit inline Grouping(const QString &configKey) {
-                    if (loadFrom(configKey))
-                        return;
-                    push_back(GROUP_CATEGORY);
-                    push_back(GROUP_LANGUAGE);
-                }
-                inline Grouping(const Grouping &copy)
-                    : QList<Group>(copy) {}
-
-                bool loadFrom(const QString &configKey);
-                void saveTo(const QString &configKey) const;
-        };
-
-    public: /* Methods: */
-        BtBookshelfTreeModel(QObject *parent = 0);
-        BtBookshelfTreeModel(const QString &configKey, QObject *parent = 0);
-        BtBookshelfTreeModel(const Grouping &grouping, QObject *parent = 0);
-        virtual ~BtBookshelfTreeModel();
-
-        virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
-        virtual int columnCount(const QModelIndex &parent = QModelIndex())
-        const;
-        virtual bool hasChildren(const QModelIndex &parent = QModelIndex())
-        const;
-        virtual QModelIndex index(int row, int column,
-                                  const QModelIndex &parent = QModelIndex())
-        const;
-        virtual QModelIndex parent(const QModelIndex &index) const;
-        virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-        QVariant data(CSwordModuleInfo *module, int role = Qt::DisplayRole) const;
-        virtual Qt::ItemFlags flags(const QModelIndex &index) const;
-        virtual QVariant headerData(int section, Qt::Orientation orientation,
-                                    int role = Qt::DisplayRole) const;
-        virtual bool setData(const QModelIndex &index, const QVariant &value,
-                             int role);
-
-        inline QAbstractItemModel *sourceModel() const { return m_sourceModel; }
-        inline const Grouping &groupingOrder() const { return m_groupingOrder; }
-        inline bool checkable() const { return m_checkable; }
-        inline CheckedBehavior defaultChecked() const { return m_defaultChecked; }
-        inline QList<CSwordModuleInfo*> modules() const { return m_modules.keys(); }
-        inline const QSet<CSwordModuleInfo*> &checkedModules() const {
-            return m_checkedModulesCache;
-        }
 
-    public slots:
-        void setSourceModel(QAbstractItemModel *sourceModel);
-        void setGroupingOrder(const BtBookshelfTreeModel::Grouping &groupingOrder,
-                              bool emitSignal = true);
-        void setCheckable(bool checkable);
-        inline void setDefaultChecked(CheckedBehavior b) {
-            m_defaultChecked = b;
-        }
-        void setCheckedModules(const QSet<CSwordModuleInfo*> &modules);
-
-    signals:
-        void groupingOrderChanged(BtBookshelfTreeModel::Grouping newGrouping);
-        void moduleChecked(CSwordModuleInfo *module, bool checked);
-
-    protected:
-        void resetData();
-        QVariant parentData(BookshelfModel::ModuleItem *item, int role) const;
-        void addModule(CSwordModuleInfo *module, bool checked);
-        void addModule(CSwordModuleInfo *module, QModelIndex parentIndex,
-                       Grouping &intermediateGrouping, bool checked);
-        void removeModule(CSwordModuleInfo *module);
-
-        BookshelfModel::Item *getItem(const QModelIndex &index) const;
-        QModelIndex getIndex(const BookshelfModel::Item *item);
-        void resetParentCheckStates(QModelIndex parentIndex);
-
-        template <class T>
-        QModelIndex getGroup(CSwordModuleInfo *module,
-                             QModelIndex parentIndex) {
-            BookshelfModel::Item *parentItem(getItem(parentIndex));
-            int groupIndex;
-            T *groupItem(parentItem->getGroupItem<T>(module, groupIndex));
-
-            if (groupItem == 0) {
-                groupItem = new T(module);
-                groupIndex = parentItem->indexFor(groupItem);
-                beginInsertRows(parentIndex, groupIndex, groupIndex);
-                parentItem->insertChild(groupIndex, groupItem);
-                endInsertRows();
+    Q_OBJECT
+    Q_ENUMS(Group)
+
+private: /* Types: */
+
+    typedef QMap<CSwordModuleInfo *, BookshelfModel::ModuleItem *> ModuleItemMap;
+    typedef QMap<CSwordModuleInfo *, QPersistentModelIndex> SourceIndexMap;
+
+public: /* Types: */
+
+    enum ModuleRole {
+        CheckStateRole = BtBookshelfModel::UserRole,
+        UserRole = BtBookshelfModel::UserRole + 100
+    };
+
+    enum Group {
+        GROUP_CATEGORY = 0,
+        GROUP_LANGUAGE = 1,
+        GROUP_INDEXING
+    };
+
+    enum CheckedBehavior {
+        CHECKED,        /**< Check all added modules by default. */
+        UNCHECKED,      /**< Uncheck all added modules by default. */
+        MODULE_HIDDEN,  /**< By default, check only added modules that are not hidden. */
+        MODULE_INDEXED  /**< By default, check only added modules that are indexed. */
+    };
+
+    class Grouping: public QList<Group> {
+
+        public: /* Methods: */
+
+            /**
+              \warning Be careful using this constructor!
+            */
+            explicit inline Grouping(bool empty = false) {
+                if (empty)
+                    return;
+                push_back(GROUP_CATEGORY);
+                push_back(GROUP_LANGUAGE);
+            }
+
+            explicit inline Grouping(Group group) { push_back(group); }
+
+            explicit inline Grouping(const QString & configKey) {
+                if (loadFrom(configKey))
+                    return;
+                push_back(GROUP_CATEGORY);
+                push_back(GROUP_LANGUAGE);
             }
-            return index(groupIndex, 0, parentIndex);
+
+            inline Grouping(const Grouping & copy)
+                : QList<Group>(copy) {}
+
+            bool loadFrom(const QString & configKey);
+            void saveTo(const QString & configKey) const;
+
+    };
+
+public: /* Methods: */
+
+    BtBookshelfTreeModel(QObject * parent = 0);
+    BtBookshelfTreeModel(const QString & configKey, QObject * parent = 0);
+    BtBookshelfTreeModel(const Grouping & grouping, QObject * parent = 0);
+    virtual ~BtBookshelfTreeModel();
+
+    virtual int rowCount(const QModelIndex & parent = QModelIndex()) const;
+    virtual int columnCount(const QModelIndex & parent = QModelIndex())
+    const;
+    virtual bool hasChildren(const QModelIndex & parent = QModelIndex())
+    const;
+    virtual QModelIndex index(int row,
+                              int column,
+                              const QModelIndex & parent = QModelIndex())
+    const;
+    virtual QModelIndex parent(const QModelIndex & index) const;
+    virtual QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
+    QVariant data(CSwordModuleInfo & module, int role = Qt::DisplayRole) const;
+    virtual Qt::ItemFlags flags(const QModelIndex & index) const;
+    virtual QVariant headerData(int section, Qt::Orientation orientation,
+                                int role = Qt::DisplayRole) const;
+    virtual bool setData(const QModelIndex & index,
+                         const QVariant & value,
+                         int role);
+
+    inline QAbstractItemModel * sourceModel() const { return m_sourceModel; }
+    inline const Grouping & groupingOrder() const { return m_groupingOrder; }
+    inline bool checkable() const { return m_checkable; }
+    inline CheckedBehavior defaultChecked() const { return m_defaultChecked; }
+    inline QList<CSwordModuleInfo *> modules() const { return m_modules.keys(); }
+    inline const QSet<CSwordModuleInfo *> & checkedModules() const {
+        return m_checkedModulesCache;
+    }
+
+public slots:
+
+    void setSourceModel(QAbstractItemModel * sourceModel);
+    void setGroupingOrder(const BtBookshelfTreeModel::Grouping & groupingOrder,
+                          bool emitSignal = true);
+    void setCheckable(bool checkable);
+    inline void setDefaultChecked(CheckedBehavior b) {
+        m_defaultChecked = b;
+    }
+    void setCheckedModules(const QSet<CSwordModuleInfo *> & modules);
+
+signals:
+
+    void groupingOrderChanged(BtBookshelfTreeModel::Grouping newGrouping);
+    void moduleChecked(CSwordModuleInfo * module, bool checked);
+
+protected: /* Methods: */
+
+    void resetData();
+
+protected slots:
+
+    void moduleDataChanged(const QModelIndex & topLeft,
+                           const QModelIndex & bottomRight);
+    void moduleInserted(const QModelIndex & parent, int start, int end);
+    void moduleRemoved(const QModelIndex & parent, int start, int end);
+
+private: /* Methods: */
+
+    void addModule(CSwordModuleInfo & module, bool checked);
+    void addModule(CSwordModuleInfo & module,
+                   QModelIndex parentIndex,
+                   Grouping & intermediateGrouping,
+                   bool checked);
+    void removeModule(CSwordModuleInfo & module);
+
+    BookshelfModel::Item & getItem(const QModelIndex & index) const;
+    QModelIndex getIndex(const BookshelfModel::Item & item);
+    void resetParentCheckStates(QModelIndex parentIndex);
+
+    template <class T>
+    QModelIndex getGroup(CSwordModuleInfo & module,
+                         QModelIndex parentIndex)
+    {
+        BookshelfModel::Item & parentItem = getItem(parentIndex);
+        int groupIndex;
+        T * groupItem = parentItem.getGroupItem<T>(module, groupIndex);
+
+        if (!groupItem) {
+            groupItem = new T(module);
+            groupIndex = parentItem.indexFor(groupItem);
+            beginInsertRows(parentIndex, groupIndex, groupIndex);
+            parentItem.insertChild(groupIndex, groupItem);
+            endInsertRows();
         }
+        return index(groupIndex, 0, parentIndex);
+    }
+
+private: /* Fields: */
+
+    QAbstractItemModel * m_sourceModel;
+    BookshelfModel::Item * m_rootItem;
+    ModuleItemMap m_modules;
+    SourceIndexMap m_sourceIndexMap;
+    Grouping m_groupingOrder;
+    CheckedBehavior m_defaultChecked;
+    bool m_checkable;
+
+    QSet<CSwordModuleInfo *> m_checkedModulesCache;
 
-    protected slots:
-        void moduleDataChanged(const QModelIndex &topLeft,
-                               const QModelIndex &bottomRight);
-        void moduleInserted(const QModelIndex &parent, int start, int end);
-        void moduleRemoved(const QModelIndex &parent, int start, int end);
-
-    protected:
-        QAbstractItemModel   *m_sourceModel;
-        BookshelfModel::Item *m_rootItem;
-        ModuleItemMap         m_modules;
-        SourceIndexMap        m_sourceIndexMap;
-        Grouping              m_groupingOrder;
-        CheckedBehavior       m_defaultChecked;
-        bool                  m_checkable;
-
-        QSet<CSwordModuleInfo*> m_checkedModulesCache;
 };
 
-QDataStream &operator<<(QDataStream &os, const BtBookshelfTreeModel::Grouping &o);
-QDataStream &operator>>(QDataStream &is, BtBookshelfTreeModel::Grouping &o);
+QDataStream & operator <<(QDataStream & os, const BtBookshelfTreeModel::Grouping & o);
+QDataStream & operator >>(QDataStream & is, BtBookshelfTreeModel::Grouping & o);
 
-Q_DECLARE_METATYPE(BtBookshelfTreeModel::Grouping);
+Q_DECLARE_METATYPE(BtBookshelfTreeModel::Grouping)
 
 #endif // BTBOOKSHELFTREEMODEL_H
diff --git a/src/backend/bookshelfmodel/categoryitem.cpp b/src/backend/bookshelfmodel/categoryitem.cpp
index aaf5566..20ba8e4 100644
--- a/src/backend/bookshelfmodel/categoryitem.cpp
+++ b/src/backend/bookshelfmodel/categoryitem.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -15,29 +15,31 @@
 
 namespace BookshelfModel {
 
-CategoryItem::CategoryItem(CSwordModuleInfo *module)
-        : Item(ITEM_CATEGORY), m_category(module->category()) {
-    // Intentionally empty
-}
 
 QVariant CategoryItem::data(int role) const {
     switch (role) {
+
         case Qt::DisplayRole:
             return CSwordModuleInfo::categoryName(m_category);
+
         case Qt::DecorationRole:
             return CSwordModuleInfo::categoryIcon(m_category);
+
         default:
             return Item::data(role);
+
     }
 }
 
-bool CategoryItem::operator<(const Item &other) const {
-    if (other.type() != ITEM_CATEGORY) {
+bool CategoryItem::operator<(const Item & other) const {
+    if (other.type() != ITEM_CATEGORY)
         return ITEM_CATEGORY < other.type();
-    }
-    const CategoryItem &o(static_cast<const CategoryItem &>(other));
-    if (m_category   == CSwordModuleInfo::UnknownCategory) return false;
-    if (o.m_category == CSwordModuleInfo::UnknownCategory) return true;
+
+    const CategoryItem & o = static_cast<const CategoryItem &>(other);
+    if (m_category == CSwordModuleInfo::UnknownCategory)
+        return false;
+    if (o.m_category == CSwordModuleInfo::UnknownCategory)
+        return true;
     return m_category < o.m_category;
 }
 
diff --git a/src/backend/bookshelfmodel/categoryitem.h b/src/backend/bookshelfmodel/categoryitem.h
index 75d5a7c..135f337 100644
--- a/src/backend/bookshelfmodel/categoryitem.h
+++ b/src/backend/bookshelfmodel/categoryitem.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -22,28 +22,29 @@
 
 namespace BookshelfModel {
 
-class CategoryItem: public Item {
-        Q_DECLARE_TR_FUNCTIONS(CategoryItem);
+class CategoryItem: public GroupItem<Item::ITEM_CATEGORY> {
 
-    public:
-        static const Item::Type GROUP_TYPE = Item::ITEM_CATEGORY;
+public: /* Methods: */
 
-        CategoryItem(CSwordModuleInfo *module);
+    inline CategoryItem(const CSwordModuleInfo & module)
+        : m_category(module.category()) {}
 
-        inline const CSwordModuleInfo::Category &category() const {
-            return m_category;
-        }
+    inline const CSwordModuleInfo::Category & category() const {
+        return m_category;
+    }
 
-        QVariant data(int role = Qt::DisplayRole) const;
+    QVariant data(int role = Qt::DisplayRole) const;
 
-        inline bool fitFor(CSwordModuleInfo *module) const {
-            return module->category() == m_category;
-        }
+    inline bool fitFor(const CSwordModuleInfo & module) const {
+        return module.category() == m_category;
+    }
 
-        bool operator<(const Item &other) const;
+    bool operator<(const Item & other) const;
+
+private: /* Fields: */
+
+    const CSwordModuleInfo::Category m_category;
 
-    protected:
-        CSwordModuleInfo::Category m_category;
 };
 
 } // namespace BookshelfModel
diff --git a/src/backend/bookshelfmodel/indexingitem.cpp b/src/backend/bookshelfmodel/indexingitem.cpp
index 5491ca5..46488a4 100644
--- a/src/backend/bookshelfmodel/indexingitem.cpp
+++ b/src/backend/bookshelfmodel/indexingitem.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -15,23 +15,13 @@
 
 namespace BookshelfModel {
 
-IndexingItem::IndexingItem(CSwordModuleInfo *module)
-        : Item(Item::ITEM_INDEXING), m_indexed(module->hasIndex()) {
-    // Intentionally empty
-}
-
 QVariant IndexingItem::data(int role) const {
-    switch (role) {
-        case Qt::DisplayRole:
-            if (m_indexed) {
-                return QObject::tr("Indexed works");
-            }
-            else {
-                return QObject::tr("Unindexed works");
-            }
-        default:
-            return Item::data(role);
-    }
+    if (role != Qt::DisplayRole)
+        return Item::data(role);
+
+    return m_indexed
+           ? QObject::tr("Indexed works")
+           : QObject::tr("Unindexed works");
 }
 
 } // namespace BookshelfModel
diff --git a/src/backend/bookshelfmodel/indexingitem.h b/src/backend/bookshelfmodel/indexingitem.h
index a1eb812..3e1e0cd 100644
--- a/src/backend/bookshelfmodel/indexingitem.h
+++ b/src/backend/bookshelfmodel/indexingitem.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -20,20 +20,23 @@
 
 namespace BookshelfModel {
 
-class IndexingItem: public Item {
-    public:
-        static const Item::Type GROUP_TYPE = Item::ITEM_INDEXING;
+class IndexingItem: public GroupItem<Item::ITEM_INDEXING> {
 
-        IndexingItem(CSwordModuleInfo *module);
+public: /* Methods: */
 
-        QVariant data(int role = Qt::DisplayRole) const;
+    inline IndexingItem(const CSwordModuleInfo & module)
+        : m_indexed(module.hasIndex()) {}
 
-        inline bool fitFor(CSwordModuleInfo *module) const {
-            return module->hasIndex() == m_indexed;
-        }
+    QVariant data(int role = Qt::DisplayRole) const;
+
+    inline bool fitFor(const CSwordModuleInfo & module) const {
+        return module.hasIndex() == m_indexed;
+    }
+
+private: /* Fields: */
+
+    bool m_indexed;
 
-    protected:
-        bool m_indexed;
 };
 
 } // namespace BookshelfModel
diff --git a/src/backend/bookshelfmodel/item.cpp b/src/backend/bookshelfmodel/item.cpp
index 02cd991..9d6e5af 100644
--- a/src/backend/bookshelfmodel/item.cpp
+++ b/src/backend/bookshelfmodel/item.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -17,56 +17,56 @@
 
 namespace BookshelfModel {
 
-Item::Item(Type type)
-        : m_type(type), m_parent(0), m_checkState(Qt::Unchecked) {
-    // Intentionally empty
-}
-
 Item::~Item() {
     qDeleteAll(m_children);
 }
 
-int Item::indexFor(Item *newItem) {
-    Q_ASSERT(newItem != 0);
+int Item::indexFor(Item * newItem) {
+    Q_ASSERT(newItem);
 
-    if (m_children.empty()) return 0;
+    if (m_children.empty())
+        return 0;
 
-    int i(0);
+    int i = 0;
     for (;;) {
-        Item *nextItem(m_children.at(i));
+        Item * const nextItem(m_children.at(i));
         Q_ASSERT(nextItem->type() == newItem->type());
-        if (*newItem < *nextItem) {
+        if (*newItem < *nextItem)
             return i;
-        }
+
         i++;
-        if (i >= m_children.size()) {
+        if (i >= m_children.size())
             return i;
-        }
     }
 }
 
 QVariant Item::data(int role) const {
     switch (role) {
+
         case Qt::CheckStateRole:
             return m_checkState;
+
         case BtBookshelfModel::ModuleHiddenRole:
-            if (m_children.empty()) return true;
+            if (m_children.empty())
+                return true;
 
-            foreach (Item *child, m_children) {
-                if (!child->data(role).toBool()) return false;
-            }
+            Q_FOREACH (Item * child, m_children)
+                if (!child->data(role).toBool())
+                    return false;
             return true;
+
         default:
             return QVariant();
+
     }
 }
 
-bool Item::operator<(const Item &other) const {
-    if (m_type != other.type()) {
+bool Item::operator<(const Item & other) const {
+    if (m_type != other.type())
         return m_type < other.type();
-    }
-    QString first(data(Qt::DisplayRole).toString().toLower());
-    QString second(other.data(Qt::DisplayRole).toString().toLower());
+
+    const QString first(data(Qt::DisplayRole).toString().toLower());
+    const QString second(other.data(Qt::DisplayRole).toString().toLower());
     return first.localeAwareCompare(second) < 0;
 }
 
diff --git a/src/backend/bookshelfmodel/item.h b/src/backend/bookshelfmodel/item.h
index 652120b..712d4a2 100644
--- a/src/backend/bookshelfmodel/item.h
+++ b/src/backend/bookshelfmodel/item.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -13,10 +13,7 @@
 #ifndef ITEM_H
 #define ITEM_H
 
-#include <QIcon>
 #include <QList>
-#include <QString>
-#include <QtGlobal>
 #include <QVariant>
 
 
@@ -25,134 +22,165 @@ class CSwordModuleInfo;
 namespace BookshelfModel {
 
 class Item {
-    public:
-        enum Type {
-            ITEM_ROOT         = 0,
-            ITEM_CATEGORY     = 1,
-            ITEM_LANGUAGE     = 2,
-            ITEM_MODULE       = 3,
-            ITEM_INDEXING     = 4
-        };
-
-        Item(Type type);
-        virtual ~Item();
-
-        /**
-          \brief Returns the type of this item.
-        */
-        inline Type type() const {
-            return m_type;
-        }
 
-        /**
-          \brief Returns a pointer to the parent item of this item.
-          \retval 0 if this item has no parent.
-        */
-        inline Item *parent() const {
-            return m_parent;
+public: /* Types: */
+
+    enum Type {
+        ITEM_ROOT         = 0,
+        ITEM_CATEGORY     = 1,
+        ITEM_LANGUAGE     = 2,
+        ITEM_MODULE       = 3,
+        ITEM_INDEXING     = 4
+    };
+
+public: /* Methods: */
+
+    inline Item(Type type)
+        : m_type(type)
+        , m_parent(0)
+        , m_checkState(Qt::Unchecked) {}
+
+    virtual ~Item();
+
+    /**
+      \brief Returns the type of this item.
+    */
+    inline Type type() const {
+        return m_type;
+    }
+
+    /**
+      \brief Returns a pointer to the parent item of this item.
+      \retval 0 if this item has no parent.
+    */
+    inline Item * parent() const {
+        return m_parent;
+    }
+
+    /**
+      \brief Returns the list of child items of this node.
+    */
+    inline QList<Item *> & children() {
+        return m_children;
+    }
+
+    /**
+      \brief Returns the index of this item under its parent.
+      \retval -1 if this item has no parent.
+    */
+    inline int childIndex() const {
+        return m_parent == 0
+               ? -1
+               : m_parent->m_children.indexOf(const_cast<Item *>(this));
+    }
+
+    /**
+      \brief Returns the position for where the given child item would be
+             inserted.
+      \param[in] newItem Pointer to the item that would be inserted.
+    */
+    int indexFor(Item * newItem);
+
+    /**
+      \brief Inserts the given item as a child at the given index.
+      \pre The given index is a valid position for the item.
+      \param[in] index The child index to insert the item at.
+      \param[in] newItem The item to insert.
+    */
+    inline void insertChild(int index, Item * newItem) {
+        Q_ASSERT(newItem != 0);
+        Q_ASSERT(index >= 0 && index <= m_children.size());
+        m_children.insert(index, newItem);
+        newItem->setParent(this);
+    }
+
+    template <class T>
+    inline T * getGroupItem(CSwordModuleInfo & module, int & outIndex) {
+        for (int i = 0; i < m_children.size(); i++) {
+            Q_ASSERT(m_children.at(i)->type() == T::staticItemType());
+            T * item = static_cast<T *>(m_children.at(i));
+            if (item->fitFor(module)) {
+                outIndex = i;
+                return item;
+            }
         }
+        return 0;
+    }
+
+    /**
+      \brief Returns data for this item.
+    */
+    virtual QVariant data(int role = Qt::DisplayRole) const;
+
+    /**
+      \brief Returns the check state of this item.
+    */
+    inline Qt::CheckState checkState() const {
+        return m_checkState;
+    }
+
+    /**
+      \brief Sets the check state of this item.
+      \param[in] state new check state.
+    */
+    inline void setCheckState(const Qt::CheckState state) {
+        m_checkState = state;
+    }
+
+    /**
+      \brief Returns whether this item is fit to contain the given module.
+      \param[in] module The module to check with.
+      \retval true If this item is a group and can contain the given module.
+      \retval false This item is not a group or is a wrong group.
+    */
+    inline virtual bool fitFor(const CSwordModuleInfo & module) const = 0;
+
+    /**
+      \brief Comparsion operator used sorting child items.
+    */
+    virtual bool operator<(const Item & other) const;
+
+private: /* Methods: */
+
+    inline void setParent(Item * parent) {
+        Q_ASSERT(parent != 0);
+        m_parent = parent;
+    }
+
+private: /* Fields: */
+
+    Type m_type;
+    Item * m_parent;
+    QList<Item *> m_children;
+    Qt::CheckState m_checkState;
 
-        /**
-          \brief Returns the list of child items of this node.
-        */
-        inline QList<Item*> &children() {
-            return m_children;
-        }
+};
 
-        /**
-          \brief Returns the index of this item under its parent.
-          \retval -1 if this item has no parent.
-        */
-        inline int childIndex() const {
-            if (m_parent == 0) return -1;
-            return m_parent->m_children.indexOf(const_cast<Item*>(this));
-        }
+class RootItem: public Item {
 
-        /**
-          \brief Returns the position for where the given child item would be
-                 inserted.
-          \param[in] newItem Pointer to the item that would be inserted.
-        */
-        int indexFor(Item *newItem);
-
-        /**
-          \brief Inserts the given item as a child at the given index.
-          \pre The given index is a valid position for the item.
-          \param[in] index The child index to insert the item at.
-          \param[in] newItem The item to insert.
-        */
-        inline void insertChild(int index, Item *newItem) {
-            Q_ASSERT(newItem != 0);
-            Q_ASSERT(index >= 0 && index <= m_children.size());
-            m_children.insert(index, newItem);
-            newItem->setParent(this);
-        }
+public: /* Methods: */
 
-        template <class T>
-        T *getGroupItem(CSwordModuleInfo *module, int &outIndex) {
-            for (int i(0); i < m_children.size(); i++) {
-                Q_ASSERT(m_children.at(i)->type() == T::GROUP_TYPE);
-                T *item(static_cast<T*>(m_children.at(i)));
-                if (item->fitFor(module)) {
-                    outIndex = i;
-                    return item;
-                }
-            }
-            return 0;
-        }
+    inline RootItem()
+        : Item(Item::ITEM_ROOT) {}
 
-        /**
-          \brief Returns data for this item.
-        */
-        virtual QVariant data(int role = Qt::DisplayRole) const;
+    inline virtual bool fitFor(const CSwordModuleInfo &) const {
+        return true;
+    }
 
-        /**
-          \brief Returns the check state of this item.
-        */
-        inline Qt::CheckState checkState() const {
-            return m_checkState;
-        }
-
-        /**
-          \brief Sets the check state of this item.
-          \param[in] state new check state.
-        */
-        inline void setCheckState(const Qt::CheckState state) {
-            m_checkState = state;
-        }
+};
 
-        /**
-          \brief Returns whether this item is fit to contain the given module.
-          \param[in] module The module to check with.
-          \retval true If this item is a group and can contain the given module.
-          \retval false This item is not a group or is a wrong group.
-        */
-        inline virtual bool fitFor(CSwordModuleInfo *module) const {
-            Q_UNUSED(module);
-            return false;
-        }
+template <Item::Type TYPE>
+class GroupItem: public Item {
 
-        /**
-          \brief Comparsion operator used sorting child items.
-        */
-        virtual bool operator<(const Item &other) const;
+public: /* Methods: */
 
-    protected:
-        inline void setParent(Item *parent) {
-            Q_ASSERT(parent != 0);
-            m_parent = parent;
-        }
+    inline GroupItem()
+        : Item(TYPE) {}
 
-    protected:
-        Type           m_type;
-        Item          *m_parent;
-        QList<Item*>   m_children;
-        Qt::CheckState m_checkState;
-};
+    inline static Item::Type staticItemType() {
+        return TYPE;
+    }
 
-class RootItem: public Item {
-    public:
-        inline RootItem() : Item(Item::ITEM_ROOT) {}
 };
 
 } // Namespace BookshelfModel
diff --git a/src/backend/bookshelfmodel/languageitem.cpp b/src/backend/bookshelfmodel/languageitem.cpp
index 2fdab8b..072d720 100644
--- a/src/backend/bookshelfmodel/languageitem.cpp
+++ b/src/backend/bookshelfmodel/languageitem.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -12,22 +12,23 @@
 
 #include "backend/bookshelfmodel/languageitem.h"
 
+#include "util/geticon.h"
 
-namespace BookshelfModel {
 
-LanguageItem::LanguageItem(CSwordModuleInfo *module)
-        : Item(ITEM_LANGUAGE), m_language(module->language()) {
-    // Intentionally empty
-}
+namespace BookshelfModel {
 
 QVariant LanguageItem::data(int role) const {
     switch (role) {
+
         case Qt::DisplayRole:
             return m_language->translatedName();
+
         case Qt::DecorationRole:
-            return util::directory::getIcon("flag.svg");
+            return util::getIcon("flag.svg");
+
         default:
             return Item::data(role);
+
     }
 }
 
diff --git a/src/backend/bookshelfmodel/languageitem.h b/src/backend/bookshelfmodel/languageitem.h
index 03a9ce3..1d1d5fa 100644
--- a/src/backend/bookshelfmodel/languageitem.h
+++ b/src/backend/bookshelfmodel/languageitem.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -17,25 +17,27 @@
 
 #include "backend/bookshelfmodel/btbookshelfmodel.h"
 #include "backend/drivers/cswordmoduleinfo.h"
-#include "util/directory.h"
 
 
 namespace BookshelfModel {
 
-class LanguageItem: public Item {
-    public:
-        static const Item::Type GROUP_TYPE = Item::ITEM_LANGUAGE;
+class LanguageItem: public GroupItem<Item::ITEM_LANGUAGE> {
 
-        LanguageItem(CSwordModuleInfo *module);
+public: /* Methods: */
 
-        QVariant data(int role = Qt::DisplayRole) const;
+    inline LanguageItem(const CSwordModuleInfo & module)
+        : m_language(module.language()) {}
 
-        inline bool fitFor(CSwordModuleInfo *module) const {
-            return module->language() == m_language;
-        }
+    QVariant data(int role = Qt::DisplayRole) const;
+
+    inline bool fitFor(const CSwordModuleInfo & module) const {
+        return module.language() == m_language;
+    }
+
+private: /* Fields: */
+
+    const CLanguageMgr::Language * m_language;
 
-    protected:
-        const CLanguageMgr::Language *m_language;
 };
 
 } // namespace BookshelfModel
diff --git a/src/backend/bookshelfmodel/moduleitem.cpp b/src/backend/bookshelfmodel/moduleitem.cpp
index ca9c3fb..ffe8eb8 100644
--- a/src/backend/bookshelfmodel/moduleitem.cpp
+++ b/src/backend/bookshelfmodel/moduleitem.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -18,16 +18,9 @@
 
 namespace BookshelfModel {
 
-ModuleItem::ModuleItem(CSwordModuleInfo *module,
-                       BtBookshelfTreeModel *parentModel)
-        : Item(ITEM_MODULE), m_moduleInfo(module), m_parentModel(parentModel) {
-    Q_ASSERT(module != 0);
-    Q_ASSERT(parentModel != 0);
-}
-
 QVariant ModuleItem::data(int role) const {
     // Dispatch request to tree model:
-    return m_parentModel->data(m_moduleInfo, role);
+    return m_parentModel.data(m_moduleInfo, role);
 }
 
 } // namespace BookshelfModel
diff --git a/src/backend/bookshelfmodel/moduleitem.h b/src/backend/bookshelfmodel/moduleitem.h
index 5e6e1ba..071e3fe 100644
--- a/src/backend/bookshelfmodel/moduleitem.h
+++ b/src/backend/bookshelfmodel/moduleitem.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -24,22 +24,34 @@ class BtBookshelfTreeModel;
 namespace BookshelfModel {
 
 class ModuleItem: public Item {
-    public:
-        ModuleItem(CSwordModuleInfo *module, BtBookshelfTreeModel *parentModel);
-
-        /**
-          Reimplementation of Item::data() which dispatches all
-          requests to the parent model (BtBookshelfTreeModel).
-        */
-        virtual QVariant data(int role = Qt::DisplayRole) const;
-
-        inline CSwordModuleInfo *moduleInfo() const {
-            return m_moduleInfo;
-        }
-
-    protected:
-        CSwordModuleInfo     *m_moduleInfo;
-        BtBookshelfTreeModel *m_parentModel;
+
+public: /* Methods: */
+
+    ModuleItem(CSwordModuleInfo & module,
+               BtBookshelfTreeModel & parentModel)
+        : Item(ITEM_MODULE)
+        , m_moduleInfo(module)
+        , m_parentModel(parentModel) {}
+
+    /**
+      Reimplementation of Item::data() which dispatches all
+      requests to the parent model (BtBookshelfTreeModel).
+    */
+    virtual QVariant data(int role = Qt::DisplayRole) const;
+
+    inline CSwordModuleInfo & moduleInfo() const {
+        return m_moduleInfo;
+    }
+
+    inline virtual bool fitFor(const CSwordModuleInfo &) const {
+        return false;
+    }
+
+private: /* Fields: */
+
+    CSwordModuleInfo & m_moduleInfo;
+    BtBookshelfTreeModel & m_parentModel;
+
 };
 
 } // namespace BookshelfModel
diff --git a/src/backend/btinstallbackend.cpp b/src/backend/btinstallbackend.cpp
index c1136bf..7eb3ff4 100644
--- a/src/backend/btinstallbackend.cpp
+++ b/src/backend/btinstallbackend.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -14,9 +14,9 @@
 #include <QFile>
 #include <QFileInfo>
 #include "backend/managers/cswordbackend.h"
-#include "frontend/bookshelfmanager/btinstallmgr.h"
+#include "backend/btinstallmgr.h"
 #include "util/directory.h"
-#include "util/dialogutil.h"
+#include "frontend/messagedialog.h"
 
 // Sword includes:
 #include <filemgr.h>
@@ -31,13 +31,22 @@ namespace BtInstallBackend {
 /** Adds the source described by Source to the backend. */
 bool addSource(sword::InstallSource& source) {
     SWConfig config(configFilename().toLatin1());
-    if (!strcmp(source.type, "FTP")) {
-        //make sure the path doesn't have a trailing slash, sword doesn't like it
+    if (isRemote(source)) {
         if (source.directory[ source.directory.length()-1 ] == '/') {
-            source.directory--; //make one char shorter
+            source.directory--;
+        }
+    if (!strcmp(source.type, "FTP")) {
+            config["Sources"].insert( std::make_pair(SWBuf("FTPSource"), source.getConfEnt()) );
+        }
+        else if (!strcmp(source.type, "SFTP")) {
+            config["Sources"].insert( std::make_pair(SWBuf("SFTPSource"), source.getConfEnt()) );
+        }
+        else if (!strcmp(source.type, "HTTP")) {
+            config["Sources"].insert( std::make_pair(SWBuf("HTTPSource"), source.getConfEnt()) );
+        }
+        else if (!strcmp(source.type, "HTTPS")) {
+            config["Sources"].insert( std::make_pair(SWBuf("HTTPSSource"), source.getConfEnt()) );
         }
-
-        config["Sources"].insert( std::make_pair(SWBuf("FTPSource"), source.getConfEnt()) );
     }
     else if (!strcmp(source.type, "DIR")) {
         config["Sources"].insert( std::make_pair(SWBuf("DIRSource"), source.getConfEnt()) );
@@ -68,7 +77,7 @@ sword::InstallSource source(const QString &name) {
                     return is;
                 }
 
-                sourceBegin++;//next source
+                ++sourceBegin; //next source
             }
         }
     }
@@ -87,15 +96,10 @@ bool deleteSource(const QString &name) {
     SWConfig config(configFilename().toLatin1());
 
     //this code can probably be shortened by using the stl remove_if functionality
-    std::pair< ConfigEntMap::iterator, ConfigEntMap::iterator > range =
-        isRemote(is)
-        ? config["Sources"].equal_range("FTPSource")
-        : config["Sources"].equal_range("DIRSource");
-
-    ConfigEntMap::iterator it = range.first;
     SWBuf sourceConfigEntry = is.getConfEnt();
     bool notFound = true;
-    while (it != range.second) {
+    ConfigEntMap::iterator it = config["Sources"].begin();
+    while (it != config["Sources"].end()) {
         //SWORD lib gave us a "nice" surprise: getConfEnt() adds uid, so old sources added by BT are not recognized here
         if (it->second == sourceConfigEntry) {
             config["Sources"].erase(it);
@@ -111,8 +115,8 @@ bool deleteSource(const QString &name) {
         QStringList l = sce.split('|');
         l.removeLast();
         sce = l.join("|").append("|");
-        it = range.first;
-        while (it != range.second) {
+        it = config["Sources"].begin();
+        while (it != config["Sources"].end()) {
             if (it->second == sce) {
                 config["Sources"].erase(it);
                 break;
@@ -132,7 +136,10 @@ QList<CSwordModuleInfo*> moduleList(QString /*name*/) {
 }
 
 bool isRemote(const sword::InstallSource& source) {
-    return !strcmp(source.type, "FTP");
+    return !strcmp(source.type, "FTP") ||
+            !strcmp(source.type, "SFTP") ||
+            !strcmp(source.type, "HTTP") ||
+            !strcmp(source.type, "HTTPS");
 }
 
 QString configPath() {
@@ -171,7 +178,7 @@ bool setTargetList( const QStringList& targets ) {
     if (!i.exists() || !i.isWritable()) {
         // There is no way to save to the file
         qWarning() << "The Sword config file is not writable!";
-        util::showWarning(0, QObject::tr("Can't write file"), QObject::tr("The Sword config file can't be written!"));
+        message::showWarning(0, QObject::tr("Can't write file"), QObject::tr("The Sword config file can't be written!"));
         return false;
     }
 
@@ -179,7 +186,7 @@ bool setTargetList( const QStringList& targets ) {
     SWConfig conf(filename.toLocal8Bit());
     conf.Sections.clear();
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     // On Windows, add the sword directory to the config file.
     QString swordPath = DU::convertDirSeparators( DU::getApplicationSwordDir().absolutePath());
     conf["Install"].insert(
@@ -190,7 +197,7 @@ bool setTargetList( const QStringList& targets ) {
     bool setDataPath = false;
     for (QStringList::const_iterator it = targets.begin(); it != targets.end(); ++it) {
         QString t = DU::convertDirSeparators(*it);
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
         if (t.contains(DU::convertDirSeparators(DU::getUserHomeDir().canonicalPath().append("\\Sword")))) {
 #else
         if (t.contains(DU::getUserHomeDir().canonicalPath().append("/.sword"))) {
@@ -217,7 +224,7 @@ QStringList sourceNameList() {
     QStringList names;
 
     //add Sword remote sources
-    for (InstallSourceMap::iterator it = mgr.sources.begin(); it != mgr.sources.end(); it++) {
+    for (InstallSourceMap::iterator it = mgr.sources.begin(); it != mgr.sources.end(); ++it) {
         names << QString::fromLocal8Bit(it->second->caption);
     }
 
@@ -232,7 +239,7 @@ QStringList sourceNameList() {
             InstallSource is("DIR", sourceBegin->second.c_str());
             names << QString::fromLatin1(is.caption.c_str());
 
-            sourceBegin++;
+            ++sourceBegin;
         }
     }
 
@@ -249,7 +256,7 @@ QString swordConfigFilename() {
     namespace DU = util::directory;
 
     qDebug() << "Sword config:"
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
              << DU::getUserHomeDir().absolutePath().append("/Sword/sword.conf");
     return DU::getUserHomeDir().absolutePath().append("/Sword/sword.conf");
 //    return DU::getApplicationDir().absolutePath().append("/sword.conf");
@@ -262,27 +269,20 @@ QString swordConfigFilename() {
 QDir swordDir() {
     namespace DU = util::directory;
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     return QDir(DU::getUserHomeDir().absolutePath().append("/Sword/"));
 #else
     return QDir(DU::getUserHomeDir().absolutePath().append("/.sword/"));
 #endif
 }
 
-CSwordBackend* backend( const sword::InstallSource& is) {
-    CSwordBackend* ret = 0;
+CSwordBackend * backend(const sword::InstallSource & is) {
     /// \anchor BackendNotSingleton
-    if (isRemote(is)) {
-        ret = new CSwordBackend( QString(is.localShadow.c_str()), false );
-    }
-    else {
-        ret = new CSwordBackend( QString(is.directory.c_str()), false);
-    }
-
-    Q_ASSERT(ret);
-    if (ret) {
-        ret->initModules(CSwordBackend::OtherChange);
-    }
+    CSwordBackend * const ret = new CSwordBackend(isRemote(is)
+                                                  ? is.localShadow.c_str()
+                                                  : is.directory.c_str(),
+                                                  false);
+    ret->initModules(CSwordBackend::OtherChange);
     return ret;
 }
 
diff --git a/src/backend/btinstallbackend.h b/src/backend/btinstallbackend.h
index fc71697..1827f64 100644
--- a/src/backend/btinstallbackend.h
+++ b/src/backend/btinstallbackend.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -64,7 +66,7 @@ QString swordConfigFilename();
 QDir swordDir();
 
 /** Returns backend Sword manager for the source. */
-CSwordBackend* backend( const sword::InstallSource& is);
+CSwordBackend * backend(const sword::InstallSource & is);
 
 } // namespace BtInstallBackend
 
diff --git a/src/backend/btinstallmgr.cpp b/src/backend/btinstallmgr.cpp
new file mode 100644
index 0000000..2734dd3
--- /dev/null
+++ b/src/backend/btinstallmgr.cpp
@@ -0,0 +1,99 @@
+/*********
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#include "backend/btinstallmgr.h"
+
+#include "backend/btinstallbackend.h"
+
+
+namespace {
+
+template <typename T>
+inline T normalizeCompletionPercentage(const T value) {
+    if (value < 0)
+        return 0;
+    if (value > 100)
+        return 100;
+    return value;
+}
+
+template <typename T>
+inline int calculateIntPercentage(T done, T total) {
+    Q_ASSERT(done >= 0);
+    Q_ASSERT(total >= 0);
+
+    // Special care (see warning in BtInstallMgr::statusUpdate()).
+    if (done > total)
+        done = total;
+    if (total == 0)
+        return 100;
+
+    return normalizeCompletionPercentage<int>((done / total) * 100);
+}
+
+} // anonymous namespace
+
+using namespace sword;
+
+BtInstallMgr::BtInstallMgr(QObject * parent)
+        : QObject(parent)
+        , InstallMgr(BtInstallBackend::configPath().toLatin1(), this)
+        , m_totalBytes(1)
+        , m_completedBytes(0)
+        , m_firstCallOfPreStatus(true)
+{ // Use this class also as status reporter:
+    this->setFTPPassive(true);
+}
+
+BtInstallMgr::~BtInstallMgr() {
+    //doesn't really help because it only sets a flag
+    this->terminate(); // make sure to close the connection
+}
+
+bool BtInstallMgr::isUserDisclaimerConfirmed() const {
+    //// \todo Check from config if it's been confirmed with "don't show this anymore" checked.
+    // Create a dialog with the message, checkbox and Continue/Cancel, Cancel as default.
+    return true;
+}
+
+void BtInstallMgr::statusUpdate(double dltotal, double dlnow) {
+    /**
+      \warning Note that these *might be* rough measures due to the double data
+               type being used by Sword to store the number of bytes. Special
+               care must be taken to work around this, since the arguments may
+               contain weird values which would otherwise break this logic.
+    */
+
+    if (dltotal < 0.0) // Special care (see warning above)
+        dltotal = 0.0;
+    if (dlnow < 0.0) // Special care (see warning above)
+        dlnow = 0.0;
+
+    const int totalPercent = calculateIntPercentage<double>(dlnow + m_completedBytes,
+                                                            m_totalBytes);
+    const int filePercent  = calculateIntPercentage(dlnow, dltotal);
+
+    //qApp->processEvents();
+    emit percentCompleted(totalPercent, filePercent);
+}
+
+
+void BtInstallMgr::preStatus(long totalBytes,
+                             long completedBytes,
+                             const char * message)
+{
+    Q_UNUSED(message);
+    Q_ASSERT(completedBytes <= totalBytes);
+    if (m_firstCallOfPreStatus) {
+        m_firstCallOfPreStatus = false;
+        emit downloadStarted();
+    }
+    m_completedBytes = completedBytes;
+    m_totalBytes = totalBytes;
+}
diff --git a/src/backend/btinstallmgr.h b/src/backend/btinstallmgr.h
new file mode 100644
index 0000000..e82b470
--- /dev/null
+++ b/src/backend/btinstallmgr.h
@@ -0,0 +1,73 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#ifndef BTINSTALLMGR_H
+#define BTINSTALLMGR_H
+
+#include <QObject>
+// Sword includes:
+#include <installmgr.h>
+#include <remotetrans.h>
+
+
+/**
+* Our own reimplementation to provide installation and status bar updates.
+*/
+class BtInstallMgr
+        : public QObject
+        , public sword::InstallMgr
+        , public sword::StatusReporter
+{
+
+    Q_OBJECT
+
+public: /* Methods: */
+
+    BtInstallMgr(QObject * parent = 0);
+    ~BtInstallMgr();
+
+    virtual bool isUserDisclaimerConfirmed() const;
+
+signals:
+
+    /**
+      Download status. Percent of total and file.
+      \warning Use these values for display only, since they might be incorrect.
+    */
+    void percentCompleted(const int total, const int file);
+
+    void downloadStarted();
+
+protected: /* Methods: */
+
+    /** \note Reimplementation of sword::StatusReporter::statusUpdate(). */
+    virtual void statusUpdate(double dltotal, double dlnow);
+
+    /**
+    * \note Reimplementation of sword::StatusReporter::preStatus().
+    * \warning This method is not always called before statusUpdate().
+    * Called before starting to download each file of the module package.
+    * The sword message is not i18n'ed, it's in the form "Downloading (1 of 6): nt.bzs".
+    * This function is not utilized in the UI ATM.
+    */
+    virtual void preStatus(long totalBytes,
+                           long completedBytes,
+                           const char * message);
+
+private: /* Fields: */
+
+    long m_totalBytes;
+    long m_completedBytes;
+    bool m_firstCallOfPreStatus;
+
+};
+
+#endif /* BTINSTALLMGR_H */
diff --git a/src/backend/btinstallthread.cpp b/src/backend/btinstallthread.cpp
new file mode 100644
index 0000000..69e5fb8
--- /dev/null
+++ b/src/backend/btinstallthread.cpp
@@ -0,0 +1,143 @@
+/*********
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#include "backend/btinstallthread.h"
+
+#include <QDebug>
+#include <QDir>
+#include <QString>
+#include <QThread>
+#include "backend/managers/cswordbackend.h"
+
+#include "backend/btinstallbackend.h"
+
+// Sword includes:
+#include <filemgr.h>
+
+
+namespace {
+
+inline bool runMkdir(QDir & dir, const QString & dirName) {
+    if (!dir.exists(dirName)) {
+        if (!dir.mkpath(dirName)) {
+            qDebug() << "failed to make directory" << dirName;
+            return false;
+        }
+        qDebug() << "made directory" << dirName;
+    }
+    return true;
+}
+
+}
+
+void BtInstallThread::run() {
+    // Make sure target/mods.d and target/modules exist
+    /// \todo move this to some common precondition
+    QDir dir(m_destination);
+    if (!runMkdir(dir, m_destination)
+        || !runMkdir(dir, "modules")
+        || !runMkdir(dir, "mods.d"))
+    {
+        return;
+    }
+
+    m_stopRequestedMutex.lock();
+    try {
+        for (m_currentModuleIndex = 0;
+             !m_stopRequested && (m_currentModuleIndex < m_modules.size());
+             m_currentModuleIndex++)
+        {
+            m_stopRequestedMutex.unlock();
+            installModule();
+            m_stopRequestedMutex.lock();
+        }
+    } catch (...) {
+        m_stopRequestedMutex.unlock();
+        throw;
+    }
+    m_stopRequestedMutex.unlock();
+}
+
+void BtInstallThread::installModule() {
+    emit preparingInstall(m_currentModuleIndex);
+
+    const CSwordModuleInfo * const module = m_modules.at(m_currentModuleIndex);
+
+    sword::InstallSource installSource = BtInstallBackend::source(module->property("installSourceName").toString());
+    QScopedPointer<CSwordBackend> backendForSource(BtInstallBackend::backend(installSource));
+
+    // Check whether it's an update. If yes, remove existing module first:
+    /// \todo silently removing without undo if the user cancels the update is WRONG!!!
+    if (!removeModule()) {
+       QMutexLocker lock(&m_stopRequestedMutex);
+       if (m_stopRequested)
+           return;
+    }
+
+    // manager for the destination path
+    sword::SWMgr lMgr(m_destination.toLatin1());
+    if (BtInstallBackend::isRemote(installSource)) {
+        int status = m_iMgr.installModule(&lMgr,
+                                          0,
+                                          module->name().toLatin1(),
+                                          &installSource);
+        if (status == 0) {
+            emit statusUpdated(m_currentModuleIndex, 100);
+        } else {
+            qWarning() << "Error with install: " << status
+                       << "module:" << module->name();
+        }
+        emit installCompleted(m_currentModuleIndex, status == 0);
+    } else { // Local source
+        int status = m_iMgr.installModule(&lMgr,
+                                          installSource.directory.c_str(),
+                                          module->name().toLatin1());
+        if (status == 0) {
+            emit statusUpdated(m_currentModuleIndex, 100);
+        } else if (status != -1) {
+            qWarning() << "Error with install: " << status
+                       << "module:" << module->name();
+        }
+        emit installCompleted(m_currentModuleIndex, status == 0);
+    }
+}
+
+void BtInstallThread::slotManagerStatusUpdated(int totalProgress, int /*fileProgress*/) {
+    emit statusUpdated(m_currentModuleIndex, totalProgress);
+}
+
+void BtInstallThread::slotDownloadStarted() {
+    emit downloadStarted(m_currentModuleIndex);
+}
+
+bool BtInstallThread::removeModule() {
+    CSwordModuleInfo * const installedModule = m_modules.at(m_currentModuleIndex);
+    CSwordModuleInfo * m = CSwordBackend::instance()->findModuleByName(installedModule->name());
+    if (!m)
+        m = BtInstallBackend::backend(BtInstallBackend::source(m_destination.toLatin1()))->findModuleByName(installedModule->name());
+
+    if (!m)
+        return false;
+
+    qDebug() << "Removing module" << installedModule->name();
+    QString prefixPath = m->config(CSwordModuleInfo::AbsoluteDataPath) + "/";
+    QString dataPath = m->config(CSwordModuleInfo::DataPath);
+    if (dataPath.left(2) == "./")
+        dataPath = dataPath.mid(2);
+
+    if (prefixPath.contains(dataPath)) {
+        prefixPath.remove(prefixPath.indexOf(dataPath), dataPath.length());
+    } else {
+        prefixPath = QString::fromLatin1(CSwordBackend::instance()->prefixPath);
+    }
+
+    sword::SWMgr mgr(prefixPath.toLatin1());
+    BtInstallMgr().removeModule(&mgr, m->name().toLatin1());
+    return true;
+}
diff --git a/src/backend/btinstallthread.h b/src/backend/btinstallthread.h
new file mode 100644
index 0000000..d4cbdc3
--- /dev/null
+++ b/src/backend/btinstallthread.h
@@ -0,0 +1,94 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#ifndef BTINSTALLTHREAD_H
+#define BTINSTALLTHREAD_H
+
+#include <QThread>
+
+#include <QMutex>
+#include <QMutexLocker>
+#include <QSharedPointer>
+#include "backend/btinstallmgr.h"
+
+
+class BtInstallProgressDialog;
+class CSwordBackend;
+class CSwordModuleInfo;
+
+
+class BtInstallThread: public QThread {
+
+        Q_OBJECT
+
+    public:
+
+        BtInstallThread(const QList<CSwordModuleInfo *> & modules,
+                        const QString & destination,
+                        QObject * const parent = 0)
+            : QThread(parent)
+            , m_modules(modules)
+            , m_destination(destination)
+            , m_stopRequested(false)
+        {
+            connect(&m_iMgr, SIGNAL(percentCompleted(int, int)),
+                    this,    SLOT(slotManagerStatusUpdated(int, int)),
+                    Qt::QueuedConnection);
+            connect(&m_iMgr, SIGNAL(downloadStarted()),
+                    this,    SLOT(slotDownloadStarted()),
+                    Qt::QueuedConnection);
+        }
+
+        void stopInstall() {
+            const QMutexLocker lock(&m_stopRequestedMutex);
+            m_stopRequested = true;
+        }
+
+    signals:
+
+        /** Emitted when starting the installation. */
+        void preparingInstall(int moduleIndex);
+
+        /** Emitted when the first file download has been started. */
+        void downloadStarted(int moduleIndex);
+
+        /** Emitted when the install progress status is updated. */
+        void statusUpdated(int moduleIndex, int progressPercent);
+
+        /** Emitted when installing is complete. */
+        void installCompleted(int moduleIndex, bool success);
+
+    protected: /* Methods: */
+
+        virtual void run();
+
+    private: /* Methods: */
+
+        void installModule();
+        bool removeModule();
+
+    private slots:
+
+        void slotDownloadStarted();
+        void slotManagerStatusUpdated(int totalProgress, int fileProgress);
+
+    private: /* Fields: */
+
+        const QList<CSwordModuleInfo *> & m_modules;
+        const QString m_destination;
+        BtInstallMgr m_iMgr;
+        int m_currentModuleIndex;
+        QMutex m_stopRequestedMutex;
+        bool m_stopRequested;
+
+};
+
+#endif
diff --git a/src/backend/btmoduletreeitem.cpp b/src/backend/btmoduletreeitem.cpp
index 4c16231..7900ef0 100644
--- a/src/backend/btmoduletreeitem.cpp
+++ b/src/backend/btmoduletreeitem.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/btmoduletreeitem.h b/src/backend/btmoduletreeitem.h
index 008bfb2..189f9b2 100644
--- a/src/backend/btmoduletreeitem.h
+++ b/src/backend/btmoduletreeitem.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -115,8 +117,8 @@ class BTModuleTreeItem {
         /** When the root item is deleted the whole tree is deleted. */
         ~BTModuleTreeItem();
 
-	/** Adds filtered items to the tree */
-	void add_items(QList<BTModuleTreeItem::Filter*>& filters);
+    /** Adds filtered items to the tree */
+    void add_items(QList<BTModuleTreeItem::Filter*>& filters);
 
         /**
         * Returns the item type.
@@ -168,10 +170,10 @@ class BTModuleTreeItem {
         /** Helper function for creating a group item while creating the tree. */
         BTModuleTreeItem* create_parent_item(BTModuleTreeItem* parent, const QString& text, BTModuleTreeItem::Type type, CSwordModuleInfo::Category category = CSwordModuleInfo::UnknownCategory);
 
-	static bool m_map_initialized;
-	static QMap<CSwordModuleInfo::Category, QString> m_CategoryNamesMap;
-	
-	
+    static bool m_map_initialized;
+    static QMap<CSwordModuleInfo::Category, QString> m_CategoryNamesMap;
+
+
         CSwordModuleInfo* m_moduleInfo;
         QString m_text;
         BTModuleTreeItem* m_firstChild;
diff --git a/src/backend/config/btconfig.cpp b/src/backend/config/btconfig.cpp
new file mode 100644
index 0000000..e76b246
--- /dev/null
+++ b/src/backend/config/btconfig.cpp
@@ -0,0 +1,363 @@
+/*********
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#include "btconfig.h"
+
+#include <QDebug>
+#include <QLocale>
+#include "backend/btmoduletreeitem.h"
+#include "backend/managers/cdisplaytemplatemgr.h"
+#include "frontend/messagedialog.h"
+#include "util/directory.h" // DU::getUserBaseDir()
+
+// Sword includes:
+#include <backend/managers/cswordbackend.h>
+#include <versekey.h> // For search scope configuration
+
+
+#define BTCONFIG_API_VERSION 1
+namespace {
+const QString BTCONFIG_API_VERSION_KEY = "btconfig_api_version";
+}
+
+
+/*
+ * set the instance variable initially to 0, so it can be safely checked
+ * whether the variable has been initialized yet.
+ */
+BtConfig * BtConfig::m_instance = NULL;
+
+BtConfig::StringMap BtConfig::m_defaultSearchScopes;
+
+
+BtConfig::BtConfig(const QString & settingsFile)
+    : BtConfigCore(settingsFile)
+{
+    Q_ASSERT_X(!m_instance, "BtConfig", "Already initialized!");
+    m_instance = this;
+
+    if (m_defaultSearchScopes.isEmpty()) {
+        m_defaultSearchScopes.insert(tr("Old testament"),          QString("Gen - Mal"));
+        m_defaultSearchScopes.insert(tr("Moses/Pentateuch/Torah"), QString("Gen - Deut"));
+        m_defaultSearchScopes.insert(tr("History"),                QString("Jos - Est"));
+        m_defaultSearchScopes.insert(tr("Prophets"),               QString("Isa - Mal"));
+        m_defaultSearchScopes.insert(tr("New testament"),          QString("Mat - Rev"));
+        m_defaultSearchScopes.insert(tr("Gospels"),                QString("Mat - Joh"));
+        m_defaultSearchScopes.insert(tr("Letters/Epistles"),       QString("Rom - Jude"));
+        m_defaultSearchScopes.insert(tr("Paul's Epistles"),        QString("Rom - Phile"));
+    }
+}
+
+bool BtConfig::initBtConfig() {
+    Q_ASSERT(!m_instance);
+
+    const QString confFileName = util::directory::getUserBaseDir().absolutePath()
+                                 + "/bibletimerc";
+    bool confExisted = QFile::exists(confFileName);
+    m_instance = new BtConfig(confFileName);
+    if (!confExisted) {
+        m_instance->setValue<int>(BTCONFIG_API_VERSION_KEY, BTCONFIG_API_VERSION);
+        return true;
+    }
+
+    int btConfigOldApi = m_instance->value<int>(BTCONFIG_API_VERSION_KEY, 0);
+    if (btConfigOldApi == BTCONFIG_API_VERSION)
+        return true;
+
+    bool cont;
+    if (btConfigOldApi < BTCONFIG_API_VERSION) {
+        /// \todo Migrate from btConfigOldApi to BTCONFIG_API_VERSION
+        qWarning() << "BibleTime configuration migration is not yet implemented!!!";
+        cont = message::showWarning(
+                    0, "Warning!",
+                    "Migration to the new configuration system is not yet "
+                    "implemented. Proceeding might result in <b>loss of data"
+                    "</b>. Please backup your configuration files before you "
+                    "continue!<br/><br/>Do you want to continue? Press \"No\" "
+                    "to quit BibleTime immediately.",
+                    QMessageBox::Yes | QMessageBox::No,
+                    QMessageBox::No) == QMessageBox::Yes;
+    } else {
+        Q_ASSERT(btConfigOldApi > BTCONFIG_API_VERSION);
+        cont = message::showWarning(
+                    0, tr("Error loading configuration!"),
+                    tr("Failed to load BibleTime's configuration, because it "
+                       "appears that the configuration file corresponds to a "
+                       "newer version of BibleTime. This is likely caused by "
+                       "BibleTime being downgraded. Loading the new "
+                       "configuration file may result in <b>loss of data</b>."
+                       "<br/><br/>Do you still want to try to load the new "
+                       "configuration file? Press \"No\" to quit BibleTime "
+                       "immediately."),
+                    QMessageBox::Yes | QMessageBox::No,
+                    QMessageBox::No) == QMessageBox::Yes;
+    }
+    if (cont)
+        m_instance->setValue<int>(BTCONFIG_API_VERSION_KEY, BTCONFIG_API_VERSION);
+    return cont;
+}
+
+BtConfig& BtConfig::getInstance() {
+    Q_ASSERT_X(m_instance, "BtConfig", "Not yet initialized!");
+    return *m_instance;
+}
+
+void BtConfig::destroyInstance() {
+    delete m_instance;
+    m_instance = NULL;
+}
+
+void BtConfig::setModuleEncryptionKey(const QString & name,
+                                      const QString & key)
+{
+    Q_ASSERT(!name.isEmpty());
+    setValue("Module keys/" + name, key);
+}
+
+QString BtConfig::getModuleEncryptionKey(const QString & name) {
+    Q_ASSERT(!name.isEmpty());
+    return value<QString>("Module keys/" + name, QString::null);
+}
+
+QHash<QString, QList<QKeySequence> > BtConfig::getShortcuts(const QString & shortcutGroup) {
+    beginGroup(shortcutGroup);
+        QHash<QString, QList<QKeySequence> > allShortcuts;
+        Q_FOREACH (const QString & key, childKeys()) {
+            QVariant variant = qVariantValue(key);
+
+            QList<QKeySequence> shortcuts;
+
+            if (variant.type() == QVariant::List) { // For BibleTime before 2.9
+                Q_FOREACH (const QVariant & shortcut, variant.toList())
+                    shortcuts.append(shortcut.toString());
+            } else if (variant.type() == QVariant::StringList
+                       || variant.type() == QVariant::String)
+            { // a StringList with one element is recognized as a QVariant::String
+                Q_FOREACH (const QString & shortcut, variant.toStringList())
+                    shortcuts.append(shortcut);
+            } else { // it's something we don't know, skip it
+                continue;
+            }
+
+            allShortcuts.insert(key, shortcuts);
+        }
+    endGroup();
+    return allShortcuts;
+}
+
+void BtConfig::setShortcuts(const QString & shortcutGroup,
+                            const QHash<QString, QList<QKeySequence> > & shortcuts)
+{
+    typedef QHash<QString, QList<QKeySequence> >::const_iterator SHMCI;
+
+    beginGroup(shortcutGroup);
+        for (SHMCI it = shortcuts.begin(); it != shortcuts.end(); ++it) {
+            // Write beautiful string lists (since 2.9):
+            /// \note saving QKeySequences directly doesn't appear to work!
+            QStringList varList;
+            Q_FOREACH (const QKeySequence & shortcut, it.value())
+                varList.append(shortcut.toString());
+
+            if (!varList.empty())
+                setValue(it.key(), varList);
+        }
+    endGroup();
+}
+
+FilterOptions BtConfig::getFilterOptions() {
+    FilterOptions os;
+    beginGroup("presentation");
+    os.footnotes           = sessionValue<bool>("footnotes", true);
+    os.strongNumbers       = sessionValue<bool>("strongNumbers", true);
+    os.headings            = sessionValue<bool>("headings", true);
+    os.morphTags           = sessionValue<bool>("morphTags", true);
+    os.lemmas              = sessionValue<bool>("lemmas", true);
+    os.redLetterWords      = sessionValue<bool>("redLetterWords", true);
+    os.hebrewPoints        = sessionValue<bool>("hebrewPoints", true);
+    os.hebrewCantillation  = sessionValue<bool>("hebrewCantillation", true);
+    os.greekAccents        = sessionValue<bool>("greekAccents", true);
+    os.textualVariants     = sessionValue<bool>("textualVariants", false);
+    os.scriptureReferences = sessionValue<bool>("scriptureReferences", true);
+    os.morphSegmentation   = sessionValue<bool>("morphSegmentation", true);
+    endGroup();
+    return os;
+}
+
+void BtConfig::setFilterOptions(const FilterOptions & os) {
+    beginGroup("presentation");
+    setSessionValue("footnotes", static_cast<bool>(os.footnotes));
+    setSessionValue("strongNumbers", static_cast<bool>(os.strongNumbers));
+    setSessionValue("headings", static_cast<bool>(os.headings));
+    setSessionValue("morphTags", static_cast<bool>(os.morphTags));
+    setSessionValue("lemmas", static_cast<bool>(os.lemmas));
+    setSessionValue("redLetterWords", static_cast<bool>(os.redLetterWords));
+    setSessionValue("hebrewPoints", static_cast<bool>(os.hebrewPoints));
+    setSessionValue("hebrewCantillation", static_cast<bool>(os.hebrewCantillation));
+    setSessionValue("greekAccents", static_cast<bool>(os.greekAccents));
+    setSessionValue("textualVariants", static_cast<bool>(os.textualVariants));
+    setSessionValue("scriptureReferences", static_cast<bool>(os.scriptureReferences));
+    setSessionValue("morphSegmentation", static_cast<bool>(os.morphSegmentation));
+    endGroup();
+}
+
+DisplayOptions BtConfig::getDisplayOptions() {
+    DisplayOptions os;
+    beginGroup("presentation");
+    os.lineBreaks   = sessionValue<bool>("lineBreaks", false);
+    os.verseNumbers = sessionValue<bool>("verseNumbers", false);
+    endGroup();
+    return os;
+}
+
+void BtConfig::setDisplayOptions(const DisplayOptions & os) {
+    beginGroup("presentation");
+    setSessionValue("lineBreaks", static_cast<bool>(os.lineBreaks));
+    setSessionValue("verseNumbers", static_cast<bool>(os.verseNumbers));
+    endGroup();
+}
+
+void BtConfig::setFontForLanguage(const CLanguageMgr::Language & language,
+                                  const FontSettingsPair & fontSettings)
+{
+    const QString & englishName = language.englishName();
+    Q_ASSERT(!englishName.isEmpty());
+
+    QMutexLocker lock(&this->m_mutex);
+    // write the language to the settings
+    setValue("fonts/" + englishName, fontSettings.second.toString());
+    setValue("font standard settings/" + englishName, fontSettings.first);
+
+    // Remove language from the cache:
+    m_fontCache.remove(&language);
+}
+
+BtConfig::FontSettingsPair BtConfig::getFontForLanguage(
+        const CLanguageMgr::Language & language)
+{
+    const QString & englishName = language.englishName();
+    Q_ASSERT(!englishName.isEmpty());
+
+    QMutexLocker lock(&this->m_mutex);
+    // Check the cache first:
+    FontCacheMap::const_iterator it(m_fontCache.find(&language));
+    if (it != m_fontCache.end())
+        return *it;
+
+    // Retrieve the font from the settings
+    FontSettingsPair fontSettings;
+
+    fontSettings.first = value<bool>("font standard settings/" + englishName, false);
+
+    QFont font;
+    if (fontSettings.first) {
+        if (!font.fromString(value<QString>("fonts/" + englishName, getDefaultFont().toString()))) {
+            /// \todo
+        }
+    } else {
+        font = getDefaultFont();
+    }
+    fontSettings.second = font;
+
+    // Cache the value:
+    m_fontCache.insert(&language, fontSettings);
+
+    return fontSettings;
+}
+
+BtConfig::StringMap BtConfig::getSearchScopesForCurrentLocale() {
+    StringMap map = value<BtConfig::StringMap>("properties/searchScopes", m_defaultSearchScopes);
+
+    // Convert map to current locale:
+    sword::VerseKey vk;
+    for (StringMap::Iterator it = map.begin(); it != map.end(); it++) {
+        QString &s = it.value();
+        sword::ListKey list(vk.parseVerseList(QByteArray(s.toUtf8()), "Genesis 1:1", true));
+        s.clear();
+        for (int i = 0; i < list.getCount(); i++) {
+            s.append(QString::fromUtf8(list.getElement(i)->getRangeText()));
+            s.append("; ");
+        }
+    }
+    return map;
+}
+
+void BtConfig::setSearchScopesWithCurrentLocale(StringMap searchScopes) {
+    /**
+     * We want to make sure that the search scopes are saved with english
+     * key names so loading them will always work with each locale set.
+     */
+    sword::VerseKey vk;
+    BtConfig::StringMap::Iterator iter = searchScopes.begin();
+    while (iter != searchScopes.end()) {
+        QString &data = iter.value();
+        bool parsingWorked = true;
+        sword::ListKey list(vk.parseVerseList(data.toUtf8(), "Genesis 1:1", true));
+        data.clear();
+        for (int i = 0; i < list.getCount(); i++) {
+            sword::VerseKey * verse(dynamic_cast<sword::VerseKey *>(list.getElement(i)));
+
+            if (verse != 0) {
+                verse->setLocale("en");
+                data.append(QString::fromUtf8(verse->getRangeText()));
+                data.append(";");
+            } else {
+                parsingWorked = false;
+                break;
+            }
+        }
+
+        if (parsingWorked)
+            iter++;
+        else
+            iter = searchScopes.erase(iter);
+    }
+    setValue("properties/searchScopes", searchScopes);
+}
+
+void BtConfig::deleteSearchScopesWithCurrentLocale() {
+    remove("properties/searchScopes");
+}
+
+CSwordModuleInfo *BtConfig::getDefaultSwordModuleByType(const QString & moduleType) {
+    const QString moduleName = value<QString>("settings/defaults/" + moduleType, QString());
+    if (moduleName.isEmpty())
+        return 0;
+
+    return CSwordBackend::instance()->findModuleByName(moduleName);
+}
+
+void BtConfig::setDefaultSwordModuleByType(const QString &moduleType,
+                                           const CSwordModuleInfo * const module)
+{
+    setValue("settings/defaults/" + moduleType,
+             module != 0 ? module->name() : QString::null);
+}
+
+/**
+  \todo -CDisplayWindow gets a construct method that reads from config and constructs and
+        returns the respective child window (check whether module is installed...)
+        -CDisplayWindows get a new variable "id" or something, which is a unique identifier.
+        The path in the configuration will use this id as name. (who gives out the IDs?)
+        -values are updated as they are changed, just like the rest of bibletime
+        -QMdiArea::subWindowActivated signal will trigger reading the window order and saving
+        it to the config.
+        Action Plan:
+        1. get current code to work with old session system
+        2. move complete code over to BtConfig
+        3. remove CBTConfig
+        4. implement BtConfig infrastructure for saving window configuration
+         - function to add a window
+         - function to remove a window
+         - specify how to save ordering
+        5. change CDisplayWindows to write all state changes to the configuration
+        6. implement BtConfig::readSession and callers
+        7. make session handling code work with QSetting paths instead of properties
+        8. add gui for new session handling
+        9. remove old gui for session handling
+*/
diff --git a/src/backend/config/btconfig.h b/src/backend/config/btconfig.h
new file mode 100644
index 0000000..be19d41
--- /dev/null
+++ b/src/backend/config/btconfig.h
@@ -0,0 +1,248 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#ifndef BTCONFIG_H
+#define BTCONFIG_H
+
+#include <QDataStream>
+#include <QFont>
+#include <QHash>
+#include <QKeySequence>
+#include <QMetaType>
+#include <QSet>
+#include <QSettings>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
+
+#include "backend/config/btconfigcore.h"
+
+#include "backend/btmoduletreeitem.h" // for BTModuleTreeItem::Grouping
+#include "backend/drivers/cswordmoduleinfo.h"
+#include "btglobal.h"
+
+
+class BibleTimeApp;
+
+class BtConfig: public BtConfigCore {
+
+    Q_DISABLE_COPY(BtConfig)
+
+    friend class BibleTimeApp;
+
+public: /* Types: */
+
+    /*!
+    * The first parameter indicates whether the custom font should be used or not.
+    * The second parameter is the custom font that has been set.
+    */
+    typedef QPair<bool, QFont> FontSettingsPair;
+    typedef QMap<QString, QString> StringMap;
+
+private: /* Types: */
+
+    typedef QHash<const CLanguageMgr::Language *, FontSettingsPair> FontCacheMap;
+
+public: /* Methods: */
+
+    static BtConfig & getInstance();
+
+    /*!
+     * \brief Function to set a module decryption key.
+     *
+     * This helper function will set a module decryption key
+     * in the configuration. Any previous key will be overwritten.
+     *
+     * \param[in] name Name of module to set the key for
+     * \param[in] key Decryption key to set as string
+     */
+    void setModuleEncryptionKey(const QString & name, const QString & key);
+
+    /*!
+     * \brief Function to get a module decryption key.
+     *
+     * This helper function will retrieve a previously set
+     * module decryption key from the configuration. If the key
+     * is not set it will return a null string.
+     *
+     * \param[in] name Name of module to retrieve the key for
+     * \returns Decryption key as a string
+     */
+    QString getModuleEncryptionKey(const QString & name);
+
+    /*!
+     * \brief Gets the shortcuts for the given group.
+     *
+     * Returns a hash of shortcuts for strings for the respective
+     * shortcut group.
+     * \param[in] shortcutGroup The group to retrieve shortcuts for.
+     * \returns Hash of strings and lists of shortcuts.
+     */
+    QHash<QString, QList<QKeySequence> > getShortcuts(const QString & shortcutGroup);
+
+    /*!
+     * \brief Sets the shortcuts for the given group.
+     *
+     * Writes a hash of shortcuts for strings for the respective
+     * shortcut group.
+     * \param[in] shortcutGroup The group to retrieve shortcuts for.
+     * \param[in] Hash of strings and lists of shortcuts to write.
+     */
+    void setShortcuts(const QString & shortcutGroup,
+                      const QHash<QString, QList<QKeySequence> > & shortcuts);
+
+    /*!
+     * \brief Returns current filter options.
+     *
+     * Returns a structure containing the current
+     * settings to be used for filtering.
+     *
+     * \returns FilterOptions structure containing filter settings.
+     */
+    FilterOptions getFilterOptions();
+
+    /*!
+     * \brief Saves the current filter options.
+     *
+     * \param[in] options The filter options to save.
+     */
+    void setFilterOptions(const FilterOptions & options);
+
+    /*!
+     * \brief Returns current display options.
+     *
+     * Returns a structure containing the current
+     * settings to be used for displaying texts.
+     *
+     * \returns DisplayOptions structure containing display settings.
+     */
+    DisplayOptions getDisplayOptions();
+
+    /*!
+     * \brief Saves the current display options.
+     *
+     * \param[in] options The display options to save.
+     */
+    void setDisplayOptions(const DisplayOptions & options);
+
+    /*!
+     * Returns a default font that is suitable for the current language.
+     * \returns QFont suitable for current language.
+     */
+    inline const QFont & getDefaultFont() const {
+        QMutexLocker lock(&this->m_mutex);
+        return m_defaultFont;
+    }
+
+    /// \todo: put FontSettingsPair in QVariant directly
+    /*!
+     * \brief Set font for a language.
+     *
+     * Sets a FontSettingsPair for the language given.
+     * \param[in] language pointer to a language to set the font for
+     * \param[in] fontSettings FontSettingsPair to set
+     */
+    void setFontForLanguage(const CLanguageMgr::Language & language,
+                            const FontSettingsPair & fontSettings);
+
+    /*!
+     * \brief Get font for a language.
+     *
+     * Gets a FontSettingsPair for the language given. If no font has been saved
+     * a default font is returned.
+     * \param[in] language pointer to a language to get the font for.
+     * \returns FontSettingsPair for given language
+     */
+    FontSettingsPair getFontForLanguage(const CLanguageMgr::Language & language);
+
+    /// \todo: unit test these functions
+    /*!
+     * Returns the searchScopes for the current locale.
+     *
+     * This function retrieves the search scopes of the
+     * "properties/searchScopes" property and converts them
+     * to the current locale.
+     *
+     * \returns Search scopes in current locale.
+     */
+    StringMap getSearchScopesForCurrentLocale();
+
+    /*!
+     * Sets the searchScopes given in the current locale.
+     *
+     * This function sets the search scopes of the
+     * "properties/searchScopes" property, the scopes are
+     * converted to the english locale before saving them.
+     *
+     * \param[in] searchScopes Search scopes in any locale.
+     */
+    void setSearchScopesWithCurrentLocale(StringMap searchScopes);
+
+    /*!
+      * Deletes the searchScopes given in the current locale.
+      */
+    void deleteSearchScopesWithCurrentLocale();
+
+    /*!
+     * \brief Returns default sword module info class for a given module type.
+     *
+     * This is basically a convenience function for getting the respective
+     * "settings/defaults/ *" variable and searching that module manually.
+     * If module is not installed 0 will be returned.
+     * \param[in] moduleType module type to return the default sword module info for
+     * \returns sword module info pointer or 0
+     */
+    CSwordModuleInfo * getDefaultSwordModuleByType(const QString & moduleType);
+
+    /*!
+     * \brief Sets the default sword module for a module type.
+     *
+     * This is basically a convenience function for setting the "settings/defaults/ *"
+     * variables to the module->name() string manually.
+     * 0 is allowed as the module, then the default module will be unset.
+     * \param[in] moduleType module type to set
+     * \param[in] module the sword module info to set as default module
+     */
+    void setDefaultSwordModuleByType(const QString & moduleType,
+                                     const CSwordModuleInfo * const module);
+
+private: /* Methods: */
+
+    explicit BtConfig(const QString & settingsFile);
+
+    static bool initBtConfig();
+
+    static void destroyInstance();
+
+private: /* Fields: */
+
+    static BtConfig * m_instance; //!< singleton instance
+
+    QFont m_defaultFont; //!< default font used when no special one is set
+    FontCacheMap m_fontCache; //!< a cache for the fonts saved in the configuration file for speed
+
+    static StringMap m_defaultSearchScopes;
+
+};
+
+// declare types used in configuration as metatype so they can be saved directly into the configuration
+Q_DECLARE_METATYPE(BtConfig::StringMap)
+Q_DECLARE_METATYPE(QList<int>)
+
+/*!
+ * \brief This is a shortchand for BtConfig::getInstance().
+ * \returns BtConfig singleton instance.
+ */
+inline BtConfig & btConfig() {
+    return BtConfig::getInstance();
+}
+
+#endif // BTCONFIG_H
diff --git a/src/backend/config/btconfigcore.cpp b/src/backend/config/btconfigcore.cpp
new file mode 100644
index 0000000..0914508
--- /dev/null
+++ b/src/backend/config/btconfigcore.cpp
@@ -0,0 +1,202 @@
+/*********
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#include "btconfigcore.h"
+
+#include <cstddef>
+#include <limits>
+
+
+const QString BtConfigCore::GROUP_SESSIONS      = "sessions/";
+const QString BtConfigCore::KEY_CURRENT_SESSION = "sessions/currentSession";
+const QString BtConfigCore::GROUP_SESSION       = "sessions/%1/";
+const QString BtConfigCore::KEY_SESSION_NAME    = "sessions/%1/name";
+const QString BtConfigCore::UI_FONT_SIZE        = "ui/fontSize";
+
+
+BtConfigCore::BtConfigCore(const QString & settingsFile)
+    : m_mutex(QMutex::Recursive)
+    , m_settings(settingsFile, QSettings::IniFormat)
+{
+    /**
+      \todo Read UI language from settings, and initialize translator for tr()
+            strings.
+    */
+
+    // Read all session keys and names:
+    m_settings.beginGroup(GROUP_SESSIONS);
+    const QStringList sessionKeys = m_settings.childGroups();
+    m_settings.endGroup();
+    Q_FOREACH (const QString & sessionKey, sessionKeys) {
+        // Skip empty//keys just in case:
+        if (sessionKey.isEmpty())
+            continue;
+
+        const QString fullKey = KEY_SESSION_NAME.arg(sessionKey);
+        const QString sessionName = m_settings.value(fullKey).toString();
+        if (!sessionName.isEmpty())
+            m_sessionNames.insert(sessionKey, sessionName);
+    }
+
+    // Get current session key:
+    m_currentSessionKey = m_settings.value(KEY_CURRENT_SESSION).toString();
+
+    /*
+      If no session with the current session key exists, default to the first
+      session found. If no sessions were found, create a default session.
+    */
+    if (m_currentSessionKey.isEmpty()
+        || !m_sessionNames.contains(m_currentSessionKey))
+    {
+        if (m_sessionNames.isEmpty()) {
+            const QString &newSessionName = QString::number((qulonglong) 0u, 36);
+            m_currentSessionKey = newSessionName;
+            m_settings.setValue(KEY_CURRENT_SESSION, newSessionName);
+            m_settings.setValue(KEY_SESSION_NAME.arg(newSessionName),
+                                tr("Default Session"));
+        } else {
+            m_currentSessionKey = m_sessionNames.keys().first();
+        }
+    }
+    m_cachedCurrentSessionGroup = GROUP_SESSION.arg(m_currentSessionKey);
+}
+
+void BtConfigCore::setCurrentSession(const QString & key) {
+    Q_ASSERT(!key.isEmpty());
+
+    QMutexLocker lock(&m_mutex);
+    Q_ASSERT(m_sessionNames.contains(key));
+    m_currentSessionKey = key;
+    m_cachedCurrentSessionGroup = GROUP_SESSION.arg(key);
+
+    m_settings.setValue(KEY_CURRENT_SESSION, key);
+    m_settings.sync();
+}
+
+QString BtConfigCore::addSession(const QString & name) {
+    Q_ASSERT(!name.isEmpty());
+
+    // Generate a new session key:
+    QString key = QString::number(0u, 36);
+    QMutexLocker lock(&m_mutex);
+    if (m_sessionNames.contains(key)) {
+        QString keyPrefix;
+        std::size_t i = 1u;
+        for (;;) {
+            key = QString::number(i, 36);
+            if (!m_sessionNames.contains(keyPrefix + key))
+                break;
+            if (i == std::numeric_limits<std::size_t>::max()) {
+                i = 0u;
+                keyPrefix.append('_');
+            } else {
+                i++;
+            }
+        };
+    }
+    Q_ASSERT(!m_sessionNames.contains(key));
+    m_sessionNames.insert(key, name);
+
+    m_settings.setValue(KEY_SESSION_NAME.arg(key), name);
+    m_settings.sync();
+    return key;
+}
+
+
+void BtConfigCore::deleteSession(const QString & key) {
+    QMutexLocker lock(&m_mutex);
+    Q_ASSERT(m_sessionNames.contains(key));
+    Q_ASSERT(key != m_currentSessionKey);
+    m_sessionNames.remove(key);
+
+    m_settings.remove(GROUP_SESSIONS + key);
+    m_settings.sync();
+}
+
+QStringList BtConfigCore::childKeys() {
+    QMutexLocker lock(&m_mutex);
+    return childGroups__();
+}
+
+QStringList BtConfigCore::childKeys__() {
+    if (m_groups.isEmpty())
+        return m_settings.childKeys();
+
+    m_settings.beginGroup(group());
+    const QStringList gs = m_settings.childKeys();
+    m_settings.endGroup();
+    return gs;
+}
+
+QStringList BtConfigCore::childKeys(const QString & subkey) {
+    beginGroup(subkey);
+    QStringList gs = childKeys__();
+    endGroup();
+    return gs;
+}
+
+QStringList BtConfigCore::childGroups() {
+    QMutexLocker lock(&m_mutex);
+    return childGroups__();
+}
+
+QStringList BtConfigCore::childGroups__() {
+    if (m_groups.isEmpty())
+        return m_settings.childGroups();
+
+    m_settings.beginGroup(group());
+    const QStringList gs = m_settings.childGroups();
+    m_settings.endGroup();
+    return gs;
+}
+
+QStringList BtConfigCore::childGroups(const QString & subkey) {
+    beginGroup(subkey);
+    QStringList gs = childGroups__();
+    endGroup();
+    return gs;
+}
+
+QStringList BtConfigCore::sessionChildGroups() {
+    QMutexLocker lock(&m_mutex);
+    return sessionChildGroups__();
+}
+
+QStringList BtConfigCore::sessionChildGroups__() {
+    QMutexLocker lock(&m_mutex);
+    m_settings.beginGroup(m_cachedCurrentSessionGroup + group());
+    const QStringList gs = m_settings.childGroups();
+    m_settings.endGroup();
+    return gs;
+}
+
+QStringList BtConfigCore::sessionChildGroups(const QString & subkey) {
+    beginGroup(subkey);
+    QStringList gs = sessionChildGroups__();
+    endGroup();
+    return gs;
+}
+
+void BtConfigCore::remove(const QString & key) {
+    QMutexLocker lock(&m_mutex);
+    if (m_groups.isEmpty()) {
+        m_settings.remove(key);
+    } else {
+        m_settings.remove(m_groups.join("/") + '/' + key);
+    }
+}
+
+void BtConfigCore::sessionRemove(const QString & key) {
+    QMutexLocker lock(&m_mutex);
+    if (m_groups.isEmpty()) {
+        m_settings.remove(m_cachedCurrentSessionGroup + key);
+    } else {
+        m_settings.remove(m_cachedCurrentSessionGroup + m_groups.join("/") + '/' + key);
+    }
+}
diff --git a/src/backend/config/btconfigcore.h b/src/backend/config/btconfigcore.h
new file mode 100644
index 0000000..5c24b4f
--- /dev/null
+++ b/src/backend/config/btconfigcore.h
@@ -0,0 +1,342 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#ifndef BTCONFIGCORE_H
+#define BTCONFIGCORE_H
+
+#include <QSettings>
+
+#include <QCoreApplication>
+#include <QHash>
+#include <QMutex>
+#include <QStringList>
+
+
+/**
+  \note Session keys are QStrings because we even want to handle cases where the
+        configuration file is manually changed. When creating new sessions, they
+        are still generated from unsigned integers.
+*/
+class BtConfigCore {
+
+    Q_DISABLE_COPY(BtConfigCore)
+    Q_DECLARE_TR_FUNCTIONS(BtConfigCore)
+
+public: /* Types: */
+
+    typedef QHash<QString, QString> SessionNamesHashMap;
+
+public: /* Methods: */
+
+    /**
+      \param[in] settingsFile The filename of the settings file.
+    */
+    explicit BtConfigCore(const QString & settingsFile);
+
+    inline ~BtConfigCore() { sync(); }
+
+
+    /**
+      \returns the key of the current session.
+    */
+    inline const QString & currentSessionKey() const {
+        QMutexLocker lock(&m_mutex);
+        return m_currentSessionKey;
+    }
+
+    /**
+      \returns the name of the current session.
+    */
+    inline const QString & currentSessionName() const {
+        QMutexLocker lock(&m_mutex);
+        typedef QHash<QString, QString>::const_iterator SSHCI;
+        SSHCI it = m_sessionNames.constFind(m_currentSessionKey);
+        Q_ASSERT(it != m_sessionNames.constEnd());
+        return it.value();
+    }
+
+    /**
+      \returns a hashmap with the keys and printable names of the sessions.
+    */
+    inline const SessionNamesHashMap & sessionNames() const {
+        QMutexLocker lock(&m_mutex);
+        return m_sessionNames;
+    }
+
+    /**
+      \brief Notifies the configuration system that the session settings
+             should be read from and saved to the given session.
+
+      \pre The session with the given key must exist.
+      \param[in] key the key of the session to switch to.
+      \post the sessionValue() and value() methods will work with the settings
+            of the given session.
+    */
+    void setCurrentSession(const QString & key);
+
+    /**
+      \brief Creates a new session with the given name.
+
+      \pre The given name must not be an empty string.
+      \param[in] name the name of the session
+      \returns the key of the created session.
+    */
+    QString addSession(const QString & name);
+
+    /**
+      \brief Deletes the session with the given key.
+
+      \pre The session with the given key must exist.
+      \pre The session with the given key must not be the current session.
+      \param[in] key the key of the session to delete.
+      \post The session with the given key and its settings are deleted.
+      \returns whether deleting the session was successful.
+    */
+    void deleteSession(const QString & key);
+
+    /**
+      \brief Returns the settings value for the given global key.
+
+      \param[in] key Key to get the value for.
+      \param[in] defaultValue The value to return if no saved value is found.
+      \returns the value of type specified by the template parameter.
+    */
+    template<typename T>
+    inline T value(const QString & key, const T & defaultValue = T()) {
+        QMutexLocker lock(&m_mutex);
+        return m_settings.value(group() + key,
+                                QVariant::fromValue(defaultValue)).template value<T>();
+    }
+
+    /**
+      \brief Returns the settings value for the given global key as a QVariant.
+
+      \param[in] key Key to get the value for.
+      \param[in] defaultValue The value to return if no saved value is found.
+      \returns the value.
+    */
+    inline QVariant qVariantValue(const QString & key,
+                                  const QVariant & defaultValue = QVariant())
+    {
+        QMutexLocker lock(&m_mutex);
+        return m_settings.value(group() + key,
+                                QVariant::fromValue(defaultValue));
+    }
+
+    /**
+      \brief Returns the settings value for the given session key.
+
+      \param[in] key Session key to get the value for.
+      \param[in] defaultValue The value to return if no saved value is found.
+      \returns the value of type specified by the template parameter.
+    */
+    template<typename T>
+    inline T sessionValue(const QString & key, const T & defaultValue = T()) {
+        QMutexLocker lock(&m_mutex);
+        return m_settings.value(m_cachedCurrentSessionGroup + group() + key,
+                                QVariant::fromValue(defaultValue)).template value<T>();
+    }
+
+    /**
+      \brief Sets a value for a global settings key.
+
+      \param[in] key Ket to set.
+      \param[in] value Value to set.
+    */
+    template<typename T>
+    inline void setValue(const QString & key, const T & value) {
+        QMutexLocker lock(&m_mutex);
+        m_settings.setValue(group() + key, QVariant::fromValue<T>(value));
+    }
+
+    /**
+      \brief Sets a value for a session settings key.
+
+      \param[in] key Ket to set.
+      \param[in] value Value to set.
+    */
+    template<typename T>
+    inline void setSessionValue(const QString & key, const T & value) {
+        QMutexLocker lock(&m_mutex);
+        m_settings.setValue(m_cachedCurrentSessionGroup + group() + key,
+                            QVariant::fromValue<T>(value));
+    }
+
+    /**
+      \returns a list of first-level keys in the current group in global settings.
+    */
+    QStringList childKeys();
+
+    /**
+      \pre subkey is not empty
+      \param[in] subkey the subkey
+      \returns a list of keys under the current group and subkey in global settings.
+    */
+    QStringList childKeys(const QString & subkey);
+
+    /**
+      \returns a list of first-level groups in the current group in global settings.
+    */
+    QStringList childGroups();
+
+    /**
+      \pre subkey is not empty
+      \param[in] subkey the subkey
+      \returns a list of groups under the current group and subkey in global settings.
+    */
+    QStringList childGroups(const QString & subkey);
+
+    /**
+      \returns a list of first-level groups in the current group in session settings.
+    */
+    QStringList sessionChildGroups();
+
+    /**
+      \pre subkey is not empty
+      \param[in] subkey the subkey
+      \returns a list of groups under the current group and subkey in session settings.
+    */
+    QStringList sessionChildGroups(const QString & subkey);
+
+    /**
+      \brief removes a key all its children from global settings.
+
+      \param[in] key the key to remove
+    */
+    void remove(const QString & key);
+
+    /**
+      \brief removes a key all its children from session settings.
+
+      \param[in] key the key to remove
+    */
+    void sessionRemove(const QString & key);
+
+    /**
+      \brief Synchronize the underlying QSettings.
+    */
+    inline void sync() {
+        QMutexLocker lock(&m_mutex);
+        m_settings.sync();
+    }
+
+    /**
+      \brief Appends the given prefix to the current group.
+
+      The current group is automatically prepended to all keys when reading or
+      writing settings values. The behaviour is similar to QSettings::beginGroup().
+
+      \warning Locks the object (recursively) until endGroup().
+
+      \param[in] prefix the prefix to append
+    */
+    inline void beginGroup(QString prefix) {
+        Q_ASSERT(!prefix.isEmpty());
+        while (prefix.startsWith('/'))
+            prefix.remove(0, 1);
+        Q_ASSERT(!prefix.isEmpty());
+        while (prefix.endsWith('/'))
+            prefix.chop(1);
+        Q_ASSERT(!prefix.isEmpty());
+
+        m_mutex.lock();
+        m_groups.append(prefix);
+        m_cachedGroup = QString();
+    }
+
+    /**
+      \brief Resets the current group to its previous value.
+
+      Call this function after you are done with a started group. Every call to
+      beginGroup() must be matched with a call to this function in the same
+      thread.
+
+      \warning Locks the object (recursively) until endGroup().
+    */
+    inline void endGroup() {
+        Q_ASSERT_X(!m_groups.isEmpty(), "BtConfig", "endGroup() called, but no beginGroup() active.");
+        m_groups.removeLast();
+        m_cachedGroup = QString();
+        m_mutex.unlock();
+    }
+
+    /**
+      \brief Returns the current group.
+
+      Returns the group the BtConfig is currently set to. It will contain a
+      trailing / so is suitable to be preprended to a key directly.
+
+      \returns the group string or an empty string if no group is set.
+    */
+    inline QString group() const {
+        QMutexLocker lock(&m_mutex);
+        if (m_cachedGroup.isNull()) {
+            m_cachedGroup = m_groups.isEmpty()
+                            ? ""
+                            : m_groups.join("/") + '/';
+        }
+        return m_cachedGroup;
+    }
+
+private: /* Methods: */
+
+    /**
+      \Brief Same childKeys(), but not thread-safe.
+      \returns a list of first-level keys in the current group in global settings.
+    */
+    QStringList childKeys__();
+
+    /**
+      \Brief Same childGroups(), but not thread-safe.
+      \returns a list of first-level groups in the current group in global settings.
+    */
+    QStringList childGroups__();
+
+    /**
+      \Brief Same sessionChildGroups(), but not thread-safe.
+      \returns a list of first-level groups in the current group in session settings.
+    */
+    QStringList sessionChildGroups__();
+
+protected: /* Fields: */
+
+    /** Required for asynchronous access */
+    mutable QMutex m_mutex;
+
+private: /* Fields: */
+
+    /** Underlying backend */
+    QSettings m_settings;
+
+    /** List of active group prefixes */
+    QStringList m_groups;
+
+    /** Cached group() string or QString::null if not cached */
+    mutable QString m_cachedGroup;
+
+    /** Index of currently active session */
+    QString m_currentSessionKey;
+
+    /** Cached group name of the currently active session */
+    mutable QString m_cachedCurrentSessionGroup;
+
+    /** Keys and names all sessions */
+    SessionNamesHashMap m_sessionNames;
+
+    // Helper key strings:
+    static const QString GROUP_SESSIONS;
+    static const QString KEY_CURRENT_SESSION;
+    static const QString GROUP_SESSION;
+    static const QString KEY_SESSION_NAME;
+    static const QString UI_FONT_SIZE;
+};
+
+#endif // BTCONFIGCORE_H
diff --git a/src/backend/config/cbtconfig.cpp b/src/backend/config/cbtconfig.cpp
deleted file mode 100644
index d82fc7d..0000000
--- a/src/backend/config/cbtconfig.cpp
+++ /dev/null
@@ -1,776 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#include "backend/config/cbtconfig.h"
-
-#include <QDebug>
-#include <QLocale>
-#include <QSettings>
-#include <QVariant>
-#include <QWebSettings>
-#include "backend/btmoduletreeitem.h"
-#include "backend/managers/cdisplaytemplatemgr.h"
-#include "btglobal.h"
-#include "frontend/displaywindow/btactioncollection.h"
-#include "frontend/searchdialog/btsearchoptionsarea.h"
-#include "util/directory.h"
-
-// Sword includes:
-#include <versekey.h> // For range configuration
-
-
-namespace CBTConfig {
-namespace {
-
-typedef QMap<const CLanguageMgr::Language*, FontSettingsPair> FontCacheMap;
-
-QFont        *m_defaultFont = 0;
-FontCacheMap  m_fontCache;
-
-QString getKey(const strings ID) {
-    switch (ID) {
-        case bibletimeVersion:
-            return "bibletimeVersion";
-        case language:
-            return "language";
-        case displayStyle:
-            return "displayStyle";
-        case bookshelfCurrentItem:
-            return "bookshelfCurrentItem";
-    }
-    return QString::null;
-}
-
-QString getKey(const modules ID) {
-    switch (ID) {
-        case standardBible:
-            return "standardBible";
-        case standardCommentary:
-            return "standardCommentary";
-        case standardLexicon:
-            return "standardLexicon";
-        case standardDailyDevotional:
-            return "standardDailyDevotional";
-        case standardHebrewStrongsLexicon:
-            return "standardHebrewLexicon";
-        case standardGreekStrongsLexicon:
-            return "standardGreekLexicon";
-        case standardHebrewMorphLexicon:
-            return "standardHebrewMorphLexicon";
-        case standardGreekMorphLexicon:
-            return "standardGreekMorphLexicon";
-    }
-    return QString::null;
-}
-
-QString getKey(const bools ID) {
-    switch (ID) {
-        case firstSearchDialog:
-            return "firstSearchDialog";
-        case readOldBookmarks:
-            return "readOldBookmarks";
-
-        case showMainWindowToolbar:
-            return "showMainWindowToolbar";
-        case mainIndex:
-            return "mainIndex";
-        case infoDisplay:
-            return "infoDisplay";
-
-        case autoTileVertical:
-            return "autoTileVertical";
-        case autoTileHorizontal:
-            return "autoTileHorizontal";
-        case autoTile:
-            return "autoTile";
-        case autoTabbed:
-            return "autoTabbed";
-        case autoCascade:
-            return "autoCascade";
-
-        case lineBreaks:
-            return "lineBreaks";
-        case verseNumbers:
-            return "verseNumbers";
-
-        case logo:
-            return "logo";
-        case autoDeleteOrphanedIndices:
-            return "autoDeleteOrphanedIndices";
-        case crashedLastTime:
-            return "crashedLastTime";
-        case crashedTwoTimes:
-            return "crashedTwoTimes";
-
-        case bookshelfShowHidden:
-            return "bookshelfShowHidden";
-        case allowNetworkConnection:
-            return "allowNetworkConnection";
-
-        case showTextWindowHeaders:
-            return "showTextWindowHeaders";
-        case showTextWindowNavigator:
-            return "showTextWindowNavigator";
-        case showTextWindowModuleSelectorButtons:
-            return "showTextWindowModuleSelectorButtons";
-        case showFormatToolbarButtons:
-            return "showFormatToolbarButtons";
-        case showTextWindowToolButtons:
-            return "showTextWindowToolButtons";
-        case showToolbarsInEachWindow:
-            return "showToolbarsInEachWindow";
-        case showTipAtStartup:
-            return "showTipAtStartup";
-        default:
-            Q_ASSERT(false);
-            return QString::null;
-    }
-}
-
-QString getKey(const ints ID) {
-    switch (ID) {
-        case footnotes:
-            return "footnotes";
-        case strongNumbers:
-            return "strongNumbers";
-        case headings:
-            return "headings";
-        case morphTags:
-            return "morphTags";
-        case lemmas:
-            return "lemmas";
-        case hebrewPoints:
-            return "hebrewPoints";
-        case hebrewCantillation:
-            return "hebrewCantillation";
-        case greekAccents:
-            return "greekAccents";
-        case textualVariants:
-            return "textualVariants";
-        case scriptureReferences:
-            return "scriptureReferences";
-        case morphSegmentation:
-            return "morphSegmentation";
-        case bookshelfContentsX:
-            return "bookshelfContentsX";
-        case bookshelfContentsY:
-            return "bookshelfContentsY";
-        case magDelay:
-            return "magDelay";
-        case bookshelfGrouping:
-            return "bookshelfGrouping";
-        case mainindexActiveTab:
-            return "mainindexActiveTab";
-        case searchDialogWidth:
-            return "searchDialogWidth";
-        case searchDialogHeight:
-            return "searchDialogHeight";
-        case searchDialogX:
-            return "searchDialogX";
-        case searchDialogY:
-            return "searchDialogY";
-        case searchType:
-            return "searchType";
-        case installPathIndex:
-            return "installPathIndex";
-        case bookshelfPosX:
-            return "bookshelfPosX";
-        case bookshelfPosY:
-            return "bookshelfPosY";
-        case bookshelfHeight:
-            return "bookshelfHeight";
-        case bookshelfWidth:
-            return "bookshelfWidth";
-        case configDialogPosX:
-            return "configDialogPosX";
-        case configDialogPosY:
-            return "configDialogPosY";
-        case configDialogHeight:
-            return "configDialogHeight";
-        case configDialogWidth:
-            return "configDialogWidth";
-        case tipNumber:
-            return "tipNumber";
-        default:
-            Q_ASSERT(false);
-            return QString::null;
-    }
-}
-
-QString getKey(const intLists ID) {
-    switch (ID) {
-        case leftPaneSplitterSizes:
-            return "leftPaneSplitterSizes";
-        case mainSplitterSizes:
-            return "mainSplitterSizes";
-        case searchMainSplitterSizes:
-            return "searchMainSplitterSizes";
-        case searchResultSplitterSizes:
-            return "searchResultSplitterSizes";
-    }
-    return QString::null;
-}
-
-QString getKey(const stringLists ID) {
-    switch (ID) {
-        case searchCompletionTexts:
-            return "searchCompletionTexts";
-        case searchTexts:
-            return "searchTexts";
-        case searchModulesHistory:
-            return "searchModulesHistory";
-        case bookshelfOpenGroups:
-            return "bookshelfOpenGroups";
-        case hiddenModules:
-            return "hiddenModules";
-        default:
-            Q_ASSERT(false);
-            return QString::null;
-    }
-}
-
-QString getKey(const stringMaps ID) {
-    Q_ASSERT(ID == searchScopes);
-    return "SearchScopes";
-}
-
-QString getKey(const CLanguageMgr::Language * const language) {
-    Q_ASSERT(!language->name().isEmpty());
-    return language->name();
-}
-
-} // anonymous namespace
-
-QString IntListToString(const QList<int> &intList) {
-    QStringList intStrings;
-    Q_FOREACH (int i, intList) {
-        intStrings << QString::number(i);
-    }
-    return intStrings.join(",");
-}
-
-QList<int> StringToIntList(const QString &intListString,
-                           bool *ok,
-                           QString::SplitBehavior splitBehavior)
-{
-    QList<int> intList;
-    if (ok != 0) {
-        *ok = true;
-
-        if (!intListString.isEmpty()) {
-            Q_FOREACH (const QString &intString, intListString.split(',', splitBehavior)) {
-                int i = intString.trimmed().toInt(ok);
-                if (!(*ok))
-                    break;
-
-                intList << i;
-            }
-        }
-    } else {
-        if (!intListString.isEmpty()) {
-            Q_FOREACH (const QString &intString, intListString.split(',', splitBehavior)) {
-                intList << intString.trimmed().toInt();
-            }
-        }
-    }
-    return intList;
-}
-
-QString getDefault(const strings ID) {
-    switch (ID) {
-        case bibletimeVersion:
-            return "0.0"; // main() will realize this and set the value to VERSION
-        case language:
-            return QLocale::system().name();
-        case displayStyle:
-            return CDisplayTemplateMgr::defaultTemplateName();
-        case bookshelfCurrentItem:
-        default:
-            return QString::null;
-    }
-}
-
-QString getDefault(const modules ID) {
-    switch (ID) {
-        case standardBible:
-            return "KJV";
-        case standardCommentary:
-            return "MHC";
-        case standardLexicon:
-            return "ISBE";
-        case standardDailyDevotional:
-            return ""; // No default
-
-        case standardHebrewStrongsLexicon:
-            return "StrongsHebrew";
-        case standardGreekStrongsLexicon:
-            return "StrongsGreek";
-        case standardHebrewMorphLexicon:
-            return "StrongsHebrew";
-        case standardGreekMorphLexicon:
-            return "StrongsGreek";
-        default:
-            return QString::null;
-    }
-}
-
-bool getDefault(const bools ID) {
-    switch (ID) {
-        case firstSearchDialog:
-        case showMainWindowToolbar:
-        case mainIndex:
-        case infoDisplay:
-        case autoTileVertical:
-        case verseNumbers:
-        case logo:
-        case autoDeleteOrphanedIndices:
-        case showTextWindowHeaders:
-        case showTextWindowNavigator:
-        case showTextWindowModuleSelectorButtons:
-        case showTextWindowToolButtons:
-        case showFormatToolbarButtons:
-        case showToolbarsInEachWindow:
-        case showTipAtStartup:
-            return true;
-        case readOldBookmarks:
-        case autoTileHorizontal:
-        case autoTile:
-        case autoTabbed:
-        case autoCascade:
-        case lineBreaks:
-        case crashedLastTime:
-        case crashedTwoTimes:
-        case bookshelfShowHidden:
-        case allowNetworkConnection:
-        default:
-            return false;
-    }
-}
-
-int getDefault(const ints ID) {
-    switch (ID) {
-        case bookshelfGrouping:
-            return BTModuleTreeItem::CatLangMod;
-        case searchType:
-            return Search::BtSearchOptionsArea::AndType;
-        case searchDialogHeight:
-        case magDelay:
-            return 400;
-        case searchDialogWidth:
-        case searchDialogX:
-        case searchDialogY:
-            return 200;
-        case footnotes:
-        case strongNumbers:
-        case headings:
-        case morphTags:
-        case lemmas:
-        case hebrewPoints:
-        case hebrewCantillation:
-        case greekAccents:
-        case scriptureReferences:
-        case morphSegmentation:
-        case bookshelfPosX:
-        case bookshelfPosY:
-        case bookshelfHeight:
-        case bookshelfWidth:
-        case configDialogPosX:
-        case configDialogPosY:
-        case configDialogHeight:
-        case configDialogWidth:
-            return 1;
-        case textualVariants:
-        case bookshelfContentsX:
-        case bookshelfContentsY:
-        case mainindexActiveTab:
-        case installPathIndex:
-        case tipNumber:
-        default:
-            return 0;
-    }
-}
-
-QList<int> getDefault(const intLists /*ID*/) {
-     return QList<int>();
-}
-
-QStringList getDefault(const stringLists ID) {
-    if (ID == searchTexts) {
-        QStringList list;
-        list.append(QString::null);
-        return list;
-    } else {
-        return QStringList();
-    }
-}
-
-StringMap getDefault(const stringMaps ID) {
-    Q_ASSERT(ID == searchScopes);
-
-    StringMap map;
-    map.insert(QObject::tr("Old testament"),          QString("Gen - Mal"));
-    map.insert(QObject::tr("Moses/Pentateuch/Torah"), QString("Gen - Deut"));
-    map.insert(QObject::tr("History"),                QString("Jos - Est"));
-    map.insert(QObject::tr("Prophets"),               QString("Isa - Mal"));
-    map.insert(QObject::tr("New testament"),          QString("Mat - Rev"));
-    map.insert(QObject::tr("Gospels"),                QString("Mat - Joh"));
-    map.insert(QObject::tr("Letters/Epistles"),       QString("Rom - Jude"));
-    map.insert(QObject::tr("Paul's Epistles"),        QString("Rom - Phile"));
-
-    // Make the list to the current bookname language!
-    sword::VerseKey vk;
-    vk.setLocale("en_US");
-
-    for (StringMap::Iterator it(map.begin()); it != map.end(); it++) {
-        sword::ListKey list(vk.ParseVerseList(it.value().toLocal8Bit(), "Genesis 1:1", true));
-        QString data;
-        for (int i(0); i < list.Count(); i++) {
-            data.append(QString::fromUtf8(list.getElement(i)->getRangeText()));
-            data.append("; ");
-        }
-        map[it.key()] = data;
-    };
-
-    return map;
-}
-
-QFont &getDefault(const CLanguageMgr::Language * const) {
-    // Language specific lookup of the font name
-    if (m_defaultFont)
-        return *m_defaultFont;
-
-    /// \todo make the font name and size a configuration option
-
-    m_defaultFont = new QFont();
-    m_defaultFont->setPointSize(12);
-    return *m_defaultFont;
-}
-
-QString get(const strings ID) {
-    QVariant v = getConfig()->value("strings/" + getKey(ID));
-    if (v.isValid())
-        return v.toString();
-
-    return getDefault(ID);
-}
-
-CSwordModuleInfo *get(const modules ID) {
-    QVariant v = getConfig()->value("modules/" + getKey(ID));
-    CSwordBackend *b = CSwordBackend::instance();
-    if (v.isValid())
-        return b->findModuleByName(v.toString());
-
-    return b->findModuleByName(getDefault(ID));
-}
-
-bool get(const bools ID) {
-    QVariant v = getConfig()->value("bools/" + getKey(ID));
-    if (v.isValid())
-        return v.toBool();
-
-    return getDefault(ID);
-}
-
-int get(const ints ID) {
-    QVariant v = getConfig()->value("ints/" + getKey(ID));
-    if (v.isValid())
-        return v.toInt();
-
-    return getDefault(ID);
-}
-
-QList<int> get(const intLists ID) {
-    QVariant v = getConfig()->value("intlists/" + getKey(ID));
-    if (v.isValid()) {
-        bool ok;
-        QList<int> r = StringToIntList(v.toString(), &ok);
-        if (ok)
-            return r;
-    }
-    return getDefault(ID);
-}
-
-QStringList get(const stringLists ID) {
-    QVariant v = getConfig()->value("stringlists/" + getKey(ID));
-    if (v.isValid())
-        return v.toStringList();
-
-    return getDefault(ID);
-}
-
-StringMap get(const stringMaps ID) {
-    Q_ASSERT(ID == searchScopes);
-
-    QSettings *s = getConfig();
-    s->beginGroup(getKey(ID));
-    const QStringList keys = s->childKeys();
-
-    if (keys.isEmpty()) {
-        s->endGroup();
-        return getDefault(ID);
-    }
-
-    /**
-      Make sure we return the scopes in the chosen language. saved
-      keys are in english.
-    */
-    StringMap map;
-    sword::VerseKey vk;
-    Q_FOREACH (const QString &key, keys) {
-        if (key.isEmpty())
-            continue;
-
-        QByteArray b = s->value(key).toString().toUtf8();
-        sword::ListKey list(vk.ParseVerseList(b, "Genesis 1:1", true));
-        QString data;
-        for (int i = 0; i < list.Count(); i++) {
-            data.append(QString::fromUtf8(list.getElement(i)->getRangeText()));
-            data.append("; ");
-        }
-        map[key] = data; // Set the new data
-    }
-    s->endGroup();
-    return map;
-}
-
-FontSettingsPair get(const CLanguageMgr::Language * const language) {
-    // Check the cache first:
-    FontCacheMap::const_iterator it = m_fontCache.find(language);
-    if (it != m_fontCache.end())
-        return *it;
-
-    QSettings *s = getConfig();
-    FontSettingsPair fontSettings;
-    fontSettings.first = s->value("font standard settings/" + getKey(language), false).toBool();
-
-    if (fontSettings.first) {
-        QVariant v = s->value("fonts/" + getKey(language));
-        if (v.isValid()) {
-            fontSettings.second.fromString(v.toString());
-        } else {
-            fontSettings.second = getDefault(language);
-        }
-    } else {
-        fontSettings.second = getDefault(language);
-    }
-
-    // Cache the value:
-    m_fontCache.insert(language, fontSettings);
-
-    return fontSettings;
-}
-
-void set(const strings ID, const QString &value) {
-    getConfig()->setValue("strings/" + getKey(ID), value);
-}
-
-void set(const modules ID, CSwordModuleInfo * const value) {
-    getConfig()->setValue("modules/" + getKey(ID), value ? value->name() : QString::null);
-}
-
-void set(const modules ID, const QString &value) {
-    CSwordModuleInfo *module(CSwordBackend::instance()->findModuleByName(value));
-    if (module) {
-        set(ID, module);
-    }
-}
-
-void set(const bools ID, const bool value) {
-    getConfig()->setValue("bools/" + getKey(ID), value);
-}
-
-void set(const ints ID, const int value) {
-    getConfig()->setValue("ints/" + getKey(ID), value);
-}
-
-void set(const intLists ID, const QList<int> &value) {
-    getConfig()->setValue("intlists/" + getKey(ID), IntListToString(value));
-}
-
-void set(const stringLists ID, const QStringList &value) {
-    getConfig()->setValue("stringlists/" + getKey(ID), value);
-}
-
-void set(const stringMaps ID, const StringMap &value) {
-    typedef StringMap::ConstIterator SMCI;
-    using namespace sword;
-
-    QSettings *s = getConfig();
-    s->beginGroup(getKey(ID));
-
-    // Clear all entries of this group to make sure old stuff gets removed:
-    s->remove("");
-
-    switch (ID) {
-        case searchScopes: {
-            /**
-              We want to make sure that the search scopes are saved with english
-              key names so loading them will always work with each locale set.
-            */
-            VerseKey vk;
-            for (SMCI it(value.begin()); it != value.end(); it++) {
-                QString data;
-                ListKey list(vk.ParseVerseList(it.value().toUtf8(), "Genesis 1:1", true));
-                for (int i(0); i < list.Count(); i++) {
-                    VerseKey *range(dynamic_cast<VerseKey*>(list.getElement(i)));
-                    if (range) {
-                        range->setLocale("en");
-                        data.append(QString::fromUtf8( range->getRangeText() ));
-                        data.append(";");
-                    }
-                }
-                s->setValue(it.key(), data);
-            }
-            break;
-        }
-        default: {
-            for (SMCI it(value.begin()); it != value.end(); it++) {
-                s->setValue(it.key(), it.value());
-            }
-            break;
-        }
-    }
-    s->endGroup();
-}
-
-void set(const CLanguageMgr::Language * const language,
-         const FontSettingsPair& value)
-{
-    QSettings *s = getConfig();
-    QString lang = getKey(language);
-    s->setValue("fonts/" + lang, value.second.toString());
-    s->setValue("font standard settings/" + lang, value.first);
-
-    // Remove language from the cache:
-    m_fontCache.remove(language);
-}
-
-DisplayOptions getDisplayOptionDefaults() {
-    DisplayOptions options;
-    options.lineBreaks   = get(lineBreaks);
-    options.verseNumbers = get(verseNumbers);
-    return options;
-}
-
-FilterOptions getFilterOptionDefaults() {
-    FilterOptions options;
-
-    options.footnotes           = true; // Required for the info display
-    options.strongNumbers       = true; // get(strongNumbers);
-    options.headings            = get(headings);
-    options.morphTags           = true; // Required for the info display
-    options.lemmas              = true; // Required for the info display
-    options.redLetterWords      = true;
-    options.hebrewPoints        = get(hebrewPoints);
-    options.hebrewCantillation  = get(hebrewCantillation);
-    options.greekAccents        = get(greekAccents);
-    options.textualVariants     = get(textualVariants);
-    options.scriptureReferences = get(scriptureReferences);
-    options.morphSegmentation   = get(morphSegmentation);
-
-    return options;
-}
-
-void setupAccelSettings(const keys type,
-                        BtActionCollection * const actionCollection)
-{
-    const char *groupName ="";
-    switch (type) {
-        case allWindows:
-            groupName = "Displaywindow shortcuts";
-            break;
-        case writeWindow:
-            groupName = "Writewindow shortcuts";
-            break;
-        case readWindow:
-            groupName = "Readwindow shortcuts";
-            break;
-        case bookWindow:
-            groupName = "Book shortcuts";
-            break;
-        case bibleWindow:
-            groupName =  "Bible shortcuts";
-            break;
-        case commentaryWindow:
-            groupName = "Commentary shortcuts";
-            break;
-        case lexiconWindow:
-            groupName = "Lexicon shortcuts";
-            break;
-        case application:
-            groupName = "Application shortcuts";
-            break;
-    }
-
-    actionCollection->setConfigGroup(groupName);
-    actionCollection->readSettings();
-}
-
-void saveAccelSettings(const keys type,
-                       BtActionCollection * const actionCollection)
-{
-    const char *groupName ="";
-    switch (type) {
-        case allWindows:
-            groupName = "Displaywindow shortcuts";
-            break;
-        case writeWindow:
-            groupName = "Writewindow shortcuts";
-            break;
-        case readWindow:
-            groupName = "Readwindow shortcuts";
-            break;
-        case bookWindow:
-            groupName = "Book shortcuts";
-            break;
-        case bibleWindow:
-            groupName = "Bible shortcuts";
-            break;
-        case commentaryWindow:
-            groupName = "Commentary shortcuts";
-            break;
-        case lexiconWindow:
-            groupName = "Lexicon shortcuts";
-            break;
-        case application:
-            groupName = "Application shortcuts";
-            break;
-    }
-
-    actionCollection->setConfigGroup(groupName);
-    actionCollection->writeSettings();
-}
-
-
-QString getModuleEncryptionKey(const QString &module) {
-    Q_ASSERT(!module.isEmpty());
-    static const QString nullString;
-
-    QVariant v = getConfig()->value("Module keys/" + module);
-    if (v.isValid())
-        return v.toString();
-
-    return nullString;
-}
-
-void setModuleEncryptionKey(const QString &module, const QString &key) {
-    getConfig()->setValue("Module keys/" + module, key);
-}
-
-QSettings *getConfig() {
-    namespace DU = util::directory;
-    static QSettings config(DU::getUserBaseDir().absolutePath() + "/bibletimerc", QSettings::IniFormat);
-    return &config;
-}
-
-void syncConfig() {
-    getConfig()->sync();
-}
-
-} // namespace CBTConfig
diff --git a/src/backend/config/cbtconfig.h b/src/backend/config/cbtconfig.h
deleted file mode 100644
index f3fa042..0000000
--- a/src/backend/config/cbtconfig.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#ifndef CBTCONFIG_H
-#define CBTCONFIG_H
-
-#include <QString>
-#include <QFont>
-#include <QList>
-#include <QMap>
-#include "backend/managers/cswordbackend.h"
-
-class QSettings;
-class BtActionCollection;
-
-/**
- * This class is the interface to the config object of BibleTime
- * @author The BibleTime team
- */
-namespace CBTConfig {
-
-typedef QMap<QString, QString> StringMap;
-typedef std::pair<bool, QFont> FontSettingsPair;
-
-enum strings {
-    bibletimeVersion,
-    language,
-    displayStyle,
-    bookshelfCurrentItem
-};
-enum modules {
-    standardBible = 0, // Just to make sure, default is IMHO 0, so that's redundant here
-    standardCommentary,
-    standardLexicon,
-    standardDailyDevotional,
-    standardHebrewStrongsLexicon,
-    standardGreekStrongsLexicon,
-    standardHebrewMorphLexicon,
-    standardGreekMorphLexicon,
-    lastModuleType = standardGreekMorphLexicon
-};
-enum bools {
-    firstSearchDialog,
-    readOldBookmarks,
-
-    showMainWindowToolbar,
-    mainIndex,
-    infoDisplay,
-
-    autoTileVertical,
-    autoTileHorizontal,
-    autoTile,
-    autoTabbed,
-    autoCascade,
-
-    lineBreaks,
-    verseNumbers,
-
-    logo,
-    autoDeleteOrphanedIndices,
-    crashedLastTime,
-    crashedTwoTimes,
-
-    bookshelfShowHidden,
-
-    allowNetworkConnection,
-
-    showTextWindowHeaders,
-    showTextWindowNavigator,
-    showTextWindowToolButtons,
-    showTextWindowModuleSelectorButtons,
-    showFormatToolbarButtons,
-    showToolbarsInEachWindow,
-    showTipAtStartup
-};
-enum ints {
-    footnotes,
-    strongNumbers,
-    headings,
-    morphTags,
-    lemmas,
-    hebrewPoints,
-    hebrewCantillation,
-    greekAccents,
-    textualVariants,
-    scriptureReferences,
-    morphSegmentation,
-
-    bookshelfContentsX,
-    bookshelfContentsY,
-    magDelay, /* The delay until a mouse move makes the content appear in the mag */
-    bookshelfGrouping,
-    mainindexActiveTab,
-
-    searchDialogWidth,
-    searchDialogHeight,
-    searchDialogX,
-    searchDialogY,
-    searchType,
-
-    installPathIndex,
-
-    bookshelfPosX,
-    bookshelfPosY,
-    bookshelfHeight,
-    bookshelfWidth,
-
-    configDialogPosX,
-    configDialogPosY,
-    configDialogHeight,
-    configDialogWidth,
-    tipNumber
-};
-enum intLists {
-    leftPaneSplitterSizes,
-    mainSplitterSizes,
-    searchMainSplitterSizes,
-    searchResultSplitterSizes
-};
-enum stringLists {
-    searchCompletionTexts,
-    searchTexts,
-    searchModulesHistory,
-    bookshelfOpenGroups,
-    hiddenModules
-};
-enum keys {
-    allWindows,
-    readWindow,
-    writeWindow,
-    bookWindow,
-    bibleWindow,
-    commentaryWindow,
-    lexiconWindow,
-    application
-};
-enum stringMaps {
-    searchScopes
-};
-
-QString IntListToString(const QList<int> &intList);
-QList<int> StringToIntList(const QString &intListString,
-                           bool *ok = 0,
-                           QString::SplitBehavior splitBehavior = QString::KeepEmptyParts);
-
-QString     getDefault(const strings);
-QString     getDefault(const modules);
-bool        getDefault(const bools);
-int         getDefault(const ints);
-QList<int>  getDefault(const intLists);
-QStringList getDefault(const stringLists);
-StringMap   getDefault(const stringMaps);
-QFont      &getDefault(const CLanguageMgr::Language * const);
-
-QString           get(const strings);
-CSwordModuleInfo *get(const modules);
-bool              get(const bools);
-int               get(const ints);
-QList<int>        get(const intLists);
-QStringList       get(const stringLists);
-StringMap         get(const stringMaps);
-FontSettingsPair  get(const CLanguageMgr::Language * const);
-
-void set(const strings,     const QString           &value);
-void set(const modules,     CSwordModuleInfo * const module);
-void set(const modules,     const QString           &moduleName);
-void set(const bools,       const bool               value);
-void set(const ints,        const int                value);
-void set(const intLists,    const QList<int>        &value);
-void set(const stringLists, const QStringList       &value);
-void set(const stringMaps,  const StringMap         &value);
-void set(const CLanguageMgr::Language * const language,
-         const FontSettingsPair &fontSettings);
-
-FilterOptions  getFilterOptionDefaults();
-DisplayOptions getDisplayOptionDefaults();
-
-void setupAccelSettings(const keys type,
-                        BtActionCollection * const actionCollection);
-void saveAccelSettings (const keys type,
-                        BtActionCollection * const actionCollection);
-
-QString getModuleEncryptionKey(const QString &name);
-void    setModuleEncryptionKey(const QString &name, const QString &key);
-
-/**
-  Re-reads the config from disk.
-*/
-void syncConfig();
-
-/**
-  Returns the config object.
-*/
-QSettings* getConfig();
-
-} // namespace CBTConfig
-
-#endif
diff --git a/src/backend/cswordmodulesearch.cpp b/src/backend/cswordmodulesearch.cpp
index 694151d..799032b 100644
--- a/src/backend/cswordmodulesearch.cpp
+++ b/src/backend/cswordmodulesearch.cpp
@@ -2,16 +2,19 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
 
+#include <QDebug>
+
 #include "backend/cswordmodulesearch.h"
 
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/managers/cswordbackend.h"
 #include "btglobal.h"
+#include "util/tool.h"
 
 
 void CSwordModuleSearch::startSearch() {
@@ -20,7 +23,7 @@ void CSwordModuleSearch::startSearch() {
     m_foundItems = 0;
 
     /// \todo What is the purpose of the following statement?
-    CSwordBackend::instance()->setFilterOptions(CBTConfig::getFilterOptionDefaults());
+    CSwordBackend::instance()->setFilterOptions(btConfig().getFilterOptions());
 
     // Search module-by-module:
     Q_FOREACH(const CSwordModuleInfo *m, m_searchModules) {
@@ -61,3 +64,287 @@ QList<const CSwordModuleInfo*> CSwordModuleSearch::unindexedModules(
     }
     return unindexed;
 }
+
+QString CSwordModuleSearch::highlightSearchedText(const QString& content, const QString& searchedText) {
+    QString ret = content;
+
+    const Qt::CaseSensitivity cs = Qt::CaseInsensitive;
+
+    //   int index = 0;
+    int index = ret.indexOf("<body", 0);
+    int matchLen = 0;
+    int length = searchedText.length();
+
+    // Highlighting constants -
+    // \todo We need to make the highlight color configurable.
+    const QString rep1("<span style=\"background-color:#FFFF66;\">");
+    const QString rep2("</span>");
+    const unsigned int repLength = rep1.length() + rep1.length();
+    const QString rep3("style=\"background-color:#FFFF66;\" ");
+    const unsigned int rep3Length = rep3.length();
+
+
+    QString newSearchText;
+
+    newSearchText = searchedText;
+
+    // find the strongs search lemma and highlight it
+    // search the searched text for "strong:" until it is not found anymore
+    QStringList list;
+
+    // split the search string - some possibilities are "\\s|\\|", "\\s|\\+", or "\\s|\\|\\+"
+    // \todo find all possible seperators
+    QString regExp = "\\s";
+    list = searchedText.split(QRegExp(regExp));
+    foreach (QString newSearchText, list) {
+        int sstIndex; // strong search text index for finding "strong:"
+        int idx1, idx2;
+        QString sNumber, lemmaText;
+
+        sstIndex = newSearchText.indexOf("strong:");
+        if (sstIndex == -1)
+            continue;
+
+        // set the start index to the start of <body>
+        int strongIndex = index;
+
+        // Get the strongs number from the search text.
+        // First, find the first space after "strong:"
+        sstIndex = sstIndex + 7;
+        // get the strongs number -> the text following "strong:" to the end of the string.
+        sNumber = newSearchText.mid(sstIndex, -1);
+        // find all the "lemma=" inside the the content
+        while ((strongIndex = ret.indexOf("lemma=", strongIndex, cs)) != -1) {
+            // get the strongs number after the lemma and compare it with the
+            // strongs number we are looking for
+            idx1 = ret.indexOf("\"", strongIndex) + 1;
+            idx2 = ret.indexOf("\"", idx1 + 1);
+            lemmaText = ret.mid(idx1, idx2 - idx1);
+
+            // this is interesting because we could have a strongs number like: G3218|G300
+            // To handle this we will use some extra cpu cycles and do a partial match against
+            // the lemmaText
+            if (lemmaText.contains(sNumber)) {
+                // strongs number is found now we need to highlight it
+                // I believe the easiest way is to insert rep3 just before "lemma="
+                ret = ret.insert(strongIndex, rep3);
+                strongIndex += rep3Length;
+            }
+            strongIndex += 6; // 6 is the length of "lemma="
+        }
+    }
+    //---------------------------------------------------------------------
+    // now that the strong: stuff is out of the way continue with
+    // other search options
+    //---------------------------------------------------------------------
+
+    // try to figure out how to use the lucene query parser
+
+    //using namespace lucene::queryParser;
+    //using namespace lucene::search;
+    //using namespace lucene::analysis;
+    //using namespace lucene::util;
+
+    //wchar_t *buf;
+    //char buf8[1000];
+    //standard::WhitespaceAnalyzer analyzer;
+    //lucene_utf8towcs(m_wcharBuffer, searchedText.utf8(), MAX_CONV_SIZE);
+    //QSharedPointer<Query> q( QueryParser::parse(m_wcharBuffer, _T("content"), &analyzer) );
+    //StringReader reader(m_wcharBuffer);
+    //TokenStream* tokenStream = analyzer.tokenStream( _T("field"), &reader);
+    //Token token;
+    //while(tokenStream->next(&token) != 0) {
+    //    lucene_wcstoutf8(buf8, token.termText(), 1000);
+    //    printf("%s\n", buf8);
+    //}
+
+    //===========================================================
+    // since I could not figure out the lucene query parser, I
+    // made a simple parser.
+    //===========================================================
+    QStringList words = queryParser(newSearchText);
+    qDebug() << "btsearchresultarea.cpp: " << __LINE__ << ": " <<  words << '\n';
+    foreach (QString word, words) { //search for every word in the list
+        QRegExp findExp;
+        if (word.contains("*")) {
+            length = word.length() - 1;
+            word.replace('*', "\\S*"); //match within a word
+            findExp = QRegExp(word);
+            findExp.setMinimal(true);
+        }
+        else if (word.contains("?")) {
+            length = word.length() - 1;
+            word.replace('?', "\\S?"); //match within a word
+            findExp = QRegExp(word);
+            findExp.setMinimal(true);
+        }
+        else {
+            length = word.length();
+            findExp = QRegExp("\\b" + word + "\\b");
+        }
+
+        //       index = 0; //for every word start at the beginning
+        index = ret.indexOf("<body", 0);
+        findExp.setCaseSensitivity(cs);
+        //while ( (index = ret.find(findExp, index)) != -1 ) { //while we found the word
+        while ( (index = findExp.indexIn(ret, index)) != -1 ) { //while we found the word
+            matchLen = findExp.matchedLength();
+            if (!util::tool::inHTMLTag(index, ret)) {
+                length = matchLen;
+                ret = ret.insert( index + length, rep2 );
+                ret = ret.insert( index, rep1 );
+                index += repLength;
+            }
+            index += length;
+        }
+    }
+    qDebug() << "btsearchresultarea.cpp: " << __LINE__ << ": " <<  words << '\n';
+    //qWarning("\n\n\n%s", ret.latin1());
+    return ret;
+}
+
+QStringList CSwordModuleSearch::queryParser(const QString& queryString) {
+    QString token;
+    QStringList tokenList;
+    int cnt, pos;
+
+    token = "";
+    cnt = 0;
+    while (cnt < queryString.length()) {
+        // add to token
+        if ((queryString[cnt]).isLetterOrNumber() || (queryString[cnt] == '*')) {
+            token = token + queryString[cnt];
+            cnt++;
+        }
+        else if ((queryString[cnt]).isLetterOrNumber() || (queryString[cnt] == '?')) {
+            token = token + queryString[cnt];
+            cnt++;
+        }
+        // token break
+        else if (queryString[cnt] == ' ') {
+            token = token.simplified();
+            if ((token != "*") && (token != ""))
+                tokenList.append(token);
+            token = "";
+            cnt++;
+        }
+        // clucene appears to ignore quoted strings in the sence
+        // that it treats all the words within quoted strings as
+        // regular tokens and not as a single token.
+        else if (queryString[cnt] == '"') {
+            cnt++;
+        }
+        // wild card - treat as a special token break
+        //else if (queryString[cnt] == '*') {
+        //    token = token + queryString[cnt];
+        //    token = token.simplified();
+        //    if ((token != "*") && (token != ""))
+        //        tokenList.append(token);
+        //    // start next token with wildcard (kin*m -> kin* *m)
+        //    token = "*";
+        //    cnt++;
+        //}
+        // the ! token is also a token break
+        else if (queryString[cnt] == '!') {
+            // store away current token
+            token = token.simplified();
+            if ((token != "*") && (token != ""))
+                tokenList.append(token);
+            // add the ! token
+            tokenList.append("!");
+            token = "";
+            cnt++;
+        }
+        // the - token is also a token break
+        else if (queryString[cnt] == '-') {
+            // store away current token
+            token = token.simplified();
+            if ((token != "*") && (token != ""))
+                tokenList.append(token);
+            // add the ! token
+            tokenList.append("-");
+            token = "";
+            cnt++;
+        }
+        // the + token is also a token break
+        else if (queryString[cnt] == '+') {
+            // store away current token
+            token = token.simplified();
+            if ((token != "*") && (token != ""))
+                tokenList.append(token);
+            // add the + token
+            tokenList.append("+");
+            token = "";
+            cnt++;
+        }
+        // the || token is also a token break
+        else if ((queryString[cnt] == '|') && (queryString[cnt+1] == '|')) {
+            // store away current token
+            token = token.simplified();
+            if ((token != "*") && (token != ""))
+                tokenList.append(token);
+            // add the || token
+            tokenList.append("||");
+            token = "";
+            cnt += 2;
+        }
+        // the && token is also a token break
+        else if ((queryString[cnt] == '&') && (queryString[cnt+1] == '&')) {
+            // store away current token
+            token = token.simplified();
+            if ((token != "*") && (token != ""))
+                tokenList.append(token);
+            // add the || token
+            tokenList.append("&&");
+            token = "";
+            cnt += 2;
+        }
+        else cnt++;
+    }
+    token = token.simplified();
+    if ((token != "*") && (token != ""))
+        tokenList.append(token);
+
+    cnt = 0;
+    QStringList::iterator it;
+    for (it = tokenList.begin(); it != tokenList.end(); ++it) {
+        //-----------------------------------------------------------
+        // remove all the NOT(!) tokens - these do not need to be
+        // highlighted in the highlighter
+        //-----------------------------------------------------------
+        if (((*it) == "!") || ((*it) == "NOT") || ((*it) == "-")) {
+            it = tokenList.erase(it);
+            if (it == tokenList.end())
+                break;
+            it = tokenList.erase(it);
+            if (it == tokenList.end())
+                break;
+            --it;
+        }
+        //-----------------------------------------------------------
+        // remove all the operator tokens - these do not need to be
+        // highlighted in the highlighter
+        //-----------------------------------------------------------
+        else if ( ((*it) == "||")  || ((*it) == "OR") || ((*it) == "+") ||
+                  ((*it) == "AND") || ((*it) == "&&") ) {
+            it = tokenList.erase(it);
+            if (it == tokenList.end())
+                break;
+            --it;
+        }
+        // if the token contains a ^ then trim the remainder of the
+        // token from the ^
+        //What??? error: invalid conversion from ‘const void*’ to ‘int’
+        // and how come "contains" returns bool but is used as int?
+        //else if ( (pos = (*it).contains("^")) >= 0 ) {
+        else if ( (pos = (*it).indexOf("^") ) >= 0 ) {
+            (*it) = (*it).left(pos - 1);
+        }
+        // if the token contains a ~ then trim the remainder of the
+        // token from the ~
+        else if ( (pos = (*it).indexOf("~") ) >= 0 ) {
+            (*it) = (*it).left(pos - 2) + "*";
+        }
+    }
+    return(tokenList);
+}
diff --git a/src/backend/cswordmodulesearch.h b/src/backend/cswordmodulesearch.h
index aa864b0..48b66d2 100644
--- a/src/backend/cswordmodulesearch.h
+++ b/src/backend/cswordmodulesearch.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -101,6 +103,17 @@ class CSwordModuleSearch: public QObject {
         static QList<const CSwordModuleInfo*> unindexedModules(
                 const QList<const CSwordModuleInfo*> &modules);
 
+        /**
+        * This function highlights the searched text in the content using the search type given by search flags
+        */
+        static QString highlightSearchedText(const QString& content, const QString& searchedText);
+
+    protected:
+        /**
+        * This function breakes the queryString into clucene tokens
+        */
+        static QStringList queryParser(const QString& queryString);
+
     private: /* Fields: */
         QString                        m_searchText;
         sword::ListKey                 m_searchScope;
diff --git a/src/backend/drivers/cswordbiblemoduleinfo.cpp b/src/backend/drivers/cswordbiblemoduleinfo.cpp
index e87fea2..1c1d124 100644
--- a/src/backend/drivers/cswordbiblemoduleinfo.cpp
+++ b/src/backend/drivers/cswordbiblemoduleinfo.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -18,9 +18,9 @@
 
 
 CSwordBibleModuleInfo::CSwordBibleModuleInfo(sword::SWModule *module,
-                                             CSwordBackend * const usedBackend,
+                                             CSwordBackend & backend,
                                              ModuleType type)
-        : CSwordModuleInfo(module, usedBackend, type)
+        : CSwordModuleInfo(module, backend, type)
         , m_boundsInitialized(false)
         , m_lowerBound(0)
         , m_upperBound(0)
@@ -35,7 +35,7 @@ void CSwordBibleModuleInfo::initBounds() const {
     Q_ASSERT(!m_boundsInitialized);
 
     sword::SWModule *m = module();
-    const bool oldStatus = m->getSkipConsecutiveLinks();
+    const bool oldStatus = m->isSkipConsecutiveLinks();
     m->setSkipConsecutiveLinks(true);
 
     m->setPosition(sword::TOP); // position to first entry
@@ -57,11 +57,14 @@ void CSwordBibleModuleInfo::initBounds() const {
 
 /** Returns the books available in this module */
 QStringList *CSwordBibleModuleInfo::books() const {
-    if (m_cachedLocale != backend()->booknameLanguage()) {
-        // Reset the booklist because the locale has changed
-        m_cachedLocale = backend()->booknameLanguage();
-        delete m_bookList;
-        m_bookList = 0;
+    {
+        CSwordBackend & b = backend();
+        if (m_cachedLocale != b.booknameLanguage()) {
+            // Reset the booklist because the locale has changed
+            m_cachedLocale = b.booknameLanguage();
+            delete m_bookList;
+            m_bookList = 0;
+        }
     }
 
     if (!m_bookList) {
@@ -81,12 +84,12 @@ QStringList *CSwordBibleModuleInfo::books() const {
             max--; // max == 1
 
         if (min > max) {
-            qWarning("CSwordBibleModuleInfo (%s) no OT and not NT! Check your config!", module()->Name());
+            qWarning("CSwordBibleModuleInfo (%s) no OT and not NT! Check your config!", module()->getName());
         } else {
-            QSharedPointer<sword::VerseKey> key((sword::VerseKey *)module()->CreateKey());
+            QSharedPointer<sword::VerseKey> key((sword::VerseKey *)module()->createKey());
             key->setPosition(sword::TOP);
 
-            for (key->setTestament(min); !key->Error() && key->getTestament() <= max; key->setBook(key->getBook() + 1)) {
+            for (key->setTestament(min); !key->popError() && key->getTestament() <= max; key->setBook(key->getBook() + 1)) {
                 m_bookList->append( QString::fromUtf8(key->getBookName()) );
             }
         }
@@ -98,7 +101,7 @@ QStringList *CSwordBibleModuleInfo::books() const {
 unsigned int CSwordBibleModuleInfo::chapterCount(const unsigned int book) const {
     int result = 0;
 
-    QSharedPointer<sword::VerseKey> key((sword::VerseKey *)module()->CreateKey());
+    QSharedPointer<sword::VerseKey> key((sword::VerseKey *)module()->createKey());
     key->setPosition(sword::TOP);
 
     // works for old and new versions
@@ -120,7 +123,7 @@ unsigned int CSwordBibleModuleInfo::verseCount(const unsigned int book,
 {
     unsigned int result = 0;
 
-    QSharedPointer<sword::VerseKey> key((sword::VerseKey *)module()->CreateKey());
+    QSharedPointer<sword::VerseKey> key((sword::VerseKey *)module()->createKey());
     key->setPosition(sword::TOP);
 
     // works for old and new versions
@@ -141,7 +144,7 @@ unsigned int CSwordBibleModuleInfo::verseCount(const QString &book,
 unsigned int CSwordBibleModuleInfo::bookNumber(const QString &book) const {
     unsigned int bookNumber = 0;
 
-    QSharedPointer<sword::VerseKey> key((sword::VerseKey *)module()->CreateKey());
+    QSharedPointer<sword::VerseKey> key((sword::VerseKey *)module()->createKey());
     key->setPosition(sword::TOP);
 
     key->setBookName(book.toUtf8().constData());
diff --git a/src/backend/drivers/cswordbiblemoduleinfo.h b/src/backend/drivers/cswordbiblemoduleinfo.h
index 49606e3..fb630c3 100644
--- a/src/backend/drivers/cswordbiblemoduleinfo.h
+++ b/src/backend/drivers/cswordbiblemoduleinfo.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -25,7 +27,8 @@ class CSwordBibleModuleInfo: public CSwordModuleInfo {
         Q_OBJECT
 
     public: /* Methods: */
-        CSwordBibleModuleInfo(sword::SWModule *module, CSwordBackend * const,
+        CSwordBibleModuleInfo(sword::SWModule * module,
+                              CSwordBackend & backend,
                               ModuleType type = Bible);
 
         inline ~CSwordBibleModuleInfo() {
diff --git a/src/backend/drivers/cswordbookmoduleinfo.cpp b/src/backend/drivers/cswordbookmoduleinfo.cpp
index 8c6b8b1..bae54b9 100644
--- a/src/backend/drivers/cswordbookmoduleinfo.cpp
+++ b/src/backend/drivers/cswordbookmoduleinfo.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,11 +16,10 @@
 #include <treekeyidx.h>
 
 
-CSwordBookModuleInfo::CSwordBookModuleInfo(sword::SWModule *module,
-                                           CSwordBackend * const usedBackend)
-    : CSwordModuleInfo(module, usedBackend,
-                       CSwordModuleInfo::GenericBook),
-                       m_depth(-1)
+CSwordBookModuleInfo::CSwordBookModuleInfo(sword::SWModule * module,
+                                           CSwordBackend & backend)
+    : CSwordModuleInfo(module, backend, CSwordModuleInfo::GenericBook)
+    , m_depth(-1)
 {
     sword::TreeKeyIdx *key = tree();
     if (key) {
@@ -29,25 +28,21 @@ CSwordBookModuleInfo::CSwordBookModuleInfo(sword::SWModule *module,
     }
 }
 
-void CSwordBookModuleInfo::computeDepth(sword::TreeKeyIdx *key, int level) {
-    std::string savedKey;
-    //    savedKey = key->getFullName(); //sword 1.5.8
-    savedKey = key->getText();
-
-    if (level > m_depth) {
+void CSwordBookModuleInfo::computeDepth(sword::TreeKeyIdx * const key,
+                                        const int level)
+{
+    const QByteArray savedKey(key->getText());
+    if (level > m_depth)
         m_depth = level;
-    }
 
     if (key->hasChildren()) {
         key->firstChild();
-        computeDepth(key, level + 1);
-
-        key->setText( savedKey.c_str() );//return to the initial value
+        computeDepth(key, level + 1u);
+        key->setText(savedKey.constData()); // Return to the initial value
     }
 
-    if (key->nextSibling()) {
+    if (key->nextSibling())
         computeDepth(key, level);
-    }
 }
 
 /** Returns a treekey filled with the structure of this module */
diff --git a/src/backend/drivers/cswordbookmoduleinfo.h b/src/backend/drivers/cswordbookmoduleinfo.h
index c6b0494..d540932 100644
--- a/src/backend/drivers/cswordbookmoduleinfo.h
+++ b/src/backend/drivers/cswordbookmoduleinfo.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -27,8 +29,8 @@ class CSwordBookModuleInfo: public CSwordModuleInfo {
           \param module The module which belongs to this object
           \param backend The parent backend for this book module.
         */
-        CSwordBookModuleInfo(sword::SWModule *module,
-                             CSwordBackend * const usedBackend);
+        CSwordBookModuleInfo(sword::SWModule * module,
+                             CSwordBackend & usedBackend);
 
         inline CSwordBookModuleInfo(const CSwordBookModuleInfo &copy)
             : CSwordModuleInfo(copy), m_depth(copy.m_depth) {}
@@ -46,10 +48,11 @@ class CSwordBookModuleInfo: public CSwordModuleInfo {
         sword::TreeKeyIdx *tree() const;
 
     private: /* Methods: */
+
         /**
         * A recursive helper function to help computng the module depth!
         */
-        void computeDepth(sword::TreeKeyIdx *key, int level = 0);
+        void computeDepth(sword::TreeKeyIdx * const key, const int level = 0);
 
     private: /* Fields: */
         int m_depth;
diff --git a/src/backend/drivers/cswordcommentarymoduleinfo.cpp b/src/backend/drivers/cswordcommentarymoduleinfo.cpp
index 07e09d2..9baaf97 100644
--- a/src/backend/drivers/cswordcommentarymoduleinfo.cpp
+++ b/src/backend/drivers/cswordcommentarymoduleinfo.cpp
@@ -2,19 +2,17 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
 
 #include "backend/drivers/cswordcommentarymoduleinfo.h"
 
-
 bool CSwordCommentaryModuleInfo::isWritable() const {
     /*
       A module is only writable if it's a RawFiles module with writable
       returning true.
     */
-    return std::string(module()->getConfigEntry("ModDrv")) == "RawFiles"
-           && module()->isWritable();
+    return !qstrcmp(module()->getConfigEntry("ModDrv"), "RawFiles") && module()->isWritable();
 }
diff --git a/src/backend/drivers/cswordcommentarymoduleinfo.h b/src/backend/drivers/cswordcommentarymoduleinfo.h
index 3c42d99..688ae53 100644
--- a/src/backend/drivers/cswordcommentarymoduleinfo.h
+++ b/src/backend/drivers/cswordcommentarymoduleinfo.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -22,10 +24,12 @@ class CSwordCommentaryModuleInfo: public CSwordBibleModuleInfo {
         Q_OBJECT
 
     public: /* Methods: */
-        inline CSwordCommentaryModuleInfo(sword::SWModule *module,
-                                          CSwordBackend * const usedBackend)
-                : CSwordBibleModuleInfo(module, usedBackend,
-                                        CSwordModuleInfo::Commentary) {}
+
+        inline CSwordCommentaryModuleInfo(sword::SWModule * module,
+                                          CSwordBackend & backend)
+            : CSwordBibleModuleInfo(module,
+                                    backend,
+                                    CSwordModuleInfo::Commentary) {}
 
         /* Reimplementation of CSwordModuleInfo::isWritable(). */
         virtual bool isWritable() const;
diff --git a/src/backend/drivers/cswordlexiconmoduleinfo.cpp b/src/backend/drivers/cswordlexiconmoduleinfo.cpp
index 1b976d3..350a49c 100644
--- a/src/backend/drivers/cswordlexiconmoduleinfo.cpp
+++ b/src/backend/drivers/cswordlexiconmoduleinfo.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -31,17 +31,6 @@ const QStringList &CSwordLexiconModuleInfo::entries() const {
         return m_entries;
     }
 
-    // Initialize cache:
-    //Check for buggy modules! They will not be loaded any more.
-    if ( name() == QString("ZhEnglish")) {
-        qWarning() << "Module ZhEnglish is buggy and will not be loaded.";
-        return m_entries;
-    }
-    if ( name() == QString("EReo_en")) {
-        qWarning() << "Module EReo_en is buggy and will not be loaded.";
-        return m_entries;
-    }
-
     QString dir(DU::getUserCacheDir().absolutePath());
     QFile f1( QString(dir).append("/").append(name()));
 
@@ -95,11 +84,12 @@ const QStringList &CSwordLexiconModuleInfo::entries() const {
         }
 
         module()->increment();
-    } while (!module()->Error());
+    } while (!module()->popError());
 
     module()->setPosition(sword::TOP); // back to the first entry
     module()->setSkipConsecutiveLinks(false);
 
+    /// \todo Document why the following code is here:
     if (!m_entries.empty() && m_entries.front().simplified().isEmpty())
         m_entries.pop_front();
 
diff --git a/src/backend/drivers/cswordlexiconmoduleinfo.h b/src/backend/drivers/cswordlexiconmoduleinfo.h
index 1789b9b..74fad8c 100644
--- a/src/backend/drivers/cswordlexiconmoduleinfo.h
+++ b/src/backend/drivers/cswordlexiconmoduleinfo.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -22,8 +24,8 @@ class CSwordLexiconModuleInfo: public CSwordModuleInfo {
         Q_OBJECT
 
     public: /* Methods: */
-        inline CSwordLexiconModuleInfo(sword::SWModule *module,
-                                       CSwordBackend * const backend)
+        inline CSwordLexiconModuleInfo(sword::SWModule * module,
+                                       CSwordBackend & backend)
                 : CSwordModuleInfo(module, backend, Lexicon) {}
 
         inline CSwordLexiconModuleInfo(const CSwordLexiconModuleInfo &copy)
diff --git a/src/backend/drivers/cswordmoduleinfo.cpp b/src/backend/drivers/cswordmoduleinfo.cpp
index 08721c9..f86f9ac 100644
--- a/src/backend/drivers/cswordmoduleinfo.cpp
+++ b/src/backend/drivers/cswordmoduleinfo.cpp
@@ -2,35 +2,37 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
 
 #include "backend/drivers/cswordmoduleinfo.h"
 
-#include <QSharedPointer>
 #include <CLucene.h>
 #include <QByteArray>
 #include <QCoreApplication>
 #include <QDebug>
 #include <QDir>
 #include <QFileInfo>
-#include <QList>
-#include <QRegExp>
 #include <QSettings>
-#include "backend/config/cbtconfig.h"
+#include <QSharedPointer>
+#include <QTextDocument>
+#include "backend/config/btconfig.h"
 #include "backend/drivers/cswordlexiconmoduleinfo.h"
 #include "backend/keys/cswordkey.h"
 #include "backend/managers/clanguagemgr.h"
 #include "backend/managers/cswordbackend.h"
 #include "backend/rendering/centrydisplay.h"
 #include "backend/cswordmodulesearch.h"
+#include "bibletimeapp.h"
 #include "btglobal.h"
+#include "frontend/messagedialog.h"
 #include "util/cresmgr.h"
 #include "util/directory.h"
 #include "util/exceptions.h"
-#include "util/dialogutil.h"
+#include "util/geticon.h"
+#include "util/htmlescape.h"
 
 // Sword includes:
 #include <listkey.h>
@@ -41,29 +43,6 @@
 #include <versekey.h>
 
 
-#if 0
-namespace {
-
-/** HELPER Method to dump all current EntryAttributes of a module. */
-void dumpEntryAttributes(sword::SWModule *m) {
-    qDebug() << "Attributes for key: " << m->getKeyText();
-    sword::AttributeTypeList::iterator i1;
-    sword::AttributeList::iterator i2;
-    sword::AttributeValue::iterator i3;
-    for (i1 = m->getEntryAttributes().begin(); i1 != m->getEntryAttributes().end(); i1++) {
-        qDebug() << "[ " << i1->first << " ]";
-        for (i2 = i1->second.begin(); i2 != i1->second.end(); i2++) {
-            qDebug() << "\t[ " << i2->first << " ]";
-            for (i3 = i2->second.begin(); i3 != i2->second.end(); i3++) {
-                qDebug() << "\t\t" << i3->first << " = " << i3->second;
-            }
-        }
-    }
-}
-
-} // anonymous namespace
-#endif
-
 //Increment this, if the index format changes
 //Then indices on the user's systems will be rebuilt
 const unsigned int INDEX_VERSION = 7;
@@ -72,72 +51,74 @@ const unsigned int INDEX_VERSION = 7;
 //Lucene default is too small
 const unsigned long BT_MAX_LUCENE_FIELD_LENGTH = 1024 * 1024;
 
-CSwordModuleInfo::CSwordModuleInfo(sword::SWModule *module,
-                                   CSwordBackend * const usedBackend,
+CSwordModuleInfo::CSwordModuleInfo(sword::SWModule * module,
+                                   CSwordBackend & backend,
                                    ModuleType type)
-    : m_module(module),
-      m_backend(usedBackend ? usedBackend : CSwordBackend::instance()),
+    : m_module((Q_ASSERT(module), module)),
+      m_backend(backend),
       m_type(type),
       m_cancelIndexing(false),
-      m_cachedName(QString::fromUtf8(module->Name())),
-      m_cachedHasVersion(!QString((*m_backend->getConfig())[module->Name()]["Version"]).isEmpty())
+      m_cachedName(QString::fromUtf8(module->getName())),
+      m_cachedHasVersion(!QString((*m_backend.getConfig())[module->getName()]["Version"]).isEmpty())
 {
-    Q_ASSERT(module != 0);
-    Q_ASSERT(usedBackend != 0);
-
     initCachedCategory();
     initCachedLanguage();
 
-    m_hidden = CBTConfig::get(CBTConfig::hiddenModules).contains(name());
-
-    if (backend()) {
-        if (hasVersion() && (minimumSwordVersion() > sword::SWVersion::currentVersion)) {
-            qWarning("The module \"%s\" requires a newer Sword library. Please update to \"Sword %s\".",
-                     name().toUtf8().constData(), (const char *)minimumSwordVersion());
-
-            /// \todo if this is the case, can we use the module at all?
-        }
-    }
-}
+    m_hidden = btConfig().value<QStringList>("state/hiddenModules",
+                                             QStringList()).contains(m_cachedName);
 
-CSwordModuleInfo::CSwordModuleInfo(const CSwordModuleInfo &o)
-    : QObject(0), m_module(o.m_module), m_backend(o.m_backend),
-      m_type(o.m_type), m_hidden(o.m_hidden),
-      m_cancelIndexing(o.m_cancelIndexing), m_cachedName(o.m_cachedName),
-      m_cachedCategory(o.m_cachedCategory),
-      m_cachedLanguage(o.m_cachedLanguage),
-      m_cachedHasVersion(o.m_cachedHasVersion)
+    if (m_cachedHasVersion
+        && (minimumSwordVersion() > sword::SWVersion::currentVersion))
+    {
+        qWarning("The module \"%s\" requires a newer Sword library. Please "
+                 "update to \"Sword %s\".",
+                 m_cachedName.toUtf8().constData(),
+                 minimumSwordVersion().getText());
+
+        /// \todo if this is the case, can we use the module at all?
+    }
+}
+
+CSwordModuleInfo::CSwordModuleInfo(const CSwordModuleInfo & copy)
+    : QObject(NULL)
+    , m_module(copy.m_module)
+    , m_backend(copy.m_backend)
+    , m_type(copy.m_type)
+    , m_hidden(copy.m_hidden)
+    , m_cancelIndexing(copy.m_cancelIndexing)
+    , m_cachedName(copy.m_cachedName)
+    , m_cachedCategory(copy.m_cachedCategory)
+    , m_cachedLanguage(copy.m_cachedLanguage)
+    , m_cachedHasVersion(copy.m_cachedHasVersion)
 {
     // Intentionally empty
 }
 
 bool CSwordModuleInfo::unlock(const QString & unlockKey) {
-    if (!isEncrypted()) {
+    if (!isEncrypted())
         return false;
-    }
 
     bool unlocked = unlockKeyIsValid();
 
-    CBTConfig::setModuleEncryptionKey(name(), unlockKey);
+    btConfig().setModuleEncryptionKey(m_cachedName, unlockKey);
 
     /// \todo remove this comment once it is no longer needed
-    /* There is currently a deficiency in sword 1.6.1 in that backend->setCipherKey() does
-     * not work correctly for modules from which data was already fetched. Therefore we have to
-     * reload the modules in bibletime.cpp
-     */
-    backend()->setCipherKey(m_module->Name(), unlockKey.toUtf8().constData());
+    /* There is currently a deficiency in sword 1.6.1 in that
+       backend->setCipherKey() does not work correctly for modules from which
+       data was already fetched. Therefore we have to reload the modules in
+       bibletime.cpp */
+    m_backend.setCipherKey(m_module->getName(), unlockKey.toUtf8().constData());
 
     /// \todo write to Sword config as well
 
-    if (unlockKeyIsValid() != unlocked) {
+    if (unlockKeyIsValid() != unlocked)
         emit unlockedChanged(!unlocked);
-    }
     return true;
 }
 
 bool CSwordModuleInfo::isLocked() const {
-    //still works, but the cipherkey is stored in CBTConfig.
-    //Works because it is set in sword on program startup.
+    // still works, but the cipherkey is stored in BtConfig.
+    // Works because it is set in sword on program startup.
 
     return isEncrypted() && !unlockKeyIsValid();
 }
@@ -148,38 +129,35 @@ bool CSwordModuleInfo::isEncrypted() const {
     * is encrypted but not necessarily locked
     */
 
-    //This code is still right, though we do no longer write to the module config files any more
-    std::map < sword::SWBuf, sword::ConfigEntMap, std::less < sword::SWBuf > >::iterator SectionMapIter;
-    SectionMapIter = backend()->getConfig()->Sections.find(name().toUtf8().constData());
-    if (SectionMapIter == backend()->getConfig()->Sections.end())
+    /* This code is still right, though we do no longer write to the module
+       config files any more. */
+    typedef sword::SectionMap::const_iterator SMCI;
+    SMCI it = m_backend.getConfig()->Sections.find(m_cachedName.toUtf8().constData());
+    if (it == m_backend.getConfig()->Sections.end())
         return false;
-    sword::ConfigEntMap config = SectionMapIter->second;
-    sword::ConfigEntMap::iterator it = config.find("CipherKey");
 
-    return it != config.end();
+    const sword::ConfigEntMap & config = it->second;
+    return config.find("CipherKey") != config.end();
 }
 
 bool CSwordModuleInfo::unlockKeyIsValid() const {
     m_module->setPosition(sword::TOP);
 
-    // This needs to use ::fromLatin1 because if the text is still locked,
-    // a lot of garbage will show up. It will also work with properly decrypted
-    // Unicode text, because all non-ASCII Unicode chars consist of bytes >127
-    // and therefore contain no control (nonprintable) characters, which are all <127.
-    QString test = isUnicode()
-                   ? QString::fromUtf8(m_module->getRawEntryBuf().c_str())
-                   : QString::fromLatin1( m_module->getRawEntryBuf().c_str() );
+    /* This needs to use ::fromLatin1 because if the text is still locked, a lot
+       of garbage will show up. It will also work with properly decrypted
+       Unicode text, because all non-ASCII Unicode chars consist of bytes >127
+       and therefore contain no control (nonprintable) characters, which are all
+       <127. */
+    const QString test(isUnicode()
+                       ? QString::fromUtf8(m_module->getRawEntryBuf().c_str())
+                       : QString::fromLatin1(m_module->getRawEntryBuf().c_str()));
 
-    if (test.isEmpty()) {
+    if (test.isEmpty())
         return false;
-    }
 
-    for (int i = 0; i <= test.length() && i < 100; i++) {
-        if ( !test[i].isPrint() && !test[i].isNull() ) {
+    for (int i = 0; i < test.length() && i < 100; i++)
+        if (!test[i].isPrint() && !test[i].isNull())
             return false;
-        }
-    }
-
     return true;
 }
 
@@ -188,336 +166,374 @@ QString CSwordModuleInfo::getGlobalBaseIndexLocation() {
 }
 
 QString CSwordModuleInfo::getModuleBaseIndexLocation() const {
-    return getGlobalBaseIndexLocation() + QString("/") + name().toLocal8Bit();
+    return getGlobalBaseIndexLocation() + QString("/") + m_cachedName.toLocal8Bit();
 }
 
-QString CSwordModuleInfo::getModuleStandardIndexLocation() const { //this for now returns the location of the main index
+QString CSwordModuleInfo::getModuleStandardIndexLocation() const {
+    // This for now returns the location of the main index
     return getModuleBaseIndexLocation() + QString("/standard");
 }
 
 bool CSwordModuleInfo::hasIndex() const {
-    //this will return true only
-    //if the index exists and has correct version information for both index and module
-    QDir d;
-    if (!d.exists( getModuleStandardIndexLocation() )) {
-        return false;
+    { // Is this a directory?
+        QFileInfo fi(getModuleStandardIndexLocation());
+        if (!fi.isDir())
+            return false;
     }
 
-    //first check if the index version and module version are ok
-    QSettings module_config(getModuleBaseIndexLocation() + QString("/bibletime-index.conf"), QSettings::IniFormat);
+    // Are the index version and module version OK?
+    QSettings module_config(getModuleBaseIndexLocation()
+                            + QString("/bibletime-index.conf"),
+                            QSettings::IniFormat);
 
-    if (hasVersion() &&
-        module_config.value("module-version").toString() != config(CSwordModuleInfo::ModuleVersion))
+    if (m_cachedHasVersion
+        && module_config.value("module-version").toString()
+           != config(CSwordModuleInfo::ModuleVersion))
     {
         return false;
     }
 
     if (module_config.value("index-version").toUInt() != INDEX_VERSION) {
-        qDebug("%s: INDEX_VERSION is not compatible with this version of BibleTime.", name().toUtf8().constData());
+        qDebug("%s: INDEX_VERSION is not compatible with this version of "
+               "BibleTime.",
+               m_cachedName.toUtf8().constData());
         return false;
     }
 
-    //then check if the index is there
-    return lucene::index::IndexReader::indexExists(getModuleStandardIndexLocation().toLatin1().constData());
+    // Is the index there?
+    return lucene::index::IndexReader::indexExists(getModuleStandardIndexLocation()
+                                                   .toLatin1().constData());
 }
 
 bool CSwordModuleInfo::buildIndex() {
-
     m_cancelIndexing = false;
 
     try {
-        //Without this we don't get strongs, lemmas, etc
-        backend()->setFilterOptions ( CBTConfig::getFilterOptionDefaults() );
-        //make sure we reset all important filter options which influcence the plain filters.
-        // turn on these options, they are needed for the EntryAttributes population
-        backend()->setOption( CSwordModuleInfo::strongNumbers,  true );
-        backend()->setOption( CSwordModuleInfo::morphTags,  true );
-        backend()->setOption( CSwordModuleInfo::footnotes,  true );
-        backend()->setOption( CSwordModuleInfo::headings,  true );
-        // we don't want the following in the text, the do not carry searchable information
-        backend()->setOption( CSwordModuleInfo::morphSegmentation,  false );
-        backend()->setOption( CSwordModuleInfo::scriptureReferences,  false );
-        backend()->setOption( CSwordModuleInfo::redLetterWords,  false );
-
-        // do not use any stop words
-        const TCHAR* stop_words[]  = { NULL };
-        lucene::analysis::standard::StandardAnalyzer an( (const TCHAR**)stop_words );
-        QString index = getModuleStandardIndexLocation();
+        // Without this we don't get strongs, lemmas, etc.
+        m_backend.setFilterOptions(btConfig().getFilterOptions());
+        /* Make sure we reset all important filter options which influcence the
+           plain filters. Turn on these options, they are needed for the
+           EntryAttributes population */
+        m_backend.setOption(CSwordModuleInfo::strongNumbers, true);
+        m_backend.setOption(CSwordModuleInfo::morphTags, true);
+        m_backend.setOption(CSwordModuleInfo::footnotes, true);
+        m_backend.setOption(CSwordModuleInfo::headings, true);
+        /* We don't want the following in the text, the do not carry searchable
+           information. */
+        m_backend.setOption(CSwordModuleInfo::morphSegmentation, false);
+        m_backend.setOption(CSwordModuleInfo::scriptureReferences, false);
+        m_backend.setOption(CSwordModuleInfo::redLetterWords, false);
+
+        // Do not use any stop words:
+        static const TCHAR * stop_words[1u]  = { NULL };
+        lucene::analysis::standard::StandardAnalyzer an(static_cast<const TCHAR **>(stop_words));
+        const QString index(getModuleStandardIndexLocation());
 
         QDir dir("/");
-        dir.mkpath( getGlobalBaseIndexLocation() );
-        dir.mkpath( getModuleBaseIndexLocation() );
-        dir.mkpath( getModuleStandardIndexLocation() );
+        dir.mkpath(getGlobalBaseIndexLocation());
+        dir.mkpath(getModuleBaseIndexLocation());
+        dir.mkpath(getModuleStandardIndexLocation());
 
-        if (lucene::index::IndexReader::indexExists(index.toLatin1().constData())) {
-            if (lucene::index::IndexReader::isLocked(index.toLatin1().constData()) ) {
+        if (lucene::index::IndexReader::indexExists(index.toLatin1().constData()))
+            if (lucene::index::IndexReader::isLocked(index.toLatin1().constData()))
                 lucene::index::IndexReader::unlock(index.toLatin1().constData());
-            }
-        }
 
-        QSharedPointer<lucene::index::IndexWriter> writer( new lucene::index::IndexWriter(index.toLatin1().constData(), &an, true) ); //always create a new index
+        // Always create a new index:
+        typedef lucene::index::IndexWriter IW;
+        QSharedPointer<IW> writer(new IW(index.toLatin1().constData(), &an, true));
         writer->setMaxFieldLength(BT_MAX_LUCENE_FIELD_LENGTH);
-        writer->setUseCompoundFile(true); //merge segments into a single file
+        writer->setUseCompoundFile(true); // Merge segments into a single file
+#ifndef CLUCENE2
+        writer->setMinMergeDocs(1000);
+#endif
 
         m_module->setPosition(sword::TOP);
-        unsigned long verseLowIndex = m_module->Index();
+        unsigned long verseLowIndex = m_module->getIndex();
         m_module->setPosition(sword::BOTTOM);
-        unsigned long verseHighIndex = m_module->Index();
+        unsigned long verseHighIndex = m_module->getIndex();
 
-        //verseLowIndex is not 0 in all cases (i.e. NT-only modules)
+        // verseLowIndex is not 0 in all cases (i.e. NT-only modules)
         unsigned long verseIndex = verseLowIndex + 1;
         unsigned long verseSpan = verseHighIndex - verseLowIndex;
 
-        //Index() is not implemented properly for lexicons, so we use a
-        //workaround.
-        if (type() == CSwordModuleInfo::Lexicon) {
+        // Index() is not implemented properly for lexicons, so work around it:
+        if (m_type == CSwordModuleInfo::Lexicon) {
             verseIndex = 0;
             verseLowIndex = 0;
-            verseSpan = ((CSwordLexiconModuleInfo*)this)->entries().size();
+            verseSpan = static_cast<CSwordLexiconModuleInfo *>(this)->entries().size();
         }
 
         emit indexingProgress(0);
 
-        sword::SWKey* key = m_module->getKey();
-        //VerseKey for bibles
-        sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key);
+        sword::SWKey * const key = m_module->getKey();
+        sword::VerseKey * const vk = dynamic_cast<sword::VerseKey *>(key);
 
         if (vk) {
-            // we have to be sure to insert the english key into the index, otherwise we'd be in trouble if the language changes
+            /* We have to be sure to insert the english key into the index,
+               otherwise we'd be in trouble if the language changes. */
             vk->setLocale("en_US");
-            //If we have a verse based module, we want to include the pre-chapter etc. headings in the search
-            vk->Headings(1);
+            /* If we have a verse based module, we want to include the pre-
+               chapter etc. headings in the search. */
+            vk->setIntros(true);
         }
 
-        //holds UTF-8 data and is faster than QString.
-        QByteArray textBuffer;
+        QByteArray textBuffer; // Holds UTF-8 data and is faster than QString.
 
         // we start with the first module entry, key is automatically updated
         // because key is a pointer to the modules key
         m_module->setSkipConsecutiveLinks(true);
 
-        wchar_t wcharBuffer[BT_MAX_LUCENE_FIELD_LENGTH + 1];
+        QScopedPointer<wchar_t, QScopedPointerArrayDeleter<wchar_t> >
+            sPwcharBuffer(new wchar_t[BT_MAX_LUCENE_FIELD_LENGTH  + 1]);
+        wchar_t * const wcharBuffer = sPwcharBuffer.data();
+        Q_ASSERT(wcharBuffer);
 
         m_module->setPosition(sword::TOP);
-        while (!(m_module->Error()) && !m_cancelIndexing) {
+        while (!(m_module->popError()) && !m_cancelIndexing) {
 
-            // Also index Chapter 0 and Verse 0, because they might have information in the entry attributes
-            // We used to just put their content into the textBuffer and continue to the next verse, but
-            // with entry attributes this doesn't work any more.
-            // Hits in the search dialog will show up as 1:1 (instead of 0)
+            /* Also index Chapter 0 and Verse 0, because they might have
+               information in the entry attributes. We used to just put their
+               content into the textBuffer and continue to the next verse, but
+               with entry attributes this doesn't work any more. Hits in the
+               search dialog will show up as 1:1 (instead of 0). */
 
             QSharedPointer<lucene::document::Document> doc(new lucene::document::Document());
 
             //index the key
             lucene_utf8towcs(wcharBuffer, key->getText(), BT_MAX_LUCENE_FIELD_LENGTH);
 
-            //doc->add(*lucene::document::Field::UnIndexed((const TCHAR*)_T("key"), (const TCHAR*)wcharBuffer));
-            doc->add(*(new lucene::document::Field((const TCHAR*)_T("key"), (const TCHAR*)wcharBuffer, lucene::document::Field::STORE_YES | lucene::document::Field::INDEX_NO)));
-
-            // index the main text
-            //at this point we have to make sure we disabled the strongs and the other options
-            //so the plain filters won't include the numbers somehow.
-            lucene_utf8towcs(wcharBuffer, (const char*) textBuffer.append(m_module->StripText()), BT_MAX_LUCENE_FIELD_LENGTH);
-            doc->add(*(new lucene::document::Field((const TCHAR*)_T("content"), (const TCHAR*)wcharBuffer, lucene::document::Field::STORE_NO | lucene::document::Field::INDEX_TOKENIZED)));
-            textBuffer.resize(0); //clean up
-
-            // index attributes
-            sword::AttributeList::iterator attListI;
-            sword::AttributeValue::iterator attValueI;
-            // Footnotes
-            for (attListI = m_module->getEntryAttributes()["Footnote"].begin();
-                    attListI != m_module->getEntryAttributes()["Footnote"].end();
-                    attListI++) {
-                lucene_utf8towcs(wcharBuffer, attListI->second["body"], BT_MAX_LUCENE_FIELD_LENGTH);
-                //doc->add(*lucene::document::Field::UnStored((const TCHAR*)_T("footnote"), wcharBuffer));
-                doc->add(*(new lucene::document::Field((const TCHAR*)_T("footnote"), (const TCHAR*)wcharBuffer, lucene::document::Field::STORE_NO | lucene::document::Field::INDEX_TOKENIZED)));
-            } // for attListI
+            doc->add(*(new lucene::document::Field(static_cast<const TCHAR *>(_T("key")),
+                                                   static_cast<const TCHAR *>(wcharBuffer),
+                                                   lucene::document::Field::STORE_YES
+                                                   | lucene::document::Field::INDEX_NO)));
+
+            /* At this point we have to make sure we disabled the strongs and
+               the other options, so the plain filters won't include the numbers
+               somehow. */
+            textBuffer.append(m_module->stripText());
+            lucene_utf8towcs(wcharBuffer,
+                             static_cast<const char *>(textBuffer),
+                             BT_MAX_LUCENE_FIELD_LENGTH);
+            doc->add(*(new lucene::document::Field(static_cast<const TCHAR *>(_T("content")),
+                                                   static_cast<const TCHAR *>(wcharBuffer),
+                                                   lucene::document::Field::STORE_NO
+                                                   | lucene::document::Field::INDEX_TOKENIZED)));
+            textBuffer.clear();
+
+            typedef sword::AttributeList::iterator ALI;
+            typedef sword::AttributeValue::iterator AVI;
+
+            for (ALI it = m_module->getEntryAttributes()["Footnote"].begin();
+                 it != m_module->getEntryAttributes()["Footnote"].end();
+                 ++it)
+            {
+                lucene_utf8towcs(wcharBuffer, it->second["body"], BT_MAX_LUCENE_FIELD_LENGTH);
+                doc->add(*(new lucene::document::Field(static_cast<const TCHAR *>(_T("footnote")),
+                                                       static_cast<const TCHAR *>(wcharBuffer),
+                                                       lucene::document::Field::STORE_NO
+                                                       | lucene::document::Field::INDEX_TOKENIZED)));
+            }
 
             // Headings
-            for (attValueI = m_module->getEntryAttributes()["Heading"]["Preverse"].begin();
-                    attValueI != m_module->getEntryAttributes()["Heading"]["Preverse"].end();
-                    attValueI++) {
-                lucene_utf8towcs(wcharBuffer, attValueI->second, BT_MAX_LUCENE_FIELD_LENGTH);
-                //doc->add(*lucene::document::Field::UnStored((const TCHAR*)_T("heading"), wcharBuffer));
-                doc->add(*(new lucene::document::Field((const TCHAR*)_T("heading"), (const TCHAR*)wcharBuffer, lucene::document::Field::STORE_NO | lucene::document::Field::INDEX_TOKENIZED)));
-            } // for attValueI
+            for (AVI it = m_module->getEntryAttributes()["Heading"]["Preverse"].begin();
+                 it != m_module->getEntryAttributes()["Heading"]["Preverse"].end();
+                 ++it)
+            {
+                lucene_utf8towcs(wcharBuffer, it->second, BT_MAX_LUCENE_FIELD_LENGTH);
+                doc->add(*(new lucene::document::Field(static_cast<const TCHAR *>(_T("heading")),
+                                                       static_cast<const TCHAR *>(wcharBuffer),
+                                                       lucene::document::Field::STORE_NO
+                                                       | lucene::document::Field::INDEX_TOKENIZED)));
+            }
 
             // Strongs/Morphs
-            for (attListI = m_module->getEntryAttributes()["Word"].begin();
-                    attListI != m_module->getEntryAttributes()["Word"].end();
-                    attListI++) {
-                // for each attribute
-                if (attListI->second["LemmaClass"] == "strong") {
-                    lucene_utf8towcs(wcharBuffer, attListI->second["Lemma"], BT_MAX_LUCENE_FIELD_LENGTH);
-                    //doc->add(*lucene::document::Field::UnStored((const TCHAR*)_T("strong"), wcharBuffer));
-                    doc->add(*(new lucene::document::Field((const TCHAR*)_T("strong"), (const TCHAR*)wcharBuffer, lucene::document::Field::STORE_NO | lucene::document::Field::INDEX_TOKENIZED)));
-                    //qWarning("Adding strong %s", attListI->second["Lemma"].c_str());
+            for (ALI it = m_module->getEntryAttributes()["Word"].begin();
+                 it != m_module->getEntryAttributes()["Word"].end();
+                 ++it)
+            {
+                if (it->second["LemmaClass"] == "strong") {
+                    lucene_utf8towcs(wcharBuffer, it->second["Lemma"], BT_MAX_LUCENE_FIELD_LENGTH);
+                    doc->add(*(new lucene::document::Field(static_cast<const TCHAR *>(_T("strong")),
+                                                           static_cast<const TCHAR *>(wcharBuffer),
+                                                           lucene::document::Field::STORE_NO
+                                                           | lucene::document::Field::INDEX_TOKENIZED)));
                 }
-                if (attListI->second.find("Morph") != attListI->second.end()) {
-                    lucene_utf8towcs(wcharBuffer, attListI->second["Morph"], BT_MAX_LUCENE_FIELD_LENGTH);
-                    //doc->add(*lucene::document::Field::UnStored((const TCHAR*)_T("morph"), wcharBuffer));
-                    doc->add(*(new lucene::document::Field((const TCHAR*)_T("morph"), (const TCHAR*)wcharBuffer, lucene::document::Field::STORE_NO | lucene::document::Field::INDEX_TOKENIZED)));
+                if (it->second.find("Morph") != it->second.end()) {
+                    lucene_utf8towcs(wcharBuffer, it->second["Morph"], BT_MAX_LUCENE_FIELD_LENGTH);
+                    doc->add(*(new lucene::document::Field(static_cast<const TCHAR *>(_T("morph")),
+                                                           static_cast<const TCHAR *>(wcharBuffer),
+                                                           lucene::document::Field::STORE_NO
+                                                           | lucene::document::Field::INDEX_TOKENIZED)));
                 }
-            } // for attListI
+            }
 
             writer->addDocument(doc.data());
             //Index() is not implemented properly for lexicons, so we use a
             //workaround.
-            if (type() == CSwordModuleInfo::Lexicon) {
+            if (m_type == CSwordModuleInfo::Lexicon) {
                 verseIndex++;
-            }
-            else {
-                verseIndex = m_module->Index();
+            } else {
+                verseIndex = m_module->getIndex();
             }
 
             if (verseIndex % 200 == 0) {
                 int indexingProgressValue;
-                if (verseSpan == 0) { //prevent division by zero
-                    //m_indexingProgress.setValue( QVariant(0) );
+                if (verseSpan == 0) { // Prevent division by zero
                     indexingProgressValue = 0;
-                }
-                else {
-                    //m_indexingProgress.setValue( QVariant((int)((100*(verseIndex-verseLowIndex))/(verseHighIndex-verseLowIndex))) );
+                } else {
                     indexingProgressValue = (int)((100 * (verseIndex - verseLowIndex)) / (verseSpan));
                 }
-                //m_indexingProgress.activate();
                 emit indexingProgress(indexingProgressValue);
             }
 
             m_module->increment();
         } // while (!(m_module->Error()) && !m_cancelIndexing)
 
-        if (!m_cancelIndexing) {
+        if (!m_cancelIndexing)
             writer->optimize();
-        }
         writer->close();
 
         if (m_cancelIndexing) {
             deleteIndex();
             m_cancelIndexing = false;
-        }
-        else {
-            QSettings module_config(getModuleBaseIndexLocation() + QString("/bibletime-index.conf"), QSettings::IniFormat);
-            if (hasVersion()) module_config.setValue("module-version", config(CSwordModuleInfo::ModuleVersion) );
+        } else {
+            QSettings module_config(getModuleBaseIndexLocation()
+                                    + QString("/bibletime-index.conf"),
+                                    QSettings::IniFormat);
+            if (m_cachedHasVersion)
+                module_config.setValue("module-version",
+                                       config(CSwordModuleInfo::ModuleVersion));
             module_config.setValue("index-version", INDEX_VERSION);
             emit hasIndexChanged(true);
         }
-    }
-    catch (CLuceneError &e) {
+    } catch (CLuceneError & e) {
         qWarning() << "CLucene exception occurred while indexing:" << e.what();
-        util::showWarning(0, QCoreApplication::tr("Indexing aborted"), QCoreApplication::tr("An internal error occurred while building the index: %1").arg(e.what()));
+        message::showWarning(0,
+                          QCoreApplication::tr("Indexing aborted"),
+                          QCoreApplication::tr("An internal error occurred "
+                                               "while building the index: %1")
+                          .arg(e.what()));
         deleteIndex();
         m_cancelIndexing = false;
         return false;
-    }
-    catch (...) {
+    } catch (...) {
         qWarning("CLucene exception occurred while indexing");
-        util::showWarning(0, QCoreApplication::tr("Indexing aborted"), QCoreApplication::tr("An internal error occurred while building the index."));
+        message::showWarning(0,
+                          QCoreApplication::tr("Indexing aborted"),
+                          QCoreApplication::tr("An internal error occurred "
+                                               "while building the index."));
         deleteIndex();
         m_cancelIndexing = false;
         return false;
     }
-
     return true;
 }
 
 void CSwordModuleInfo::deleteIndex() {
-    deleteIndexForModule(name());
+    deleteIndexForModule(m_cachedName);
     emit hasIndexChanged(false);
 }
 
-void CSwordModuleInfo::deleteIndexForModule(const QString &name) {
-    util::directory::removeRecursive( getGlobalBaseIndexLocation() + "/" + name );
+void CSwordModuleInfo::deleteIndexForModule(const QString & name) {
+    util::directory::removeRecursive(getGlobalBaseIndexLocation() + "/" + name);
 }
 
 unsigned long CSwordModuleInfo::indexSize() const {
     namespace DU = util::directory;
-    return DU::getDirSizeRecursive( getModuleBaseIndexLocation() );
+    return DU::getDirSizeRecursive(getModuleBaseIndexLocation());
 }
 
-
-int CSwordModuleInfo::searchIndexed(const QString &searchedText,
-                                    const sword::ListKey &scope,
-                                    sword::ListKey &results) const
+int CSwordModuleInfo::searchIndexed(const QString & searchedText,
+                                    const sword::ListKey & scope,
+                                    sword::ListKey & results) const
 {
-    char utfBuffer[BT_MAX_LUCENE_FIELD_LENGTH  + 1];
-    wchar_t wcharBuffer[BT_MAX_LUCENE_FIELD_LENGTH + 1];
+    QScopedPointer<char, QScopedPointerArrayDeleter<char> >
+        sPutfBuffer(new char[BT_MAX_LUCENE_FIELD_LENGTH  + 1]);
+    QScopedPointer<wchar_t, QScopedPointerArrayDeleter<wchar_t> >
+        sPwcharBuffer(new wchar_t[BT_MAX_LUCENE_FIELD_LENGTH  + 1]);
+    char * const utfBuffer = sPutfBuffer.data();
+    Q_ASSERT(utfBuffer);
+    wchar_t * const wcharBuffer = sPwcharBuffer.data();
+    Q_ASSERT(wcharBuffer);
 
     // work around Swords thread insafety for Bibles and Commentaries
-    QSharedPointer < CSwordKey > key(CSwordKey::createInstance(this));
-    sword::SWKey* s = dynamic_cast < sword::SWKey * >(key.data());
-    QList<sword::VerseKey*> list;
-
-    if (s) {
-        m_module->setKey(*s);
+    QSharedPointer<CSwordKey> key(CSwordKey::createInstance(this));
+    {
+        const sword::SWKey * const s = dynamic_cast<sword::SWKey *>(key.data());
+        if (s)
+            m_module->setKey(*s);
     }
+    QList<sword::VerseKey *> list;
 
     results.clear();
 
     try {
         // do not use any stop words
-        const TCHAR* stop_words[]  = { NULL };
-        lucene::analysis::standard::StandardAnalyzer analyzer( stop_words );
+        static const TCHAR * stop_words[1u]  = { NULL };
+        lucene::analysis::standard::StandardAnalyzer analyzer(stop_words);
         lucene::search::IndexSearcher searcher(getModuleStandardIndexLocation().toLatin1().constData());
         lucene_utf8towcs(wcharBuffer, searchedText.toUtf8().constData(), BT_MAX_LUCENE_FIELD_LENGTH);
-        QSharedPointer<lucene::search::Query> q( lucene::queryParser::QueryParser::parse((const TCHAR*)wcharBuffer, (const TCHAR*)_T("content"), &analyzer) );
-
-#ifdef CLUCENE2
-        QSharedPointer<lucene::search::Hits> h( searcher.search(q.data(), lucene::search::Sort::INDEXORDER()) );
-#else
-        QSharedPointer<lucene::search::Hits> h( searcher.search(q.data(), lucene::search::Sort::INDEXORDER) );
-#endif
+        QSharedPointer<lucene::search::Query> q(lucene::queryParser::QueryParser::parse(static_cast<const TCHAR *>(wcharBuffer),
+                                                                                        static_cast<const TCHAR *>(_T("content")),
+                                                                                        &analyzer));
 
-        /// \warning This is a workaround for Sword constness
-        const bool useScope = (const_cast<sword::ListKey&>(scope).Count() > 0);
-//        const bool isVerseModule = (type() == CSwordModuleInfo::Bible) || (type() == CSwordModuleInfo::Commentary);
+        QSharedPointer<lucene::search::Hits> h(searcher.search(q.data(),
+                                                               #ifdef CLUCENE2
+                                                               lucene::search::Sort::INDEXORDER()));
+                                                               #else
+                                                               lucene::search::Sort::INDEXORDER));
+                                                               #endif
 
-        lucene::document::Document* doc = 0;
-        QSharedPointer<sword::SWKey> swKey( module()->CreateKey() );
+        const bool useScope = (scope.getCount() > 0);
 
+        lucene::document::Document * doc = 0;
+        QSharedPointer<sword::SWKey> swKey(m_module->createKey());
 
 #ifdef CLUCENE2
         for (unsigned int i = 0; i < h->length(); ++i) {
 #else
-	for (int i = 0; i < h->length(); ++i) {
+        for (int i = 0; i < h->length(); ++i) {
 #endif
             doc = &h->doc(i);
-            lucene_wcstoutf8(utfBuffer, (const wchar_t*)doc->get((const TCHAR*)_T("key")), BT_MAX_LUCENE_FIELD_LENGTH);
+            lucene_wcstoutf8(utfBuffer,
+                             static_cast<const wchar_t *>(doc->get(static_cast<const TCHAR *>(_T("key")))),
+                             BT_MAX_LUCENE_FIELD_LENGTH);
 
             swKey->setText(utfBuffer);
 
-            // limit results based on scope
-            //if (searchOptions & CSwordModuleSearch::useScope && scope.Count() > 0){
+            // Limit results based on scope:
             if (useScope) {
-                /// \warning This is a workaround for sword constness
-                for (int j = 0; j < const_cast<sword::ListKey&>(scope).Count(); j++) {
-                    /// \warning This is a workaround for sword constness
-                    sword::ListKey &scope2 = const_cast<sword::ListKey&>(scope);
-                    sword::VerseKey* vkey = dynamic_cast<sword::VerseKey*>(scope2.getElement(j));
-                    if (vkey->LowerBound().compare(*swKey) <= 0 && vkey->UpperBound().compare(*swKey) >= 0) {
+                for (int j = 0; j < scope.getCount(); j++) {
+                    Q_ASSERT(dynamic_cast<const sword::VerseKey *>(scope.getElement(j)));
+                    const sword::VerseKey * const vkey = static_cast<const sword::VerseKey *>(scope.getElement(j));
+                    if (vkey->getLowerBound().compare(*swKey) <= 0
+                        && vkey->getUpperBound().compare(*swKey) >= 0)
+                    {
                         results.add(*swKey);
                     }
                 }
-            }
-            else { // no scope, give me all buffers
-                results.add(*swKey);
+            } else {
+                results.add(*swKey); // No scope, give me all buffers
             }
         }
-    }
-    catch (...) {
+    } catch (...) {
         qWarning("CLucene exception occurred");
-        util::showWarning(0, QCoreApplication::tr("Search aborted"), QCoreApplication::tr("An internal error occurred while executing your search."));
+        message::showWarning(0,
+                          QCoreApplication::tr("Search aborted"),
+                          QCoreApplication::tr("An internal error occurred "
+                                               "while executing your search."));
         return 0;
     }
 
     qDeleteAll(list);
     list.clear();
 
-    return results.Count();
+    return results.getCount();
 }
 
 sword::SWVersion CSwordModuleInfo::minimumSwordVersion() const {
-    return sword::SWVersion(config(CSwordModuleInfo::MinimumSwordVersion).toUtf8().constData());
+    return sword::SWVersion(config(CSwordModuleInfo::MinimumSwordVersion)
+                            .toUtf8().constData());
 }
 
 QString CSwordModuleInfo::config(const CSwordModuleInfo::ConfigEntry entry) const {
@@ -527,37 +543,32 @@ QString CSwordModuleInfo::config(const CSwordModuleInfo::ConfigEntry entry) cons
             return getFormattedConfigEntry("About");
 
         case CipherKey: {
-            if (CBTConfig::getModuleEncryptionKey(name()).isNull()) { //fall back!
-                return QString(m_module->getConfigEntry("CipherKey"));
-            }
-            else {
-                return CBTConfig::getModuleEncryptionKey(name());
+            if (btConfig().getModuleEncryptionKey(m_cachedName).isNull()) {
+                return QString(m_module->getConfigEntry("CipherKey")); // Fallback
+            } else {
+                return btConfig().getModuleEncryptionKey(m_cachedName);
             }
         }
 
         case AbsoluteDataPath: {
-            QString path( getSimpleConfigEntry("AbsoluteDataPath") );
-            path.replace(QRegExp("/./"), "/"); // make /abs/path/./modules/ looking better
-            //make sure we have a trailing slash!
-
-            if (path.right(1) != "/") {
+            QString path(getSimpleConfigEntry("AbsoluteDataPath"));
+            if (!path.endsWith('/')) /// \todo is this needed?
                 path.append('/');
-            }
 
             return path;
         }
 
-        case DataPath: { //make sure we remove the dataFile part if it's a Lexicon
+        case DataPath: {
             QString path(getSimpleConfigEntry("DataPath"));
 
-            if ((type() == CSwordModuleInfo::GenericBook) || (type() == CSwordModuleInfo::Lexicon)) {
-                int pos = path.lastIndexOf("/"); //last slash in the string
-
-                if (pos != -1) {
-                    path = path.left(pos + 1); //include the slash
-                }
+            // Make sure we remove the dataFile part if it's a Lexicon
+            if (m_type == CSwordModuleInfo::GenericBook
+                || m_type == CSwordModuleInfo::Lexicon)
+            {
+                int pos = path.lastIndexOf("/"); // Last slash in the string
+                if (pos != -1)
+                    path = path.left(pos + 1); // Include the slash
             }
-
             return path;
         }
 
@@ -565,84 +576,76 @@ QString CSwordModuleInfo::config(const CSwordModuleInfo::ConfigEntry entry) cons
             return getFormattedConfigEntry("Description");
 
         case ModuleVersion: {
-            QString version(getSimpleConfigEntry("Version"));
-
-            if (version.isEmpty()) {
-                version = "1.0";
-            }
-
-            return version;
+            const QString version(getSimpleConfigEntry("Version"));
+            return version.isEmpty() ? "1.0" : version;
         }
 
         case MinimumSwordVersion: {
             const QString minimumVersion(getSimpleConfigEntry("MinimumVersion"));
-            return !minimumVersion.isEmpty() ? minimumVersion : QString("0.0");
+            return minimumVersion.isEmpty() ? "0.0" : minimumVersion;
         }
 
         case TextDir: {
             const QString dir(getSimpleConfigEntry("Direction"));
-            return !dir.isEmpty() ? dir : QString("LtoR");
+            return dir.isEmpty() ? QString("LtoR") : dir;
         }
 
         case DisplayLevel: {
             const QString level(getSimpleConfigEntry("DisplayLevel"));
-            return !level.isEmpty() ? level : QString("1");
+            return level.isEmpty() ? QString("1") : level;
         }
 
         case GlossaryFrom: {
-            if (category() != Glossary) {
+            if (m_cachedCategory != Glossary)
                 return QString::null;
-            };
 
             const QString lang(getSimpleConfigEntry("GlossaryFrom"));
-
-            return !lang.isEmpty() ? lang : QString::null;
+            return lang.isEmpty() ? QString::null : lang;
         }
 
         case GlossaryTo: {
-            if (category() != Glossary) {
+            if (m_cachedCategory != Glossary) {
                 return QString::null;
             };
 
             const QString lang(getSimpleConfigEntry("GlossaryTo"));
-
-            return !lang.isEmpty() ? lang : QString::null;
+            return lang.isEmpty() ? QString::null : lang;
         }
 
         case Markup: {
             const QString markup(getSimpleConfigEntry("SourceType"));
-            return !markup.isEmpty() ? markup : QString("Unknown");
+            return markup.isEmpty() ? QString("Unknown") : markup;
         }
 
         case DistributionLicense:
-            return getSimpleConfigEntry("DistributionLicense");
+            return getFormattedConfigEntry("DistributionLicense");
 
         case DistributionSource:
-            return getSimpleConfigEntry("DistributionSource");
+            return getFormattedConfigEntry("DistributionSource");
 
         case DistributionNotes:
-            return getSimpleConfigEntry("DistributionNotes");
+            return getFormattedConfigEntry("DistributionNotes");
 
         case TextSource:
-            return getSimpleConfigEntry("TextSource");
+            return getFormattedConfigEntry("TextSource");
 
         case CopyrightNotes:
-            return getSimpleConfigEntry("CopyrightNotes");
+            return getFormattedConfigEntry("CopyrightNotes");
 
         case CopyrightHolder:
-            return getSimpleConfigEntry("CopyrightHolder");
+            return getFormattedConfigEntry("CopyrightHolder");
 
         case CopyrightDate:
-            return getSimpleConfigEntry("CopyrightDate");
+            return getFormattedConfigEntry("CopyrightDate");
 
         case CopyrightContactName:
-            return getSimpleConfigEntry("CopyrightContactName");
+            return getFormattedConfigEntry("CopyrightContactName");
 
         case CopyrightContactAddress:
-            return getSimpleConfigEntry("CopyrightContactAddress");
+            return getFormattedConfigEntry("CopyrightContactAddress");
 
         case CopyrightContactEmail:
-            return getSimpleConfigEntry("CopyrightContactEmail");
+            return getFormattedConfigEntry("CopyrightContactEmail");
 
         default:
             return QString::null;
@@ -651,75 +654,54 @@ QString CSwordModuleInfo::config(const CSwordModuleInfo::ConfigEntry entry) cons
 
 bool CSwordModuleInfo::has(const CSwordModuleInfo::Feature feature) const {
     switch (feature) {
-
-            //         case StrongsNumbers:
-            //         return m_module->getConfig().has("Feature", "StrongsNumber");
-
-        case GreekDef:
-            return m_module->getConfig().has("Feature", "GreekDef");
-
-        case HebrewDef:
-            return m_module->getConfig().has("Feature", "HebrewDef");
-
-        case GreekParse:
-            return m_module->getConfig().has("Feature", "GreekParse");
-
-        case HebrewParse:
-            return m_module->getConfig().has("Feature", "HebrewParse");
+        case GreekDef: return m_module->getConfig().has("Feature", "GreekDef");
+        case HebrewDef: return m_module->getConfig().has("Feature", "HebrewDef");
+        case GreekParse: return m_module->getConfig().has("Feature", "GreekParse");
+        case HebrewParse: return m_module->getConfig().has("Feature", "HebrewParse");
     }
-
     return false;
 }
 
 bool CSwordModuleInfo::has(const CSwordModuleInfo::FilterTypes option) const {
-    //BAD workaround to see if the filter is GBF, OSIS or ThML!
-    const QString name = backend()->configOptionName(option);
-
-    if (m_module->getConfig().has("GlobalOptionFilter", QString("OSIS").append(name).toUtf8().constData())) {
-        return true;
-    }
-
-    if (m_module->getConfig().has("GlobalOptionFilter", QString("GBF").append(name).toUtf8().constData())) {
-        return true;
-    }
-
-    if (m_module->getConfig().has("GlobalOptionFilter", QString("ThML").append(name).toUtf8().constData())) {
-        return true;
-    }
-
-    if (m_module->getConfig().has("GlobalOptionFilter", QString("UTF8").append(name).toUtf8().constData())) {
-        return true;
-    }
-
-    if (m_module->getConfig().has("GlobalOptionFilter", name.toUtf8().constData())) {
-        return true;
-    }
-
-    return false;
+    /// \todo This is a BAD workaround to see if the filter is GBF, OSIS or ThML!
+    const QString name = m_backend.configOptionName(option);
+    return m_module->getConfig().has("GlobalOptionFilter",
+                                     QString("OSIS").append(name).toUtf8().constData())
+        || m_module->getConfig().has("GlobalOptionFilter",
+                                     QString("GBF").append(name).toUtf8().constData())
+        || m_module->getConfig().has("GlobalOptionFilter",
+                                     QString("ThML").append(name).toUtf8().constData())
+        || m_module->getConfig().has("GlobalOptionFilter",
+                                     QString("UTF8").append(name).toUtf8().constData())
+        || m_module->getConfig().has("GlobalOptionFilter",
+                                     name.toUtf8().constData());
 }
 
 CSwordModuleInfo::TextDirection CSwordModuleInfo::textDirection() const {
-    if (config(TextDir) == "RtoL")
-        return CSwordModuleInfo::RightToLeft;
-
-    return CSwordModuleInfo::LeftToRight;
+    return (config(TextDir) == "RtoL")
+           ? CSwordModuleInfo::RightToLeft
+           : CSwordModuleInfo::LeftToRight;
 }
 
-void CSwordModuleInfo::write(CSwordKey *key, const QString &newText) {
-    module()->setKey(key->key().toUtf8().constData());
+void CSwordModuleInfo::write(CSwordKey * key, const QString & newText) {
+    m_module->setKey(key->key().toUtf8().constData());
 
-    //don't store a pointer to the const char* value somewhere because QCString doesn't keep the value of it
-    module()->setEntry(isUnicode() ? newText.toUtf8().constData() : newText.toLocal8Bit().constData());
+    /* Don't store a pointer to the const char* value somewhere because QCString
+      doesn't keep the value of it. */
+    m_module->setEntry(isUnicode()
+                       ? newText.toUtf8().constData()
+                       : newText.toLocal8Bit().constData());
 }
 
 bool CSwordModuleInfo::deleteEntry(CSwordKey * const key) {
-    module()->setKey(isUnicode() ? key->key().toUtf8().constData() : key->key().toLocal8Bit().constData());
+    m_module->setKey(isUnicode()
+                     ? key->key().toUtf8().constData()
+                     : key->key().toLocal8Bit().constData());
 
-    if (module()) {
-        module()->deleteEntry();
+    if (m_module) {
+        m_module->deleteEntry();
         return true;
     }
-
     return false;
 }
 
@@ -727,7 +709,7 @@ void CSwordModuleInfo::initCachedCategory() {
     /// \todo Maybe we can use raw string comparsion instead of QString?
     const QString cat(m_module->getConfigEntry("Category"));
 
-    /// \warning cat has to be checked before type() !!!
+    /// \warning cat has to be checked before m_type !!!
     if (cat == "Cults / Unorthodox / Questionable Material") {
         m_cachedCategory = Cult;
     } else if (cat == "Daily Devotional"
@@ -741,7 +723,7 @@ void CSwordModuleInfo::initCachedCategory() {
     } else if (cat == "Images" || cat == "Maps") {
         m_cachedCategory = Images;
     } else {
-        switch (type()) {
+        switch (m_type) {
             case Bible:       m_cachedCategory = Bibles; break;
             case Commentary:  m_cachedCategory = Commentaries; break;
             case Lexicon:     m_cachedCategory = Lexicons; break;
@@ -753,15 +735,15 @@ void CSwordModuleInfo::initCachedCategory() {
 }
 
 void CSwordModuleInfo::initCachedLanguage() {
-    CLanguageMgr *lm = CLanguageMgr::instance();
-    if (category() == Glossary) {
+    const CLanguageMgr & lm = *CLanguageMgr::instance();
+    if (m_cachedCategory == Glossary) {
         /*
           Special handling for glossaries, we use the "from language" as
           language for the module.
         */
-        m_cachedLanguage = lm->languageForAbbrev(config(GlossaryFrom));
+        m_cachedLanguage = lm.languageForAbbrev(config(GlossaryFrom));
     } else {
-        m_cachedLanguage = lm->languageForAbbrev(m_module->Lang());
+        m_cachedLanguage = lm.languageForAbbrev(m_module->getLanguage());
     }
 }
 
@@ -770,74 +752,87 @@ Rendering::CEntryDisplay * CSwordModuleInfo::getDisplay() const {
 }
 
 QString CSwordModuleInfo::aboutText() const {
+    using util::htmlEscape;
+
+    static const QString row("<tr><td><b>%1</b></td><td>%2</td></tr>");
+
     QString text;
     text += "<table>";
 
-    text += QString("<tr><td><b>%1</b></td><td>%2</td><tr>")
+    text += row
             .arg(tr("Version"))
-            .arg(hasVersion() ? config(CSwordModuleInfo::ModuleVersion) : tr("unknown"));
+            .arg(m_cachedHasVersion
+                 ? htmlEscape(config(CSwordModuleInfo::ModuleVersion))
+                 : tr("unknown"));
 
-    text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>")
-            .arg(tr("Markup"))
-            .arg(!QString(m_module->getConfigEntry("SourceType")).isEmpty() ? QString(m_module->
-                    getConfigEntry("SourceType")) : tr("unknown"));
+    {
+        const QString sourceType(m_module->getConfigEntry("SourceType"));
+        text += row
+                .arg(tr("Markup"))
+                .arg(!sourceType.isEmpty()
+                     ? htmlEscape(sourceType)
+                     : tr("unknown"));
+    }
 
-    text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>")
+    text += row
             .arg(tr("Location"))
-            .arg(config(CSwordModuleInfo::AbsoluteDataPath));
+            .arg(htmlEscape(config(CSwordModuleInfo::AbsoluteDataPath)));
 
-    text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>")
+    text += row
             .arg(tr("Language"))
-            .arg(language()->translatedName());
+            .arg(htmlEscape(m_cachedLanguage->translatedName()));
 
     if (m_module->getConfigEntry("Category"))
-        text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>")
+        text += row
                 .arg(tr("Category"))
-                .arg(m_module->getConfigEntry("Category"));
+                .arg(htmlEscape(m_module->getConfigEntry("Category")));
 
     if (m_module->getConfigEntry("LCSH"))
-        text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>")
+        text += row
                 .arg(tr("LCSH"))
-                .arg(m_module->getConfigEntry("LCSH"));
+                .arg(htmlEscape(m_module->getConfigEntry("LCSH")));
 
-    text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>")
+    text += row
             .arg(tr("Writable"))
             .arg(isWritable() ? tr("yes") : tr("no"));
 
     if (isEncrypted())
-        text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>")
+        text += row
                 .arg(tr("Unlock key"))
-                .arg(config(CSwordModuleInfo::CipherKey));
+                .arg(htmlEscape(config(CSwordModuleInfo::CipherKey)));
 
     QString options;
 
     unsigned int opts;
 
-    for (opts = CSwordModuleInfo::filterTypesMIN; opts <= CSwordModuleInfo::filterTypesMAX; ++opts) {
+    for (opts = CSwordModuleInfo::filterTypesMIN;
+         opts <= CSwordModuleInfo::filterTypesMAX;
+         ++opts)
+    {
         if (has(static_cast < CSwordModuleInfo::FilterTypes > (opts))) {
-            if (!options.isEmpty()) {
+            if (!options.isEmpty())
                 options += QString::fromLatin1(", ");
-            }
-
-            options += CSwordBackend::translatedOptionName(static_cast < CSwordModuleInfo::FilterTypes > (opts));
+            typedef CSwordModuleInfo::FilterTypes FT;
+            options += CSwordBackend::translatedOptionName(static_cast<FT>(opts));
         }
     }
 
-    if (!options.isEmpty()) {
-        text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>")
+    if (!options.isEmpty())
+        text += row
                 .arg(tr("Features"))
-                .arg(options);
-    }
+                .arg(htmlEscape(options));
 
     text += "</table><hr>";
 
-    if (category() == Cult) //clearly say the module contains cult/questionable materials
+    // Clearly say the module contains cult/questionable materials
+    if (m_cachedCategory == Cult)
         text += QString("<br/><b>%1</b><br/><br/>")
-                .arg(tr("Take care, this work contains cult / questionable material!"));
+                .arg(tr("Take care, this work contains cult / questionable "
+                        "material!"));
 
     text += QString("<b>%1:</b><br/>%2</font>")
             .arg(tr("About"))
-            .arg(config(AboutInformation));
+            .arg(config(AboutInformation)); // May contain HTML, don't escape
 
     typedef QList<CSwordModuleInfo::ConfigEntry> ListConfigEntry;
 
@@ -871,61 +866,47 @@ QString CSwordModuleInfo::aboutText() const {
 
     text += ("<hr><table>");
 
-    for (ListConfigEntry::iterator it(entries.begin()); it != entries.end(); ++it) {
-        QString t( config(*it) );
-
-        if (!t.isEmpty()) {
-            text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>")
-                    .arg(entryMap[*it])
-                    .arg(config(*it));
-        }
-
-    }
+    for (ListConfigEntry::iterator it(entries.begin()); it != entries.end(); ++it)
+        if (!config(*it).isEmpty())
+            text += row
+                    .arg(htmlEscape(entryMap[*it]))
+                    .arg(htmlEscape(config(*it)));
 
     text += "</table></font>";
 
     return text;
 }
 
-QIcon CSwordModuleInfo::moduleIcon(const CSwordModuleInfo *module) {
-    const QString &filename = moduleIconFilename(module);
-    if (filename.isEmpty()) return QIcon();
-    return util::directory::getIcon(filename);
+QIcon CSwordModuleInfo::moduleIcon(const CSwordModuleInfo & module) {
+    const QString & filename = moduleIconFilename(module);
+    if (filename.isEmpty())
+        return QIcon();
+    return util::getIcon(filename);
 }
 
-const QString &CSwordModuleInfo::moduleIconFilename(
-        const CSwordModuleInfo *module)
-{
-    const CSwordModuleInfo::Category cat(module->category());
+const QString & CSwordModuleInfo::moduleIconFilename(const CSwordModuleInfo & module) {
+    const CSwordModuleInfo::Category cat(module.m_cachedCategory);
     switch (cat) {
         case CSwordModuleInfo::Bibles:
-            if (module->isLocked()) {
-                return CResMgr::modules::bible::icon_locked;
-            }
-            else {
-                return CResMgr::modules::bible::icon_unlocked;
-            }
+            return module.isLocked()
+                   ? CResMgr::modules::bible::icon_locked
+                   : CResMgr::modules::bible::icon_unlocked;
+
         case CSwordModuleInfo::Commentaries:
-            if (module->isLocked()) {
-                return CResMgr::modules::commentary::icon_locked;
-            }
-            else {
-                return CResMgr::modules::commentary::icon_unlocked;
-            }
+            return module.isLocked()
+                   ? CResMgr::modules::commentary::icon_locked
+                   : CResMgr::modules::commentary::icon_unlocked;
+
         case CSwordModuleInfo::Lexicons:
-            if (module->isLocked()) {
-                return CResMgr::modules::lexicon::icon_locked;
-            }
-            else {
-                return CResMgr::modules::lexicon::icon_unlocked;
-            }
+            return module.isLocked()
+                   ? CResMgr::modules::lexicon::icon_locked
+                   : CResMgr::modules::lexicon::icon_unlocked;
+
         case CSwordModuleInfo::Books:
-            if (module->isLocked()) {
-                return CResMgr::modules::book::icon_locked;
-            }
-            else {
-                return CResMgr::modules::book::icon_unlocked;
-            }
+            return module.isLocked()
+                   ? CResMgr::modules::book::icon_locked
+                   : CResMgr::modules::book::icon_unlocked;
+
         case CSwordModuleInfo::Cult:
         case CSwordModuleInfo::Images:
         case CSwordModuleInfo::DailyDevotional:
@@ -936,16 +917,14 @@ const QString &CSwordModuleInfo::moduleIconFilename(
     }
 }
 
-QIcon CSwordModuleInfo::categoryIcon(const CSwordModuleInfo::Category &category)
-{
-    QString filename = categoryIconFilename(category);
-    if (filename.isEmpty()) return QIcon();
-    return util::directory::getIcon(filename);
+QIcon CSwordModuleInfo::categoryIcon(const CSwordModuleInfo::Category & category) {
+    const QString filename(categoryIconFilename(category));
+    if (filename.isEmpty())
+        return QIcon();
+    return util::getIcon(filename);
 }
 
-const QString &CSwordModuleInfo::categoryIconFilename(
-        const CSwordModuleInfo::Category &category)
-{
+const QString & CSwordModuleInfo::categoryIconFilename(const CSwordModuleInfo::Category & category) {
     static const QString noFilename;
 
     switch (category) {
@@ -971,8 +950,7 @@ const QString &CSwordModuleInfo::categoryIconFilename(
     }
 }
 
-QString CSwordModuleInfo::categoryName(
-    const CSwordModuleInfo::Category &category) {
+QString CSwordModuleInfo::categoryName(const CSwordModuleInfo::Category & category) {
     switch (category) {
         case CSwordModuleInfo::Bibles:
             return tr("Bibles");
@@ -995,7 +973,7 @@ QString CSwordModuleInfo::categoryName(
     }
 }
 
-QString CSwordModuleInfo::getSimpleConfigEntry(const QString& name) const {
+QString CSwordModuleInfo::getSimpleConfigEntry(const QString & name) const {
     QString ret = isUnicode()
                   ? QString::fromUtf8(m_module->getConfigEntry(name.toUtf8().constData()))
                   : QString::fromLatin1(m_module->getConfigEntry(name.toUtf8().constData()));
@@ -1003,32 +981,38 @@ QString CSwordModuleInfo::getSimpleConfigEntry(const QString& name) const {
     return ret.isEmpty() ? QString::null : ret;
 }
 
-QString CSwordModuleInfo::getFormattedConfigEntry(const QString& name) const {
-    sword::SWBuf RTF_Buffer(m_module->getConfigEntry(name.toUtf8().constData()));
-    sword::RTFHTML RTF_Filter;
-    RTF_Filter.processText(RTF_Buffer, 0, 0);
-    QString ret = isUnicode()
-                  ? QString::fromUtf8(RTF_Buffer.c_str())
-                  : QString::fromLatin1(RTF_Buffer.c_str());
-
-    return ret.isEmpty() ? QString::null : ret;
+/// \note See http://www.crosswire.org/wiki/DevTools:conf_Files#Localization
+QString CSwordModuleInfo::getFormattedConfigEntry(const QString & name) const {
+    const QStringList localeNames(QLocale(CSwordBackend::instance()->booknameLanguage()).uiLanguages());
+    for (int i = localeNames.size() - 1; i >= -1; --i) {
+        sword::SWBuf RTF_Buffer =
+                m_module->getConfigEntry(
+                    QString(i >= 0 ? name + "_" + localeNames[i] : name)
+                        .toUtf8().constData());
+        if (RTF_Buffer.length() > 0) {
+            sword::RTFHTML RTF_Filter;
+            RTF_Filter.processText(RTF_Buffer, 0, 0);
+            return isUnicode()
+                   ? QString::fromUtf8(RTF_Buffer.c_str())
+                   : QString::fromLatin1(RTF_Buffer.c_str());
+        }
+    }
+    return QString::null;
 }
 
 bool CSwordModuleInfo::setHidden(bool hide) {
-    if (m_hidden == hide) return false;
+    if (m_hidden == hide)
+        return false;
 
     m_hidden = hide;
-    QStringList hiddenModules(CBTConfig::get(CBTConfig::hiddenModules));
+    QStringList hiddenModules(btConfig().value<QStringList>("state/hiddenModules"));
+    Q_ASSERT(hiddenModules.contains(m_cachedName) != hide);
     if (hide) {
-        Q_ASSERT(!hiddenModules.contains(name()));
-        hiddenModules.append(name());
-    }
-    else {
-        Q_ASSERT(hiddenModules.contains(name()));
-        hiddenModules.removeOne(name());
+        hiddenModules.append(m_cachedName);
+    } else {
+        hiddenModules.removeOne(m_cachedName);
     }
-    CBTConfig::set(CBTConfig::hiddenModules, hiddenModules);
+    btConfig().setValue("state/hiddenModules", hiddenModules);
     emit hiddenChanged(hide);
     return true;
 }
-
diff --git a/src/backend/drivers/cswordmoduleinfo.h b/src/backend/drivers/cswordmoduleinfo.h
index 3c59f9d..c1b6c88 100644
--- a/src/backend/drivers/cswordmoduleinfo.h
+++ b/src/backend/drivers/cswordmoduleinfo.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -12,6 +14,7 @@
 
 #include "backend/managers/clanguagemgr.h"
 
+#include <QIcon>
 #include <QList>
 #include <QMetaType>
 #include <QString>
@@ -47,403 +50,418 @@ class CEntryDisplay;
  */
 
 class CSwordModuleInfo: public QObject {
-        Q_OBJECT
-
-    public:
-        /**
-         * These are the options which could be supported by modules and by this backend.
-         * It's used in @ref CSwordBackend::setOption.
-         */
-        enum FilterTypes {
-            footnotes, /**< Footnotes embedded in the module's text */
-            strongNumbers, /**< strong numbers, usually in the text for the info display */
-            headings, /**< additional section headings */
-            morphTags, /**< morphology */
-            lemmas, /**< lemma tags */
-            hebrewPoints,/**< Hebrew vowel points */
-            hebrewCantillation, /**<Hewbrew caantillation points */
-            greekAccents, /**< Greek accents may be switched on and off */
-            scriptureReferences, /**< scripture references may be switched on and off, just makes sense in Bibles */
-            redLetterWords, /**< Jesus words in red, color is template specific */
-            textualVariants, /**< variants */
-            morphSegmentation, /**< morph word segmentation, supported by OSIS */
-            filterTypesMIN = footnotes, /**< first entry of this enum */
-            filterTypesMAX = morphSegmentation /**< last item in this enum */
-            //     transliteration /* The following are handled in a special way */
-        };
-        /** The text direction of a module */
-        enum TextDirection { /* The text direction of the modules's text */
-            LeftToRight, /**< Left to right text direction, the default setting */
-            RightToLeft /**< Right to left text directin, e.g. for hebrew */
-        };
-        /** The module type.
-        */
-        enum ModuleType {
-            Bible, /**< Bible module */
-            Commentary, /**< Commentary module */
-            Lexicon, /**< Lexicon module */
-            GenericBook, /**< Generic book module */
-            Unknown /**< Fall back type for unknown modules */
-        };
-        /**
-         * This enum is used to give
-         * back an error code after unlocking the module
-         * BibleTime stores the unlock key not in the module's config file but in BibleTime's
-         * configuration file.
-         */
-        enum UnlockErrorCode {
-            noError, /**< No error occured, everything worked ok. The key was written to the BibleTime config */
-            wrongUnlockKey, /**< The wrong key was used. Module is not unlocked */
-            notLocked, /**< The module was not locked so it can't be unlocked */
-            noPermission /**< The key was not written to config because we have no permissions */
-        };
-        enum ConfigEntry {
-            AboutInformation, /**< The about information of a module which is stored in the config file*/
-            AbsoluteDataPath, /**< The absolute data path stored in the config object */
-            CipherKey, /**< The cipher key which was used to unlock the module. Not necessarily set.*/
-            DataPath, /**< The relative path. See AbsoluteDataPath*/
-            Description, /**< The module description stored in the config file */
-            ModuleVersion, /**< The module's version.*/
-            MinimumSwordVersion, /**< The required Sword Version of this module. Otherwise some things may not work (compression etc.).*/
-            TextDir, /**< The text direction */
-            DisplayLevel, /**< Mostly used for books. Gives the level which should contain the connected entries.*/
-            GlossaryFrom, /**< lamguage from which the Glosaary tramslates */
-            GlossaryTo, /**< lamguages to which the glossary maps to */
-            DistributionLicense,
-            DistributionSource,
-            DistributionNotes,
-            TextSource,
-            CopyrightNotes,
-            CopyrightHolder,
-            CopyrightDate,
-            CopyrightContactName,
-            CopyrightContactAddress,
-            CopyrightContactEmail,
-            Markup  /**< The markup of this module */
-        };
-        enum Feature {
-            //StrongsNumbers, /**< Use for Bibles which have embedded strong numbers */ BT does not use this as a user option
-            GreekDef,
-            HebrewDef,
-            GreekParse,
-            HebrewParse,
-            featureMin = GreekDef,
-            featureMax = HebrewParse
-        };
-        enum Category {
-            UnknownCategory = 0x0,  /**< Unknown or unset category. */
-            NoCategory      = 0x0,
-            Bibles          = 0x01,
-            Commentaries    = 0x02,
-            Books           = 0x04,
-            Lexicons        = 0x08,
-            Glossary        = 0x10,
-            DailyDevotional = 0x20,
-            Images          = 0x40,
-            Cult            = 0x80, /**< Cult / sect / questionable module. */
-            AllCategories   = 0xff
-        };
-        Q_DECLARE_FLAGS(Categories, Category)
-
-        /**
-        * Returns the base directory for search indices
-        */
-        static QString getGlobalBaseIndexLocation();
-
-        /**
-          Removes the search index for this module (rm -rf).
-        */
-        void deleteIndex();
-
-        /**
-          Removes search index for a module, even if the module is not there any more.
-          \param[in] name name of the module.
-        */
-        static void deleteIndexForModule(const QString &name);
-
-
-        /**
-        * Returns the config entry which is pecified by the parameter.
-        */
-        QString config( const CSwordModuleInfo::ConfigEntry entry ) const;
-
-        CSwordModuleInfo(sword::SWModule *module,
-                         CSwordBackend * const = 0,
-                         ModuleType type = Unknown);
-
-        CSwordModuleInfo(const CSwordModuleInfo &copy);
-
-        /**
-        * Returns the module object so all objects can access the original Sword module.
-        */
-        inline sword::SWModule *module() const {
-            return m_module;
-        }
-
-        /**
-        * Sets the unlock key of the modules and writes the key into the config file.
-        * @return True if the unlock process was succesful, if the key was
+
+    Q_OBJECT
+
+public: /* Methods: */
+
+    /**
+     * These are the options which could be supported by modules and by this backend.
+     * It's used in @ref CSwordBackend::setOption.
+     */
+    enum FilterTypes {
+        footnotes, /**< Footnotes embedded in the module's text */
+        strongNumbers, /**< strong numbers, usually in the text for the info display */
+        headings, /**< additional section headings */
+        morphTags, /**< morphology */
+        lemmas, /**< lemma tags */
+        hebrewPoints,/**< Hebrew vowel points */
+        hebrewCantillation, /**<Hewbrew caantillation points */
+        greekAccents, /**< Greek accents may be switched on and off */
+        scriptureReferences, /**< scripture references may be switched on and off, just makes sense in Bibles */
+        redLetterWords, /**< Jesus words in red, color is template specific */
+        textualVariants, /**< variants */
+        morphSegmentation, /**< morph word segmentation, supported by OSIS */
+        filterTypesMIN = footnotes, /**< first entry of this enum */
+        filterTypesMAX = morphSegmentation /**< last item in this enum */
+        //     transliteration /* The following are handled in a special way */
+    };
+
+    /** The text direction of a module */
+    enum TextDirection { /* The text direction of the modules's text */
+        LeftToRight, /**< Left to right text direction, the default setting */
+        RightToLeft /**< Right to left text directin, e.g. for hebrew */
+    };
+
+    /** The module type. */
+    enum ModuleType {
+        Bible, /**< Bible module */
+        Commentary, /**< Commentary module */
+        Lexicon, /**< Lexicon module */
+        GenericBook, /**< Generic book module */
+        Unknown /**< Fall back type for unknown modules */
+    };
+
+    /**
+     * This enum is used to give
+     * back an error code after unlocking the module
+     * BibleTime stores the unlock key not in the module's config file but in BibleTime's
+     * configuration file.
+     */
+    enum UnlockErrorCode {
+        noError, /**< No error occured, everything worked ok. The key was written to the BibleTime config */
+        wrongUnlockKey, /**< The wrong key was used. Module is not unlocked */
+        notLocked, /**< The module was not locked so it can't be unlocked */
+        noPermission /**< The key was not written to config because we have no permissions */
+    };
+
+    enum ConfigEntry {
+        AboutInformation, /**< The about information of a module which is stored in the config file*/
+        AbsoluteDataPath, /**< The absolute data path stored in the config object */
+        CipherKey, /**< The cipher key which was used to unlock the module. Not necessarily set.*/
+        DataPath, /**< The relative path. See AbsoluteDataPath*/
+        Description, /**< The module description stored in the config file */
+        ModuleVersion, /**< The module's version.*/
+        MinimumSwordVersion, /**< The required Sword Version of this module. Otherwise some things may not work (compression etc.).*/
+        TextDir, /**< The text direction */
+        DisplayLevel, /**< Mostly used for books. Gives the level which should contain the connected entries.*/
+        GlossaryFrom, /**< lamguage from which the Glosaary tramslates */
+        GlossaryTo, /**< lamguages to which the glossary maps to */
+        DistributionLicense,
+        DistributionSource,
+        DistributionNotes,
+        TextSource,
+        CopyrightNotes,
+        CopyrightHolder,
+        CopyrightDate,
+        CopyrightContactName,
+        CopyrightContactAddress,
+        CopyrightContactEmail,
+        Markup  /**< The markup of this module */
+    };
+
+    enum Feature {
+        //StrongsNumbers, /**< Use for Bibles which have embedded strong numbers */ BT does not use this as a user option
+        GreekDef,
+        HebrewDef,
+        GreekParse,
+        HebrewParse,
+        featureMin = GreekDef,
+        featureMax = HebrewParse
+    };
+
+    enum Category {
+        UnknownCategory = 0x0,  /**< Unknown or unset category. */
+        NoCategory      = 0x0,
+        Bibles          = 0x01,
+        Commentaries    = 0x02,
+        Books           = 0x04,
+        Lexicons        = 0x08,
+        Glossary        = 0x10,
+        DailyDevotional = 0x20,
+        Images          = 0x40,
+        Cult            = 0x80, /**< Cult / sect / questionable module. */
+        AllCategories   = 0xff
+    };
+    Q_DECLARE_FLAGS(Categories, Category)
+
+    /**
+    * Returns the base directory for search indices
+    */
+    static QString getGlobalBaseIndexLocation();
+
+    /**
+      Removes the search index for this module (rm -rf).
+    */
+    void deleteIndex();
+
+    /**
+      Removes search index for a module, even if the module is not there any more.
+      \param[in] name name of the module.
+    */
+    static void deleteIndexForModule(const QString & name);
+
+    /**
+    * Returns the config entry which is pecified by the parameter.
+    */
+    QString config(const CSwordModuleInfo::ConfigEntry entry) const;
+
+    /**
+    * Returns the module object so all objects can access the original Sword module.
+    */
+    inline sword::SWModule * module() const {
+        return m_module;
+    }
+
+    /**
+    * Sets the unlock key of the modules and writes the key into the config file.
+    * @return True if the unlock process was succesful, if the key was
 wrong, or if the config file was write protected return false.
-        */
-        bool unlock( const QString& unlockKey );
-        /**
-        * Returns the display object for this module. Normally every module should have a Display object.
-        * Please don't use module()->Display() because this function does return the Sword display and does
-        * render the text, too.
-        * This function performs some casts to return the correct display. If it returns 0 there's no valid
-        * display object.
-        */
-        Rendering::CEntryDisplay* getDisplay() const;
-        /**
-        * This function does return true if the data files of the module are encrypted by the module author
-        * (the on who made the module) no matter if it's locked or not.
-        * @return True if this module is encryped
-        */
-        bool isEncrypted() const;
-        /**
-        * This function returns true if this module is locked (encrypted + correct cipher key),
-        * otherwise return false.
-        * @return True if this module is locked, i.e. encrypted but without a key set
-        */
-        bool isLocked() const;
-
-
-        /**
-          This function makes an estimate if a module was properly unlocked. It
-          returns true if the first entry of the module is not empty and
-          contains only printable characters (for the first 100 chars or so). If
-          that is the case, we can safely assume that a) the module was properly
-          unlocked and b) no buffer overflows will occur, which can happen when
-          Sword filters process garbage text which was not properly decrypted.
-        */
-        bool unlockKeyIsValid() const;
-
-        /**
-          \retval true if this module has a version number
-          \retval false if it doesn't have a version number
-        */
-        inline bool hasVersion() const {
-            return m_cachedHasVersion;
-        }
-
-        /**
-          \returns true if the module's index has been built.
-        */
-        bool hasIndex() const;
-
-        /**
-          \returns the path to this module's index base dir
-        */
-        QString getModuleBaseIndexLocation() const;
-
-        /**
-          \returns the path to this module's standard index
-        */
-        QString getModuleStandardIndexLocation() const;
-
-        /**
-          Builds a search index for this module
-          \returns Whether indexing this module was successful.
-        */
-        bool buildIndex();
-
-        /**
-          \returns index size
-        */
-        unsigned long indexSize() const;
-
-        /**
-          This function uses CLucene to perform and index based search. It also
-          overwrites the variable containing the last search result.
-          \returns the number of results found
-        */
-        int searchIndexed(const QString &searchedText,
-                          const sword::ListKey &scope,
-                          sword::ListKey &results) const;
-
-        /**
-          \returns the type of the module.
-        */
-        inline ModuleType type() const {
-            return m_type;
-        }
-
-        /**
-        * Returns the required Sword version for this module.
-        * Returns -1 if no special Sword version is required.
-        */
-        sword::SWVersion minimumSwordVersion() const;
-
-        /**
-          \note The Sword library takes care of the duplicate names: _n is added
-                after each duplicate.
-          \returns The name of this module.
-        */
-        inline const QString &name() const {
-            return m_cachedName;
-        }
-
-        /**
-        * Snaps to the closest entry in the module if the current key is
-        * not present in the data files.
-        */
-        virtual inline bool snap() const {
-            return false;
-        }
-
-        /**
-          \returns whether the module supports the feature given as parameter.
-        */
-        bool has(const CSwordModuleInfo::Feature) const;
-
-        bool has(const CSwordModuleInfo::FilterTypes ) const;
-
-        /**
-          \returns the text direction of the module's text.
-        */
-        CSwordModuleInfo::TextDirection textDirection() const;
-
-        /**
-          Writes the new text at the given position into the module. This does
-          only work for writabe modules.
-        */
-        void write(CSwordKey *key, const QString &newText);
-
-        /**
-          Deletes the current entry and removes it from the module.
-        */
-        bool deleteEntry(CSwordKey * const key);
-
-        /**
-          \returns the language of the module.
-        */
-        inline const CLanguageMgr::Language *language() const {
-            return m_cachedLanguage;
-        }
-
-        /**
-          \returns whether this module may be written to.
-        */
-        inline virtual bool isWritable() const {
-            return false;
-        }
-
-        /**
-        * Returns true if this module is hidden (not to be shown with other modules in certain views).
-        */
-        inline bool isHidden() const {
-            return m_hidden;
-        }
-
-        /**
-          Shows or hides the module.
-          \param hide Whether the module should be hidden.
-          \returns whether the hidden state was changed.
-        */
-        bool setHidden(bool hide);
-
-        /**
-          \returns the category of this module.
-        */
-        inline CSwordModuleInfo::Category category() const {
-            return m_cachedCategory;
-        }
-
-        /**
-        * The about text which belongs to this module.
-        */
-        QString aboutText() const;
-        /**
-        * Returns true if this module is Unicode encoded. False if the charset is iso8859-1.
-        * Protected because it should not be used outside of the CSword*ModuleInfo classes.
-        */
-        inline bool isUnicode() const {
-            return m_module->isUnicode();
-        }
-
-        /**
-          Returns an icon for the given module.
-          \param[in] module The module whose icon to return.
-        */
-        static QIcon moduleIcon(const CSwordModuleInfo *module);
-
-        /**
-          Returns the icon filename for the given module.
-          \param[in] module The module whose icon filename to return.
-        */
-        static const QString &moduleIconFilename(const CSwordModuleInfo *module);
-
-        /**
-          Returns an icon for the category of given module.
-          \param[in] module The module whose category icon to return.
-        */
-        static QIcon categoryIcon(const CSwordModuleInfo::Category &category);
-
-        /**
-          Returns the icon filename for the category of given module.
-          \param[in] module The module whose category icon filename to return.
-        */
-        static const QString &categoryIconFilename(const CSwordModuleInfo::Category &category);
-
-        /**
-          Returns a translated name for the given category.
-          \param[in] module The category whose translated name to return.
-        */
-        static QString categoryName(const CSwordModuleInfo::Category &category);
-
-    public slots:
-        inline void cancelIndexing() {
-            m_cancelIndexing = true;
-        }
-
-    protected:
-
-        inline CSwordBackend* backend() const {
-            return m_backend;
-        }
-
-        inline void backend( CSwordBackend* newBackend ) {
-            if (newBackend) {
-                m_backend = newBackend;
-            }
-        }
-
-        QString getSimpleConfigEntry(const QString& name) const;
-        QString getFormattedConfigEntry(const QString& name) const;
-
-    private: /* Methods: */
-        /**
-          Initializes CSwordModuleInfo::m_cachedCategory.
-          \pre m_module must be set
-        */
-        void initCachedCategory();
-
-        /**
-          Initializes CSwordModuleInfo::m_cachedLanguage.
-          \pre CSwordModuleInfo::m_module must be set
-          \pre CSwordModuleInfo::m_cachedLanguage must be set
-        */
-        void initCachedLanguage();
-
-    signals:
-        void hasIndexChanged(bool hasIndex);
-        void hiddenChanged(bool hidden);
-        void unlockedChanged(bool unlocked);
-        void indexingFinished();
-        void indexingProgress(int);
-
-    private:
-        sword::SWModule * const m_module;
-        CSwordBackend *m_backend;
-        ModuleType m_type;
-        bool m_hidden;
-        bool m_cancelIndexing;
-
-        // Cached data:
-        const QString m_cachedName;
-        CSwordModuleInfo::Category m_cachedCategory;
-        const CLanguageMgr::Language *m_cachedLanguage;
-        bool m_cachedHasVersion;
+    */
+    bool unlock(const QString & unlockKey);
+
+    /**
+    * Returns the display object for this module. Normally every module should have a Display object.
+    * Please don't use module()->Display() because this function does return the Sword display and does
+    * render the text, too.
+    * This function performs some casts to return the correct display. If it returns 0 there's no valid
+    * display object.
+    */
+    Rendering::CEntryDisplay * getDisplay() const;
+
+    /**
+    * This function does return true if the data files of the module are encrypted by the module author
+    * (the on who made the module) no matter if it's locked or not.
+    * @return True if this module is encryped
+    */
+    bool isEncrypted() const;
+
+    /**
+    * This function returns true if this module is locked (encrypted + correct cipher key),
+    * otherwise return false.
+    * @return True if this module is locked, i.e. encrypted but without a key set
+    */
+    bool isLocked() const;
+
+    /**
+      This function makes an estimate if a module was properly unlocked. It
+      returns true if the first entry of the module is not empty and
+      contains only printable characters (for the first 100 chars or so). If
+      that is the case, we can safely assume that a) the module was properly
+      unlocked and b) no buffer overflows will occur, which can happen when
+      Sword filters process garbage text which was not properly decrypted.
+    */
+    bool unlockKeyIsValid() const;
+
+    /**
+      \retval true if this module has a version number
+      \retval false if it doesn't have a version number
+    */
+    inline bool hasVersion() const {
+        return m_cachedHasVersion;
+    }
+
+    /**
+      \returns true if the module's index has been built.
+    */
+    bool hasIndex() const;
+
+    /**
+      \returns the path to this module's index base dir
+    */
+    QString getModuleBaseIndexLocation() const;
+
+    /**
+      \returns the path to this module's standard index
+    */
+    QString getModuleStandardIndexLocation() const;
+
+    /**
+      Builds a search index for this module
+      \returns Whether indexing this module was successful.
+    */
+    bool buildIndex();
+
+    /**
+      \returns index size
+    */
+    unsigned long indexSize() const;
+
+    /**
+      This function uses CLucene to perform and index based search. It also
+      overwrites the variable containing the last search result.
+      \returns the number of results found
+    */
+    int searchIndexed(const QString & searchedText,
+                      const sword::ListKey & scope,
+                      sword::ListKey & results) const;
+
+    /**
+      \returns the type of the module.
+    */
+    inline ModuleType type() const {
+        return m_type;
+    }
+
+    /**
+    * Returns the required Sword version for this module.
+    * Returns -1 if no special Sword version is required.
+    */
+    sword::SWVersion minimumSwordVersion() const;
+
+    /**
+      \note The Sword library takes care of the duplicate names: _n is added
+            after each duplicate.
+      \returns The name of this module.
+    */
+    inline const QString & name() const {
+        return m_cachedName;
+    }
+
+    /**
+    * Snaps to the closest entry in the module if the current key is
+    * not present in the data files.
+    */
+    virtual inline bool snap() const {
+        return false;
+    }
+
+    /**
+      \returns whether the module supports the feature given as parameter.
+    */
+    bool has(const CSwordModuleInfo::Feature) const;
+
+    bool has(const CSwordModuleInfo::FilterTypes ) const;
+
+    /**
+      \returns the text direction of the module's text.
+    */
+    CSwordModuleInfo::TextDirection textDirection() const;
+
+    /**
+      Writes the new text at the given position into the module. This does
+      only work for writabe modules.
+    */
+    void write(CSwordKey * key, const QString & newText);
+
+    /**
+      Deletes the current entry and removes it from the module.
+    */
+    bool deleteEntry(CSwordKey * const key);
+
+    /**
+      \returns the language of the module.
+    */
+    inline const CLanguageMgr::Language * language() const {
+        return m_cachedLanguage;
+    }
+
+    /**
+      \returns whether this module may be written to.
+    */
+    inline virtual bool isWritable() const {
+        return false;
+    }
+
+    /**
+    * Returns true if this module is hidden (not to be shown with other modules in certain views).
+    */
+    inline bool isHidden() const {
+        return m_hidden;
+    }
+
+    /**
+      Shows or hides the module.
+      \param hide Whether the module should be hidden.
+      \returns whether the hidden state was changed.
+    */
+    bool setHidden(bool hide);
+
+    /**
+      \returns the category of this module.
+    */
+    inline CSwordModuleInfo::Category category() const {
+        return m_cachedCategory;
+    }
+
+    /**
+    * The about text which belongs to this module.
+    */
+    QString aboutText() const;
+
+    /**
+    * Returns true if this module is Unicode encoded. False if the charset is iso8859-1.
+    * Protected because it should not be used outside of the CSword*ModuleInfo classes.
+    */
+    inline bool isUnicode() const {
+        return m_module->isUnicode();
+    }
+
+    /**
+      Returns an icon for this module.
+    */
+    inline QIcon moduleIcon() const {
+        return CSwordModuleInfo::moduleIcon(*this);
+    }
+
+    /**
+      Returns an icon for the given module.
+      \param[in] module The module whose icon to return.
+    */
+    static QIcon moduleIcon(const CSwordModuleInfo & module);
+
+    /**
+      Returns the icon filename for the given module.
+      \param[in] module The module whose icon filename to return.
+    */
+    static const QString & moduleIconFilename(const CSwordModuleInfo & module);
+
+    /**
+      Returns an icon for the category of given module.
+      \param[in] module The module whose category icon to return.
+    */
+    static QIcon categoryIcon(const CSwordModuleInfo::Category & category);
+
+    /**
+      Returns the icon filename for the category of given module.
+      \param[in] module The module whose category icon filename to return.
+    */
+    static const QString & categoryIconFilename(const CSwordModuleInfo::Category & category);
+
+    /**
+      Returns a translated name for the given category.
+      \param[in] module The category whose translated name to return.
+    */
+    static QString categoryName(const CSwordModuleInfo::Category & category);
+
+public slots:
+
+    inline void cancelIndexing() {
+        m_cancelIndexing = true;
+    }
+
+protected: /* Methods: */
+
+    CSwordModuleInfo(sword::SWModule * module,
+                     CSwordBackend & backend,
+                     ModuleType type);
+
+    CSwordModuleInfo(const CSwordModuleInfo & copy);
+
+    inline CSwordBackend & backend() const {
+        return m_backend;
+    }
+
+    QString getSimpleConfigEntry(const QString & name) const;
+    QString getFormattedConfigEntry(const QString & name) const;
+
+private: /* Methods: */
+
+    /**
+      Initializes CSwordModuleInfo::m_cachedCategory.
+      \pre m_module must be set
+    */
+    void initCachedCategory();
+
+    /**
+      Initializes CSwordModuleInfo::m_cachedLanguage.
+      \pre CSwordModuleInfo::m_module must be set
+      \pre CSwordModuleInfo::m_cachedLanguage must be set
+    */
+    void initCachedLanguage();
+
+signals:
+
+    void hasIndexChanged(bool hasIndex);
+    void hiddenChanged(bool hidden);
+    void unlockedChanged(bool unlocked);
+    void indexingFinished();
+    void indexingProgress(int);
+
+private: /* Fields: */
+
+    sword::SWModule * const m_module;
+    CSwordBackend & m_backend;
+    ModuleType m_type;
+    bool m_hidden;
+    bool m_cancelIndexing;
+
+    // Cached data:
+    const QString m_cachedName;
+    CSwordModuleInfo::Category m_cachedCategory;
+    const CLanguageMgr::Language * m_cachedLanguage;
+    bool m_cachedHasVersion;
+
 };
 
 Q_DECLARE_METATYPE(CSwordModuleInfo::Category);
diff --git a/src/backend/filters/btosismorphsegmentation.cpp b/src/backend/filters/btosismorphsegmentation.cpp
new file mode 100644
index 0000000..1675476
--- /dev/null
+++ b/src/backend/filters/btosismorphsegmentation.cpp
@@ -0,0 +1,95 @@
+/*********
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#include "backend/filters/btosismorphsegmentation.h"
+
+// Sword includes:
+#include <utilxml.h>
+
+
+const char Filters::BtOSISMorphSegmentation::oName[] = "Morph segmentation";
+const char Filters::BtOSISMorphSegmentation::oTip[] = "Toggles morph "
+                                                      "segmentation On and Off "
+                                                      "if they exist";
+
+const sword::SWBuf Filters::BtOSISMorphSegmentation::choices[3] = { "Off",
+                                                                    "On",
+                                                                    "" };
+
+const sword::StringList Filters::BtOSISMorphSegmentation::oValues(&choices[0],
+                                                                  &choices[2]);
+
+Filters::BtOSISMorphSegmentation::BtOSISMorphSegmentation()
+    : sword::SWOptionFilter(oName, oTip, &oValues)
+{
+    setOptionValue("Off");
+}
+
+char Filters::BtOSISMorphSegmentation::processText(sword::SWBuf & text,
+                                                   const sword::SWKey * key,
+                                                   const sword::SWModule * mod)
+{
+    (void) key;
+    (void) mod;
+
+    sword::SWBuf token;
+    bool intoken    = false;
+    bool hide       = false;
+
+    sword::SWBuf orig(text);
+    const char * from = orig.c_str();
+
+    sword::XMLTag tag;
+
+    for (text = ""; *from; ++from) {
+        if (*from == '<') {
+            intoken = true;
+            token = "";
+            continue;
+        }
+
+        if (*from == '>') { // process tokens
+            intoken = false;
+
+            if (!strncmp(token.c_str(), "seg ", 4)
+                || !strncmp(token.c_str(), "/seg", 4))
+            {
+                tag = token;
+
+                if (!tag.isEndTag()
+                    && tag.getAttribute("type")
+                    && !strcmp("morph", tag.getAttribute("type")))
+                { // <seg type="morph"> start tag
+                    hide = (option == 0); // only hide if option is Off
+                }
+
+                if (hide) { // hides start and end tags as long as hide is set
+                    if (tag.isEndTag()) //</seg>
+                        hide = false;
+                    continue; // leave out the current token
+                }
+            } // end of seg tag handling
+
+            text.append('<');
+            text.append(token);
+            text.append('>');
+            // hide = false; // not right, because there may be child tags in seg. Only /seg may disable the seg hiding.
+            continue;
+        } // end of intoken part
+
+        if (intoken) {
+            token.append(*from); // copy token
+        } else {
+            text.append(*from); // copy text which is not inside of a tag
+        }
+    }
+
+    return 0;
+}
+
diff --git a/src/backend/filters/btosismorphsegmentation.h b/src/backend/filters/btosismorphsegmentation.h
new file mode 100644
index 0000000..66d4724
--- /dev/null
+++ b/src/backend/filters/btosismorphsegmentation.h
@@ -0,0 +1,47 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#ifndef BTOSISMORPHSEGMENTATION_H
+#define BTOSISMORPHSEGMENTATION_H
+
+// Sword includes:
+#include <swbuf.h>
+#include <swoptfilter.h>
+
+
+namespace Filters {
+
+/**
+  \brief This Filter shows/hides headings in a OSIS text.
+  \author Martin Gruner
+*/
+class BtOSISMorphSegmentation: public sword::SWOptionFilter {
+
+public: /* Methods: */
+
+    BtOSISMorphSegmentation();
+
+    virtual char processText(sword::SWBuf & text,
+                             const sword::SWKey * key = 0,
+                             const sword::SWModule * module = 0);
+
+private: /* Fields: */
+
+    static const char oName[];
+    static const char oTip[];
+    static const sword::SWBuf choices[3];
+    static const sword::StringList oValues;
+
+};
+
+} /* namespace Filters { */
+
+#endif /* BTOSISMORPHSEGMENTATION_H */
diff --git a/src/backend/filters/gbftohtml.cpp b/src/backend/filters/gbftohtml.cpp
index fac70ba..8f2fcc5 100644
--- a/src/backend/filters/gbftohtml.cpp
+++ b/src/backend/filters/gbftohtml.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -78,7 +78,7 @@ char Filters::GbfToHtml::processText(sword::SWBuf& buf, const sword::SWKey * key
         return 1; //no processing should be done, may happen in a search
     }
 
-    CSwordModuleInfo* m = CSwordBackend::instance()->findModuleByName( module->Name() );
+    CSwordModuleInfo* m = CSwordBackend::instance()->findModuleByName( module->getName() );
 
     if (m && !(m->has(CSwordModuleInfo::lemmas) || m->has(CSwordModuleInfo::morphTags) || m->has(CSwordModuleInfo::strongNumbers))) { //only parse if the module has strongs or lemmas
         return 1; //WARNING: Return alread here
@@ -254,7 +254,7 @@ bool Filters::GbfToHtml::handleToken(sword::SWBuf &buf, const char *token, sword
             }
 
             buf.append(" <span class=\"footnote\" note=\"");
-            buf.append(myModule->Name());
+            buf.append(myModule->getName());
             buf.append('/');
             buf.append(myUserData->key->getShortText());
             buf.append('/');
diff --git a/src/backend/filters/gbftohtml.h b/src/backend/filters/gbftohtml.h
index fbe5db2..bfe8501 100644
--- a/src/backend/filters/gbftohtml.h
+++ b/src/backend/filters/gbftohtml.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/filters/osismorphsegmentation.cpp b/src/backend/filters/osismorphsegmentation.cpp
deleted file mode 100644
index 981ce89..0000000
--- a/src/backend/filters/osismorphsegmentation.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#include "backend/filters/osismorphsegmentation.h"
-
-// Sword includes:
-#include <utilxml.h>
-
-
-const char Filters::OSISMorphSegmentation::oName[] = "Morph segmentation";
-const char Filters::OSISMorphSegmentation::oTip[] = "Toggles morph segmentation On and Off if they exist";
-
-const sword::SWBuf Filters::OSISMorphSegmentation::choices[3] = {"Off", "On", ""};
-
-const sword::StringList Filters::OSISMorphSegmentation::oValues(&choices[0], &choices[2]);
-
-Filters::OSISMorphSegmentation::OSISMorphSegmentation() : sword::SWOptionFilter(oName, oTip, &oValues) {
-    setOptionValue("Off");
-}
-
-char Filters::OSISMorphSegmentation::processText(sword::SWBuf &text, const sword::SWKey * /*key*/, const sword::SWModule * /*module*/) {
-    sword::SWBuf token;
-    bool intoken    = false;
-    bool hide       = false;
-
-    sword::SWBuf orig( text );
-    const char *from = orig.c_str();
-
-    sword::XMLTag tag;
-
-    for (text = ""; *from; ++from) {
-        if (*from == '<') {
-            intoken = true;
-            token = "";
-            continue;
-        }
-
-        if (*from == '>') { // process tokens
-            intoken = false;
-
-            if (!strncmp(token.c_str(), "seg ", 4) || !strncmp(token.c_str(), "/seg", 4)) {
-                tag = token;
-
-                if (!tag.isEndTag() && tag.getAttribute("type") && !strcmp("morph", tag.getAttribute("type"))) {  //<seg type="morph"> start tag
-                    hide = (option == 0); //only hide if option is Off
-                }
-
-                if (hide) { //hides start and end tags as long as hide is set
-
-                    if (tag.isEndTag()) { //</seg>
-                        hide = false;
-                    }
-
-                    continue; //leave out the current token
-                }
-            } //end of seg tag handling
-
-            text.append('<');
-            text.append(token);
-            text.append('>');
-
-            //                hide = false; //not right, because there may be child tags in seg. Only /seg may disable the seg hiding.
-
-            continue;
-        } //end of intoken part
-
-        if (intoken) { //copy token
-            token.append(*from);
-        }
-        else { //copy text which is not inside of a tag
-            text.append(*from);
-        }
-    }
-
-    return 0;
-}
-
diff --git a/src/backend/filters/osismorphsegmentation.h b/src/backend/filters/osismorphsegmentation.h
deleted file mode 100644
index 8d5a4ab..0000000
--- a/src/backend/filters/osismorphsegmentation.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#ifndef OSISMORPHSEGMENTATION_H
-#define OSISMORPHSEGMENTATION_H
-
-// Sword includes:
-#include <swbuf.h>
-#include <swoptfilter.h>
-
-
-namespace Filters {
-
-/** This Filter shows/hides headings in a OSIS text.
- * @author Martin Gruner
- */
-class OSISMorphSegmentation : public sword::SWOptionFilter {
-        static const char oName[];
-        static const char oTip[];
-        static const sword::SWBuf choices[3];
-        static const sword::StringList oValues;
-
-    public:
-        OSISMorphSegmentation();
-
-        virtual char processText(sword::SWBuf &text, const sword::SWKey *key = 0, const sword::SWModule *module = 0);
-};
-
-}
-
-#endif
diff --git a/src/backend/filters/osistohtml.cpp b/src/backend/filters/osistohtml.cpp
index c04c820..3a8d65f 100644
--- a/src/backend/filters/osistohtml.cpp
+++ b/src/backend/filters/osistohtml.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -10,10 +10,11 @@
 #include "backend/filters/osistohtml.h"
 
 #include <QString>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/drivers/cswordmoduleinfo.h"
 #include "backend/managers/clanguagemgr.h"
 #include "backend/managers/referencemanager.h"
+#include "backend/managers/cswordbackend.h"
 
 // Sword includes:
 #include <swbuf.h>
@@ -64,24 +65,22 @@ bool Filters::OsisToHtml::handleToken(sword::SWBuf &buf, const char *token, swor
 
         // <div> tag
         if (!strcmp(tag.getName(), "div")) {
-            //handle intro
-
-            if ((!tag.isEmpty()) && (!tag.isEndTag())) { //start tag
+            if (tag.isEndTag()) {
+                buf.append("</div>");
+            } else {
                 sword::SWBuf type( tag.getAttribute("type") );
-
                 if (type == "introduction") {
-                    buf.append("<div class=\"introduction\">");
-                }
-                else if (type == "chapter") {
-                    buf.append("<div class=\"chapter\" />"); //don't open a div here, that would lead to a broken XML structure
-                }
-                else {
+                    if (!tag.isEmpty())
+                        buf.append("<div class=\"introduction\">");
+                } else if (type == "chapter") {
+                    if (!tag.isEmpty())
+                        buf.append("<div class=\"chapter\" ></div>"); //don't open a div here, that would lead to a broken XML structure
+                } else if (type == "x-p") {
+                    buf.append("<br/>");
+                } else {
                     buf.append("<div>");
                 }
             }
-            else if (tag.isEndTag()) { //end tag
-                buf.append("</div>");
-            }
         }
         else if (!strcmp(tag.getName(), "w")) {
             if ((!tag.isEmpty()) && (!tag.isEndTag())) { //start tag
@@ -192,7 +191,7 @@ bool Filters::OsisToHtml::handleToken(sword::SWBuf &buf, const char *token, swor
                         }
                         else { //no prefix given
                             val = attrib;
-                            const bool skipFirst = ((val[0] == 'T') && ((val[1] == 'H') || (val[1] == 'H')));
+                            const bool skipFirst = ((val[0] == 'T') && ((val[1] == 'H') || (val[1] == 'G')));
                             attrValue.append( skipFirst ? val + 1 : val );
                         }
                     }
@@ -237,7 +236,7 @@ bool Filters::OsisToHtml::handleToken(sword::SWBuf &buf, const char *token, swor
                     buf.append("<span class=\"crossreference\">");
                     sword::SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
                     sword::SWBuf footnoteBody = myUserData->entryAttributes["Footnote"][footnoteNumber]["body"];
-                    buf += myModule->RenderText(footnoteBody);
+                    buf += myModule->renderText(footnoteBody);
                 }
 
                 /* else if (type == "explanation") {
@@ -256,7 +255,7 @@ bool Filters::OsisToHtml::handleToken(sword::SWBuf &buf, const char *token, swor
                 else {
                     //           qWarning("found note in %s", myUserData->key->getShortText());
                     buf.append(" <span class=\"footnote\" note=\"");
-                    buf.append(myModule->Name());
+                    buf.append(myModule->getName());
                     buf.append('/');
                     buf.append(myUserData->key->getShortText());
                     buf.append('/');
@@ -553,7 +552,7 @@ void Filters::OsisToHtml::renderReference(const char *osisRef, sword::SWBuf &buf
         if (!mod || (mod->type() != CSwordModuleInfo::Bible
                      && mod->type() != CSwordModuleInfo::Commentary)) {
 
-            mod = CBTConfig::get( CBTConfig::standardBible );
+            mod = btConfig().getDefaultSwordModuleByType("standardBible");
         }
 
         // Q_ASSERT(mod); There's no necessarily a module or standard Bible
@@ -574,7 +573,7 @@ void Filters::OsisToHtml::renderReference(const char *osisRef, sword::SWBuf &buf
             ReferenceManager::ParseOptions options;
             options.refBase = QString::fromUtf8(myUserData->key->getText());
             options.refDestinationModule = QString(mod->name());
-            options.sourceLanguage = QString(myModule->Lang());
+            options.sourceLanguage = QString(myModule->getLanguage());
             options.destinationLanguage = QString("en");
 
             buf.append("<a href=\"");
diff --git a/src/backend/filters/osistohtml.h b/src/backend/filters/osistohtml.h
index ca36fe6..1c59ae1 100644
--- a/src/backend/filters/osistohtml.h
+++ b/src/backend/filters/osistohtml.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/filters/plaintohtml.cpp b/src/backend/filters/plaintohtml.cpp
index 70df723..edb6208 100644
--- a/src/backend/filters/plaintohtml.cpp
+++ b/src/backend/filters/plaintohtml.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/filters/plaintohtml.h b/src/backend/filters/plaintohtml.h
index b327ecc..e8ae570 100644
--- a/src/backend/filters/plaintohtml.h
+++ b/src/backend/filters/plaintohtml.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/filters/teitohtml.cpp b/src/backend/filters/teitohtml.cpp
index 4b390d5..6367e22 100644
--- a/src/backend/filters/teitohtml.cpp
+++ b/src/backend/filters/teitohtml.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -10,10 +10,11 @@
 #include "backend/filters/teitohtml.h"
 
 #include <QString>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/drivers/cswordmoduleinfo.h"
 #include "backend/managers/clanguagemgr.h"
 #include "backend/managers/referencemanager.h"
+#include "backend/managers/cswordbackend.h"
 
 // Sword includes:
 #include <swbuf.h>
@@ -108,7 +109,7 @@ void TeiToHtml::renderReference(const char *osisRef, sword::SWBuf &buf,
         //If the osisRef is something like "ModuleID:key comes here" then the
         // modulename is given, so we'll use that one
 
-        CSwordModuleInfo* mod = CBTConfig::get( CBTConfig::standardBible );
+        CSwordModuleInfo* mod = btConfig().getDefaultSwordModuleByType( "standardBible" );
 
         // Q_ASSERT(mod); There's no necessarily a module or standard Bible
 
@@ -128,7 +129,7 @@ void TeiToHtml::renderReference(const char *osisRef, sword::SWBuf &buf,
             ReferenceManager::ParseOptions options;
             options.refBase = QString::fromUtf8(myUserData->key->getText());
             options.refDestinationModule = QString(mod->name());
-            options.sourceLanguage = QString(mod->module()->Lang());
+            options.sourceLanguage = QString(mod->module()->getLanguage());
             options.destinationLanguage = QString("en");
 
             buf.append("<a href=\"");
diff --git a/src/backend/filters/teitohtml.h b/src/backend/filters/teitohtml.h
index 6fcc2c6..f365616 100644
--- a/src/backend/filters/teitohtml.h
+++ b/src/backend/filters/teitohtml.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/filters/thmltohtml.cpp b/src/backend/filters/thmltohtml.cpp
index 12f42bf..0bf6e63 100644
--- a/src/backend/filters/thmltohtml.cpp
+++ b/src/backend/filters/thmltohtml.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -13,10 +13,11 @@
 #include <QRegExp>
 #include <QUrl>
 #include <QTextCodec>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/drivers/cswordmoduleinfo.h"
 #include "backend/managers/clanguagemgr.h"
 #include "backend/managers/referencemanager.h"
+#include "backend/managers/cswordbackend.h"
 
 // Sword includes:
 #include <swmodule.h>
@@ -46,7 +47,7 @@ char ThmlToHtml::processText(sword::SWBuf &buf, const sword::SWKey *key,
 {
     sword::ThMLHTML::processText(buf, key, module);
 
-    CSwordModuleInfo* m = CSwordBackend::instance()->findModuleByName( module->Name() );
+    CSwordModuleInfo* m = CSwordBackend::instance()->findModuleByName( module->getName() );
 
     if (m && !(m->has(CSwordModuleInfo::lemmas) || m->has(CSwordModuleInfo::strongNumbers))) { //only parse if the module has strongs or lemmas
         return 1;
@@ -230,7 +231,7 @@ bool ThmlToHtml::handleToken(sword::SWBuf &buf, const char *token,
             if (!tag.isEndTag() && !tag.isEmpty()) {
                 //appending is faster than appendFormatted
                 buf.append(" <span class=\"footnote\" note=\"");
-                buf.append(myModule->Name());
+                buf.append(myModule->getName());
                 buf.append('/');
                 buf.append(myUserData->key->getShortText());
                 buf.append('/');
@@ -259,13 +260,13 @@ bool ThmlToHtml::handleToken(sword::SWBuf &buf, const char *token,
                     }
                     else { // like "<scripRef>John 3:16</scripRef>"
 
-                        CSwordModuleInfo* mod = CBTConfig::get(CBTConfig::standardBible);
+                        CSwordModuleInfo* mod = btConfig().getDefaultSwordModuleByType("standardBible");
                         //Q_ASSERT(mod); tested later
                         if (mod) {
                             ReferenceManager::ParseOptions options;
                             options.refBase = QString::fromUtf8(myUserData->key->getText()); //current module key
                             options.refDestinationModule = QString(mod->name());
-                            options.sourceLanguage = QString(myModule->Lang());
+                            options.sourceLanguage = QString(myModule->getLanguage());
                             options.destinationLanguage = QString("en");
 
                             //it's ok to split the reference, because to descriptive text is given
@@ -318,13 +319,13 @@ bool ThmlToHtml::handleToken(sword::SWBuf &buf, const char *token,
                     const char* ref = tag.getAttribute("passage");
                     Q_ASSERT(ref);
 
-                    CSwordModuleInfo* mod = CBTConfig::get(CBTConfig::standardBible);
+                    CSwordModuleInfo* mod = btConfig().getDefaultSwordModuleByType("standardBible");
                     //Q_ASSERT(mod); tested later
 
                     ReferenceManager::ParseOptions options;
                     options.refBase = QString::fromUtf8(myUserData->key->getText());
 
-                    options.sourceLanguage = myModule->Lang();
+                    options.sourceLanguage = myModule->getLanguage();
                     options.destinationLanguage = QString("en");
 
                     const QString completeRef = ReferenceManager::parseVerseReference(QString::fromUtf8(ref), options);
diff --git a/src/backend/filters/thmltohtml.h b/src/backend/filters/thmltohtml.h
index 99bbabb..ff40cf9 100644
--- a/src/backend/filters/thmltohtml.h
+++ b/src/backend/filters/thmltohtml.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/filters/thmltoplain.cpp b/src/backend/filters/thmltoplain.cpp
index 42f383e..9f81173 100644
--- a/src/backend/filters/thmltoplain.cpp
+++ b/src/backend/filters/thmltoplain.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/filters/thmltoplain.h b/src/backend/filters/thmltoplain.h
index 77e2a2b..68a5d95 100644
--- a/src/backend/filters/thmltoplain.h
+++ b/src/backend/filters/thmltoplain.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/keys/cswordkey.cpp b/src/backend/keys/cswordkey.cpp
index a685b27..5fc37bd 100644
--- a/src/backend/keys/cswordkey.cpp
+++ b/src/backend/keys/cswordkey.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,7 +16,6 @@
 #include "backend/keys/cswordldkey.h"
 #include "backend/keys/cswordtreekey.h"
 #include "backend/keys/cswordversekey.h"
-#include "util/btsignal.h"
 
 // Sword includes:
 #include <swkey.h>
@@ -27,170 +26,168 @@
 #include <versekey.h>
 
 
-const QTextCodec *CSwordKey::m_cp1252Codec = QTextCodec::codecForName("Windows-1252");
-
-CSwordKey::CSwordKey(const CSwordModuleInfo * const module)
-    : m_module(module),
-    m_signal(0) {}
-
-CSwordKey::CSwordKey(const CSwordKey& k)
-    : m_signal(0) {
-    m_module = k.m_module;
-}
-
-CSwordKey::~CSwordKey() {
-    delete m_signal;
-}
+const QTextCodec * CSwordKey::m_cp1252Codec = QTextCodec::codecForName("Windows-1252");
 
 QString CSwordKey::rawText() {
-    if (!m_module) return QString::null;
+    if (!m_module)
+        return QString::null;
 
-    if (dynamic_cast<sword::SWKey*>(this)) {
+    if (dynamic_cast<sword::SWKey*>(this))
         m_module->module()->getKey()->setText( rawKey() );
-    }
 
-    if (key().isNull()) return QString::null;
+    if (key().isNull())
+        return QString::null;
 
-    return QString::fromUtf8( m_module->module()->getRawEntry() );
+    return QString::fromUtf8(m_module->module()->getRawEntry());
 }
 
-QString CSwordKey::renderedText( const CSwordKey::TextRenderType mode ) {
+QString CSwordKey::renderedText(const CSwordKey::TextRenderType mode) {
     Q_ASSERT(m_module);
 
-    sword::SWKey* const k = dynamic_cast<sword::SWKey*>(this);
+    sword::SWKey * const k = dynamic_cast<sword::SWKey *>(this);
 
     if (k) {
-        sword::VerseKey* vk_mod = dynamic_cast<sword::VerseKey*>(m_module->module()->getKey());
-        if (vk_mod) {
-            vk_mod->Headings(1);
-        }
+        sword::VerseKey * vk_mod = dynamic_cast<sword::VerseKey *>(m_module->module()->getKey());
+        if (vk_mod)
+            vk_mod->setIntros(true);
 
-        m_module->module()->getKey()->setText( rawKey() );
+        m_module->module()->getKey()->setText(rawKey());
 
         if (m_module->type() == CSwordModuleInfo::Lexicon) {
             m_module->snap();
             /* In lexicons make sure that our key (e.g. 123) was successfully set to the module,
             i.e. the module key contains this key (e.g. 0123 contains 123) */
 
-            if ( sword::stricmp(m_module->module()->getKey()->getText(), rawKey())
-                    && !strstr(m_module->module()->getKey()->getText(), rawKey())
-               ) {
+            if (sword::stricmp(m_module->module()->getKey()->getText(), rawKey())
+                && !strstr(m_module->module()->getKey()->getText(), rawKey()))
+            {
                 qDebug("return an empty key for %s", m_module->module()->getKey()->getText());
                 return QString::null;
             }
         }
     }
 
-    //Q_ASSERT(!key().isNull());
-    if (!key().isNull()) { //we have valid text
-        bool DoRender = mode != ProcessEntryAttributesOnly;
-        QString text = QString::fromUtf8( m_module->module()->RenderText(0,-1, DoRender));
-        if (!DoRender)
-            return QString::null;
-
-        // This is yucky, but if we want strong lexicon refs we have to do it here.
-        if (m_module->type() == CSwordModuleInfo::Lexicon) {
-            QString t(text);
-            QRegExp rx("(GREEK|HEBREW) for 0*([1-9]\\d*)");    // ignore 0's before number
-            int pos = 0;
-            while ( (pos = rx.indexIn(t, pos)) != -1 ) {
-                QString language = rx.cap(1);
-                QString langcode = QString(language.at(0));    // "G" or "H"
-                QString number = rx.cap(2);
-                QString paddednumber = number.rightJustified(5, '0');    // Form 00123
-
-                text.replace(
-                    QRegExp( QString(
-                                 "(>[^<>]+)"            // Avoid replacing inside tags
-                                 "\\b(0*%1)\\b").arg(number) ),    // And span around 0's
-                    QString("\\1<span lemma=\"%1%2\"><a href=\"strongs://%3/%4\">\\2</a></span>")
+    if (key().isNull())
+        return QString::null;
+
+    bool DoRender = mode != ProcessEntryAttributesOnly;
+    QString text = QString::fromUtf8(m_module->module()->renderText(0, -1, DoRender));
+    if (!DoRender)
+        return QString::null;
+
+    // This is yucky, but if we want strong lexicon refs we have to do it here.
+    if (m_module->type() == CSwordModuleInfo::Lexicon) {
+        const QString t(text);
+        const QRegExp rx("(GREEK|HEBREW) for 0*([1-9]\\d*)");    // ignore 0's before number
+        int pos = 0;
+        while ((pos = rx.indexIn(t, pos)) != -1) {
+            const QString language = rx.cap(1);
+            const QString langcode = QString(language.at(0));    // "G" or "H"
+            const QString number = rx.cap(2);
+            const QString paddednumber = number.rightJustified(5, '0');    // Form 00123
+
+            text.replace(
+                QRegExp(QString(
+                            "(>[^<>]+)"            // Avoid replacing inside tags
+                            "\\b(0*%1)\\b").arg(number)),    // And span around 0's
+                QString("\\1<span lemma=\"%1%2\"><a href=\"strongs://%3/%4\">\\2</a></span>")
                     .arg(langcode, paddednumber, language, paddednumber)
-                );
-                pos += rx.matchedLength();
-            }
+            );
+            pos += rx.matchedLength();
         }
+    }
 
-        if (mode == HTMLEscaped) {
-            /*
-              Here we encode all non-latin1 characters as HTML unicode entities
-              in the form &#<decimal unicode value here>;
-            */
-            QString ret;
-
-            // Reserve characters to reduce number of memory allocations:
-            ret.reserve(text.size());
-
-            for (int i = 0; i < text.size(); ++i) {
-                const QChar c = text.at(i);
-
-                if (c.toLatin1()) {
-                    ret.append(c);
-                } else {
-                    ret.append("&#").append(c.unicode()).append(";");
-                }
+    if (mode == HTMLEscaped) {
+        /*
+          Here we encode all non-latin1 characters as HTML unicode entities
+          in the form &#<decimal unicode value here>;
+        */
+        QString ret;
+
+        // Reserve characters to reduce number of memory allocations:
+        ret.reserve(text.size());
+
+        for (const QChar * c = text.constBegin(); c != text.constEnd(); c++) {
+            if (c->toLatin1()) {
+                ret.append(*c);
+            } else {
+                ret.append("&#").append(c->unicode()).append(";");
             }
-
-            return ret;
-        }
-        else {
-            return text;
         }
-    }
 
-    return QString::null;
+        return ret;
+    }
+    else {
+        return text;
+    }
 }
 
 QString CSwordKey::strippedText() {
-    if (!m_module) return QString::null;
+    if (!m_module)
+        return QString::null;
 
     if (dynamic_cast<sword::SWKey*>(this)) {
         char * buffer = new char[strlen(rawKey()) + 1];
         strcpy(buffer, rawKey());
-        m_module->module()->getKey()->setText( buffer );
+        m_module->module()->getKey()->setText(buffer);
         delete [] buffer;
     }
 
-    return QString::fromUtf8( m_module->module()->StripText() );
+    return QString::fromUtf8(m_module->module()->stripText());
 }
 
 void CSwordKey::emitBeforeChanged() {
-    if (m_signal.isNull())
-        return;
-    m_signal->emitBeforeChanged();
+    if (!m_beforeChangedSignaller.isNull())
+        m_beforeChangedSignaller->emitSignal();
 }
 
-void CSwordKey::emitChanged() {
-    if (m_signal.isNull())
-        return;
-    m_signal->emitChanged();
+void CSwordKey::emitAfterChanged() {
+    if (!m_afterChangedSignaller.isNull())
+        m_afterChangedSignaller->emitSignal();
 }
 
-/** This will create a proper key object from a given module */
-CSwordKey *CSwordKey::createInstance(const CSwordModuleInfo *module) {
-    if (!module) {
+CSwordKey * CSwordKey::createInstance(const CSwordModuleInfo * module) {
+    if (!module)
         return 0;
-    }
 
-    switch ( module->type() ) {
+    sword::SWKey * const key = module->module()->getKey();
 
-        case CSwordModuleInfo::Bible://fall through
+    switch (module->type()) {
 
+        case CSwordModuleInfo::Bible: // Fall through
         case CSwordModuleInfo::Commentary:
-            return new CSwordVerseKey( (sword::VerseKey *) ( (sword::SWKey *)(*module->module()) ), module );
+
+            Q_ASSERT(dynamic_cast<sword::VerseKey *>(key) != 0);
+            return new CSwordVerseKey(static_cast<sword::VerseKey *>(key),
+                                      module);
 
         case CSwordModuleInfo::Lexicon:
-            return new CSwordLDKey( (sword::SWKey *)(*module->module()), module);
+
+            return new CSwordLDKey(key, module);
 
         case CSwordModuleInfo::GenericBook:
-            return new CSwordTreeKey( (sword::TreeKeyIdx*)((sword::SWKey *)(*module->module())), module );
+
+            Q_ASSERT(dynamic_cast<sword::TreeKeyIdx *>(key) != 0);
+            return new CSwordTreeKey(dynamic_cast<sword::TreeKeyIdx *>(key),
+                                     module );
 
         default:
+
             return 0;
+
     }
 }
 
-const BtSignal* CSwordKey::signaler() {
-    if (m_signal.isNull())
-        m_signal = new BtSignal();
-    return m_signal;
+const BtSignal * CSwordKey::beforeChangedSignaller() {
+    if (m_beforeChangedSignaller.isNull())
+        m_beforeChangedSignaller = new BtSignal();
+
+    return m_beforeChangedSignaller;
+}
+
+const BtSignal * CSwordKey::afterChangedSignaller() {
+    if (m_afterChangedSignaller.isNull())
+        m_afterChangedSignaller = new BtSignal();
+
+    return m_afterChangedSignaller;
 }
diff --git a/src/backend/keys/cswordkey.h b/src/backend/keys/cswordkey.h
index 9b043b7..ee816a5 100644
--- a/src/backend/keys/cswordkey.h
+++ b/src/backend/keys/cswordkey.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -12,120 +14,127 @@
 
 #include <QPointer>
 #include <QString>
+#include "util/btsignal.h"
 
 
 class CSwordModuleInfo;
 class QTextCodec;
-class BtSignal;
 
-/** Base class for all keys.
- * The base class for all Sword based keys.
- * @author The BibleTime team
- * @version $Id: cswordkey.h,v 1.27 2006/10/30 19:53:32 mgruner Exp $
- */
+/** Base class for all Sword based keys. */
 class CSwordKey {
-    protected:
-        /**
-          \param module The module which belongs to this key, may be NULL
-        */
-        CSwordKey(const CSwordModuleInfo * const module = 0);
-
-        CSwordKey(const CSwordKey &copy);
-
-    public:
-        enum TextRenderType {
-            Normal = 0,
-            HTMLEscaped = 1,
-            ProcessEntryAttributesOnly = 2    // in this case, renderText() will not return text, but only cause EntryAttribute processing
-        };
-
-        virtual ~CSwordKey();
-
-        /** Returns the current key.
-         * @return The key which belongs to the current object.
-         */
-        virtual QString key() const = 0;
-
-        /**
-          Sets the current key. Sets the key using a utf8 enabled QString.
-          \param key The key which should be used to set the current one.
-        */
-        virtual bool setKey(const QString &key) = 0;
-
-        /**
-          Set the key using a utf8-decoded c-string.
-          \param key The key which should be used to set the current one.
-        */
-        virtual bool setKey(const char *key) = 0;
-
-        /** Clone this object. Clone this current object and return it.
-         * @return A clone of the current object.
-         */
-        virtual CSwordKey* copy() const = 0;
-
-        /**
-          \returns the module which belongs to this key.
-        */
-        inline const CSwordModuleInfo *module() const {
-            return m_module;
-        }
-
-        /**
-          Sets the module which belongs to this key.
-          \param[in] newModule the module to set.
-        */
-        virtual inline void setModule(const CSwordModuleInfo *newModule) {
-            m_module = newModule;
-        }
-
-        /** Returns the raw, unchanged text. Returns the text without any filter modifications,
-         * just in the way it comes out of the module.
-         */
-        QString rawText();
-        /** Returns the rendered text. Returns the text of the current key after passing it through the
-         * modules filters.
-         */
-        QString renderedText( const CSwordKey::TextRenderType mode = CSwordKey::Normal );
-        /** Stripped down text. Returns the text after removing all markup tags from it.
-         */
-        QString strippedText();
-
-        const BtSignal *signaler();
-
-        /**
-         * This returns a new object of the right CSwordKey* implementation
-         * (e.g. CSwordVerseKey or CSwordLDKey)
-         * The type is determined by the type of the module.
-         * @see CSwordModuleInfo, CSwordBibleModuleInfo, CSwordCommentaryModuleInfo, CSwordLexiconModukleInfo
-         */
-        static CSwordKey* createInstance(const CSwordModuleInfo *module);
-
-        /**
-         * This is called before a key change to emit a signal
-         * */
-        void emitBeforeChanged();
-        /**
-         * This is called after a key change to emit a signal
-         * */
-        void emitChanged();
-
-    protected:
-        /**
-         * Returns the encoded key appropriate for use directly with Sword.
-         */
-        virtual const char * rawKey() const = 0;
-        static inline const QTextCodec *cp1252Codec() { return m_cp1252Codec; };
-
-    private:
-        /**
-         * Disable the assignment operator
-         */
-        CSwordKey& operator= ( const CSwordKey & );
-
-    protected:
-        static const QTextCodec *m_cp1252Codec;
-        const CSwordModuleInfo *m_module;
-        QPointer<BtSignal> m_signal;
+
+public: /* Types: */
+
+    enum TextRenderType {
+        Normal = 0,
+        HTMLEscaped = 1,
+        ProcessEntryAttributesOnly = 2    // in this case, renderText() will not return text, but only cause EntryAttribute processing
+    };
+
+    virtual inline ~CSwordKey() { delete m_beforeChangedSignaller; }
+
+    /**
+      \returns The key which belongs to the current object.
+    */
+    virtual QString key() const = 0;
+
+    /**
+      Sets the current key using a utf8 enabled QString.
+      \param[in] key The key which should be used to set the current one.
+    */
+    virtual bool setKey(const QString & key) = 0;
+
+    /**
+      Set the key using a utf8-decoded c-string.
+      \param[in] key The key which should be used to set the current one.
+    */
+    virtual bool setKey(const char * key) = 0;
+
+    /**
+      \returns a clone of this object.
+    */
+    virtual CSwordKey * copy() const = 0;
+
+    /**
+      \returns the module which belongs to this key.
+    */
+    inline const CSwordModuleInfo * module() const {
+        return m_module;
+    }
+
+    /**
+      Sets the module which belongs to this key.
+      \param[in] newModule the module to set.
+    */
+    virtual inline void setModule(const CSwordModuleInfo * newModule) {
+        m_module = newModule;
+    }
+
+    /**
+      \returns the raw, unchanged text from the module (i.e. without any filter
+               modifications).
+    */
+    QString rawText();
+
+    /**
+      \returns the rendered text by passing the text under the current key
+               through the filters.
+    */
+    QString renderedText(const CSwordKey::TextRenderType mode = CSwordKey::Normal);
+
+    /**
+      \returns the text after removing all markup tags from it.
+    */
+    QString strippedText();
+
+    const BtSignal * beforeChangedSignaller();
+    const BtSignal * afterChangedSignaller();
+
+    /**
+      \returns a new CSwordkey subclass instance for the given module, depending
+               on the type of the module.
+    */
+    static CSwordKey * createInstance(const CSwordModuleInfo * module);
+
+    /**
+      This is called before a key change to emit a signal
+    */
+    void emitBeforeChanged();
+
+    /**
+      This is called after a key change to emit a signal
+    */
+    void emitAfterChanged();
+
+protected: /* Methods: */
+
+    inline CSwordKey(const CSwordModuleInfo * const module = 0)
+        : m_module(module) {}
+
+    inline CSwordKey(const CSwordKey & copy)
+        : m_module(copy.m_module) {}
+
+    /**
+      \returns the encoded key appropriate for use directly with Sword.
+    */
+    virtual const char * rawKey() const = 0;
+
+    static inline const QTextCodec * cp1252Codec() { return m_cp1252Codec; }
+
+private: /* Methods: */
+
+    /**
+      Disable the assignment operator
+    */
+    CSwordKey & operator=(const CSwordKey &);
+
+protected: /* Fields: */
+
+    static const QTextCodec * m_cp1252Codec;
+    const CSwordModuleInfo * m_module;
+    QPointer<BtSignal> m_beforeChangedSignaller;
+    QPointer<BtSignal> m_afterChangedSignaller;
+
 };
 
 #endif
diff --git a/src/backend/keys/cswordldkey.cpp b/src/backend/keys/cswordldkey.cpp
index 822da8c..f6ffb25 100644
--- a/src/backend/keys/cswordldkey.cpp
+++ b/src/backend/keys/cswordldkey.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -75,7 +75,7 @@ bool CSwordLDKey::setKey(const QString &newKey) {
         return setKey(newKey.toUtf8().constData());
     }
     else {
-        return setKey((const char*)cp1252Codec()->fromUnicode(newKey));
+        return setKey(cp1252Codec()->fromUnicode(newKey).constData());
     }
 }
 
@@ -90,7 +90,7 @@ bool CSwordLDKey::setKey(const char *newKey) {
         m_module->snap();
     }
 
-    return !Error();
+    return !popError();
 }
 
 /** Uses the parameter to returns the next entry afer this key. */
diff --git a/src/backend/keys/cswordldkey.h b/src/backend/keys/cswordldkey.h
index ed43ce7..e8fba24 100644
--- a/src/backend/keys/cswordldkey.h
+++ b/src/backend/keys/cswordldkey.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/keys/cswordtreekey.cpp b/src/backend/keys/cswordtreekey.cpp
index 4ea624f..2823e5f 100644
--- a/src/backend/keys/cswordtreekey.cpp
+++ b/src/backend/keys/cswordtreekey.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -51,7 +51,7 @@ bool CSwordTreeKey::setKey(const QString &newKey) {
         return setKey(newKey.toUtf8().constData());
     }
     else {
-        return setKey((const char*)cp1252Codec()->fromUnicode(newKey));
+        return setKey(cp1252Codec()->fromUnicode(newKey).constData());
     }
 }
 
@@ -65,7 +65,7 @@ bool CSwordTreeKey::setKey(const char *newKey) {
         root();
     }
 
-    return !Error();
+    return !popError();
 }
 
 QString CSwordTreeKey::getLocalNameUnicode() {
diff --git a/src/backend/keys/cswordtreekey.h b/src/backend/keys/cswordtreekey.h
index d6eb5ec..2bdfd6c 100644
--- a/src/backend/keys/cswordtreekey.h
+++ b/src/backend/keys/cswordtreekey.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/keys/cswordversekey.cpp b/src/backend/keys/cswordversekey.cpp
index de4fd0e..3dc0c75 100644
--- a/src/backend/keys/cswordversekey.cpp
+++ b/src/backend/keys/cswordversekey.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -150,14 +150,14 @@ bool CSwordVerseKey::setKey(const char *newKey) {
     }
 
     /// \todo Do we ALWAYS need to emit this signal and check for errors?
-    emitChanged();
-    return !Error();
+    emitAfterChanged();
+    return !popError();
 }
 
 bool CSwordVerseKey::next( const JumpType type ) {
     typedef CSwordBibleModuleInfo CSBMI;
 
-    Error(); //clear Error status
+    popError(); //clear Error status
     bool ret = true;
 
     switch (type) {
@@ -186,21 +186,22 @@ bool CSwordVerseKey::next( const JumpType type ) {
 
         case UseVerse: {
             if (m_module && m_module->module()) {
-                const bool oldStatus = m_module->module()->getSkipConsecutiveLinks();
+                const bool oldStatus = m_module->module()->isSkipConsecutiveLinks();
                 m_module->module()->setSkipConsecutiveLinks(true);
 
                 //disable headings for next verse
                 const bool useHeaders = 1; //(Verse() == 0);
-                const bool oldHeadingsStatus = ((VerseKey*)(m_module->module()->getKey()))->Headings( useHeaders );
+                const bool oldHeadingsStatus = ((VerseKey*)(m_module->module()->getKey()))->isIntros();
+                ((VerseKey*)(m_module->module()->getKey()))->setIntros( useHeaders );
                 //don't use setKey(), that would create a new key without Headings set
                 m_module->module()->getKey()->setText( key().toUtf8().constData() );
 
                 (*(m_module->module()) )++;
 
-                ((VerseKey*)(m_module->module()->getKey()))->Headings(oldHeadingsStatus);
+                ((VerseKey*)(m_module->module()->getKey()))->setIntros(oldHeadingsStatus);
                 m_module->module()->setSkipConsecutiveLinks(oldStatus);
 
-                if (!m_module->module()->Error()) {
+                if (!m_module->module()->popError()) {
                     setKey(QString::fromUtf8(m_module->module()->getKeyText()));
                 }
                 else {
@@ -237,14 +238,14 @@ bool CSwordVerseKey::next( const JumpType type ) {
             ret = false;
         }
 
-        emitChanged();
+        emitAfterChanged();
         return ret;
     }
-    else if (Error()) { //we have no module, so take care of VerseKey::Error()
+    else if (popError()) { //we have no module, so take care of VerseKey::Error()
         return false;
     }
 
-    emitChanged();
+    emitAfterChanged();
     return ret;
 }
 
@@ -278,18 +279,19 @@ bool CSwordVerseKey::previous( const JumpType type ) {
         case UseVerse: {
             if (m_module && m_module->module()) {
                 const bool useHeaders = 1; //(Verse() == 0);
-                const bool oldHeadingsStatus = ((VerseKey*)(m_module->module()->getKey()))->Headings( useHeaders );
+                const bool oldHeadingsStatus = ((VerseKey*)(m_module->module()->getKey()))->isIntros();
+                ((VerseKey*)(m_module->module()->getKey()))->setIntros( useHeaders );
 
                 m_module->module()->getKey()->setText( key().toUtf8().constData() );
 
-                const bool oldStatus = m_module->module()->getSkipConsecutiveLinks();
+                const bool oldStatus = m_module->module()->isSkipConsecutiveLinks();
                 m_module->module()->setSkipConsecutiveLinks(true);
                 ( *( m_module->module() ) )--;
 
-                ((VerseKey*)(m_module->module()->getKey()))->Headings( oldHeadingsStatus );
+                ((VerseKey*)(m_module->module()->getKey()))->setIntros( oldHeadingsStatus );
                 m_module->module()->setSkipConsecutiveLinks(oldStatus);
 
-                if (!m_module->module()->Error()) {
+                if (!m_module->module()->popError()) {
                     setKey(QString::fromUtf8(m_module->module()->getKeyText())); // don't use fromUtf8
                 }
                 else {
@@ -323,13 +325,13 @@ bool CSwordVerseKey::previous( const JumpType type ) {
             ret = false;
         }
 
-        emitChanged();
+        emitAfterChanged();
         return ret;
     }
-    else if (Error()) {
+    else if (popError()) {
         return false;
     }
 
-    emitChanged();
+    emitAfterChanged();
     return ret;
 }
diff --git a/src/backend/keys/cswordversekey.h b/src/backend/keys/cswordversekey.h
index 2769cbf..4f33521 100644
--- a/src/backend/keys/cswordversekey.h
+++ b/src/backend/keys/cswordversekey.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/managers/btstringmgr.cpp b/src/backend/managers/btstringmgr.cpp
index ad1fb3e..2e2e22a 100644
--- a/src/backend/managers/btstringmgr.cpp
+++ b/src/backend/managers/btstringmgr.cpp
@@ -2,52 +2,59 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
 
 #include "backend/managers/btstringmgr.h"
 
+#include <cstring>
+#include "util/macros.h"
 
-char* BTStringMgr::upperUTF8(char* text, unsigned int maxlen) const {
-    const int max = (maxlen > 0) ? maxlen : strlen(text);
 
-    if (isUtf8(text)) {
-        strncpy(text, (const char*)QString::fromUtf8(text).toUpper().toUtf8(), max);
+char * BtStringMgr::upperUTF8(char * const text, unsigned int maxlen) const {
+    size_t max = (maxlen > 0u) ? maxlen : strlen(text);
 
-        return text;
-    }
-    else {
-        char* ret = text;
-
-        while (*text) {
-            *text = toupper(*text);
-            text++;
+    if (LIKELY(max > 1u)) {
+        max--;
+        if (isUtf8(text)) {
+            strncpy(text, QString::fromUtf8(text).toUpper().toUtf8().constData(), max);
         }
-
-        return ret;
+        else {
+            strncpy(text, QString::fromLatin1(text).toUpper().toLatin1().constData(), max);
+        }
+        text[max] = '\0';
+    } else if (max == 1u) {
+        text[0u] = '\0';
+    } else {
+        Q_ASSERT(max == 0u);
     }
 
     return text;
 }
 
-char* BTStringMgr::upperLatin1(char* text, unsigned int /*max*/) const {
-    char* ret = text;
-
-    while (*text) {
-        *text = toupper(*text);
-        text++;
+char * BtStringMgr::upperLatin1(char * const text, unsigned int maxlen) const {
+    size_t max = (maxlen > 0u) ? maxlen : strlen(text);
+
+    if (LIKELY(max > 1u)) {
+        max--;
+        strncpy(text, QString::fromLatin1(text).toUpper().toLatin1().constData(), max);
+        text[max] = '\0';
+    } else if (max == 1u) {
+        text[0u] = '\0';
+    } else {
+        Q_ASSERT(max == 0u);
     }
 
-    return ret;
+    return text;
 }
 
-bool BTStringMgr::supportsUnicode() const {
+bool BtStringMgr::supportsUnicode() const {
     return true;
 }
 
-bool BTStringMgr::isUtf8(const char *buf) const {
+bool BtStringMgr::isUtf8(const char *buf) const {
     int i, n;
     register unsigned char c;
     bool gotone = false;
diff --git a/src/backend/managers/btstringmgr.h b/src/backend/managers/btstringmgr.h
index 1cf7170..3fd0175 100644
--- a/src/backend/managers/btstringmgr.h
+++ b/src/backend/managers/btstringmgr.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -12,16 +14,20 @@
 
 #include <QString>
 
-// Sword includes:
+/* Sword includes: */
 #include <stringmgr.h>
 
 
-/** Unicode string manager implementation.
- * This is the StringManager implementation which works with QString.
- * @author The BibleTime developers
- */
+/**
+  Unicode string manager implementation.
 
-class BTStringMgr : public sword::StringMgr {
+  A Qt-based sword::StringMgr is better than the default one in Sword, in case
+  Sword is not compiled against ICU regarding this. However, we have no good
+  means to check this, so let's use this class as default. This is currently
+  done in BibleTime::initBackends() as follows:
+    sword::StringMgr::setSystemStringMgr(new BtStringMgr());
+*/
+class BtStringMgr : public sword::StringMgr {
 
     public:
         /** Converts the param to an upper case Utf8 string
@@ -50,4 +56,4 @@ class BTStringMgr : public sword::StringMgr {
         bool isUtf8(const char *buf) const;
 };
 
-#endif
+#endif /* BTSTRINGMGR_H */
diff --git a/src/backend/managers/cdisplaytemplatemgr.cpp b/src/backend/managers/cdisplaytemplatemgr.cpp
index fbeb921..734d912 100644
--- a/src/backend/managers/cdisplaytemplatemgr.cpp
+++ b/src/backend/managers/cdisplaytemplatemgr.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -13,7 +13,7 @@
 #include <QFileInfo>
 #include <QStringList>
 #include <QTextStream>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/drivers/cswordmoduleinfo.h"
 #include "backend/managers/clanguagemgr.h"
 #include "util/directory.h"
@@ -21,6 +21,15 @@
 
 #define CSSTEMPLATEBASE "Basic.tmpl"
 
+namespace {
+
+inline QString readFileToString(const QString & filename) {
+    QFile f(filename);
+    return f.open(QIODevice::ReadOnly) ? QTextStream(&f).readAll() : QString();
+}
+
+} // anonymous namespace
+
 CDisplayTemplateMgr * CDisplayTemplateMgr::m_instance = 0;
 
 CDisplayTemplateMgr::CDisplayTemplateMgr(QString & errorMessage) {
@@ -57,7 +66,7 @@ CDisplayTemplateMgr::CDisplayTemplateMgr(QString & errorMessage) {
                 loadCSSTemplate(td.canonicalPath() + "/" + file);
             // Load user app stylesheets
             Q_FOREACH(const QString & file, utd.entryList(cssfilter, readableFileFilter))
-                loadCSSTemplate(td.canonicalPath() + "/" + file);
+                loadCSSTemplate(utd.canonicalPath() + "/" + file);
         }
     }
 
@@ -145,12 +154,7 @@ QString CDisplayTemplateMgr::fillTemplate(const QString & name,
 
     QString langCSS;
     {
-        /*
-          At first append the font standard settings for all languages without
-          configured font. Create a dummy language (the langmap may be empty).
-        */
-        const CLanguageMgr::Language lang(QString("en"), QString("English"), QString::null);
-        const QFont f = CBTConfig::getDefault(&lang);
+        const QFont & f = btConfig().getDefaultFont();
         langCSS.append("#content{font-family:").append(f.family())
                .append(";font-size:").append(QString::number(f.pointSizeF(), 'f'))
                .append("pt;font-weight:").append(f.bold() ? "bold" : "normal")
@@ -160,8 +164,12 @@ QString CDisplayTemplateMgr::fillTemplate(const QString & name,
     {
         const CLanguageMgr::LangMap & langMap = CLanguageMgr::instance()->availableLanguages();
         Q_FOREACH (const CLanguageMgr::Language * lang, langMap) {
-            if (!lang->abbrev().isEmpty() && CBTConfig::get(lang).first) {
-                const QFont f = CBTConfig::get(lang).second;
+            if (lang->abbrev().isEmpty())
+                continue;
+
+            BtConfig::FontSettingsPair fp = btConfig().getFontForLanguage(*lang);
+            if (fp.first) {
+                const QFont & f = fp.second;
 
                 langCSS.append("*[lang=").append(lang->abbrev()).append("]{")
                        .append("font-family:").append(f.family())
@@ -188,28 +196,26 @@ QString CDisplayTemplateMgr::fillTemplate(const QString & name,
           .replace("#DISPLAY_TEMPLATES_PATH#", DU::getDisplayTemplatesDir().absolutePath());
 
     if (templateIsCss)
-        output.replace("#THEME_STYLE#", m_cssMap[name]);
+        output.replace("#THEME_STYLE#", readFileToString(m_cssMap[name]));
 
     return output;
 }
 
 QString CDisplayTemplateMgr::activeTemplateName() {
-    const QString tn = CBTConfig::get(CBTConfig::displayStyle);
-    if (tn.isEmpty())
-        return defaultTemplateName();
-
-    return tn;
+    const QString tn = btConfig().value<QString>("GUI/activeTemplateName",
+                                                 QString());
+    return (tn.isEmpty()
+            || !instance()->m_availableTemplateNamesCache.contains(tn))
+           ? defaultTemplateName()
+           : tn;
 }
 
 void CDisplayTemplateMgr::loadTemplate(const QString & filename) {
     Q_ASSERT(filename.endsWith(".tmpl"));
     Q_ASSERT(QFileInfo(filename).isFile());
-    QFile f(filename);
-    if (f.open(QIODevice::ReadOnly)) {
-        const QString fileContent(QTextStream(&f).readAll());
-        if (!fileContent.isEmpty())
-            m_templateMap.insert(QFileInfo(f).fileName(), fileContent);
-    }
+    const QString templateString = readFileToString(filename);
+    if (!templateString.isEmpty())
+        m_templateMap.insert(QFileInfo(filename).fileName(), templateString);
 }
 
 void CDisplayTemplateMgr::loadCSSTemplate(const QString & filename) {
@@ -217,5 +223,5 @@ void CDisplayTemplateMgr::loadCSSTemplate(const QString & filename) {
     const QFileInfo fi(filename);
     Q_ASSERT(fi.isFile());
     if (fi.isReadable())
-        m_cssMap.insert(fi.fileName(), fi.absoluteFilePath());
+        m_cssMap.insert(fi.fileName(), filename);
 }
diff --git a/src/backend/managers/cdisplaytemplatemgr.h b/src/backend/managers/cdisplaytemplatemgr.h
index a9e6380..823312c 100644
--- a/src/backend/managers/cdisplaytemplatemgr.h
+++ b/src/backend/managers/cdisplaytemplatemgr.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/managers/clanguagemgr.cpp b/src/backend/managers/clanguagemgr.cpp
index a8d4e1f..49cc1a1 100644
--- a/src/backend/managers/clanguagemgr.cpp
+++ b/src/backend/managers/clanguagemgr.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -13,26 +13,6 @@
 #include "backend/managers/cswordbackend.h"
 
 
-CLanguageMgr::Language::Language() {}
-
-CLanguageMgr::Language::Language(const Language& l) {
-    m_abbrev = l.m_abbrev;
-    m_englishName = l.m_englishName;
-    m_translatedName = l.m_translatedName;
-    m_altAbbrevs = l.m_altAbbrevs;
-}
-
-CLanguageMgr::Language::Language( const QString& abbrev, const QString& name, const QString& translatedName, const QStringList& altAbbrevs ) {
-    m_abbrev = abbrev;
-    m_englishName = name;
-    m_translatedName = translatedName;
-    m_altAbbrevs =  altAbbrevs;
-}
-
-CLanguageMgr::Language::~Language() {
-}
-
-
 /****************************************************/
 /******************** CLanguageMgr ******************/
 /****************************************************/
@@ -52,7 +32,10 @@ CLanguageMgr *CLanguageMgr::instance() {
     return m_instance;
 }
 
-CLanguageMgr::CLanguageMgr() : m_langMap() {
+CLanguageMgr::CLanguageMgr()
+    : m_defaultLanguage("", "", QString::null)
+    , m_langMap()
+{
     m_availableModulesCache.moduleCount = 0;
     init();
 }
@@ -75,8 +58,8 @@ const CLanguageMgr::LangMap& CLanguageMgr::availableLanguages() {
         QStringList abbrevs;
 
         foreach (const CSwordModuleInfo* mod,  mods) {
-            if (!abbrevs.contains(mod->module()->Lang())) {
-                abbrevs.append(mod->module()->Lang());
+            if (!abbrevs.contains(mod->module()->getLanguage())) {
+                abbrevs.append(mod->module()->getLanguage());
             }
         }
 
@@ -122,10 +105,6 @@ const CLanguageMgr::Language* CLanguageMgr::languageForTranslatedName( const QSt
 
 void CLanguageMgr::init() {
 
-    // The main() sets string literal codec to utf8:
-    // QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
-    // The language names include escape sequences \uxxxx
-
     //if we've already inserted all items we do not proceed
     if (m_langMap.count() > 0) return;
 
diff --git a/src/backend/managers/clanguagemgr.h b/src/backend/managers/clanguagemgr.h
index cbe70e9..fee236f 100644
--- a/src/backend/managers/clanguagemgr.h
+++ b/src/backend/managers/clanguagemgr.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -23,67 +25,94 @@
 class CLanguageMgr {
 
     public:
-        /** Language container.
-         * This class (Language) contains the information about the chosen language.
-         */
-        class Language {
-            public:
-                /**
-                  Uses the abbreviation parameter to lookup the language name
-                  and to be able to return the name, flag etc. Possible values
-                  for abbrev are de, en, fr, it etc.
-                 */
-                Language();
 
-                Language(const Language &copy);
+        /**
+          \brief A language descriptor for CLanguageMgr.
+
+          This class (Language) contains the information about the a language.
+        */
+        class Language {
 
-                Language(const QString &abbrev, const QString &englishName,
-                         const QString &translatedName,
-                         const QStringList &altAbbrevs = QStringList());
+            friend class CLanguageMgr;
+            friend class BtFontSettingsPage;
 
-                ~Language();
+            public: /* Methods: */
 
-                /** Returns the abbreviation.
-                 * @return The abbreviation of the chosen language.
-                 */
-                inline const QString& abbrev() const {
-                    if (m_abbrev.isEmpty() && m_altAbbrevs.count()) { //no standard abbrev but alternative ones
+                /**
+                  \returns the abbreviation of the this language.
+                */
+                inline const QString & abbrev() const {
+                    if (m_abbrev.isEmpty() && m_altAbbrevs.count()) {
+                        /* No standard abbrev but alternative ones */
                         return m_altAbbrevs.first();
                     }
                     return m_abbrev;
                 }
-                /** Returns the translated name.
-                 * @return The translated name of the language.
-                 */
-                inline const QString& translatedName() const {
+
+                /**
+                  \returns the translated name of this language.
+                */
+                inline const QString & translatedName() const {
                     return m_translatedName;
                 }
-                /** The english name of the language.
-                 * @return The english name of the chosen language.
-                 */
-                inline const QString& name() const {
+
+                /**
+                  \returns the english name of this language.
+                */
+                inline const QString & englishName() const {
                     return m_englishName;
                 }
-                /** The alternative abbreviations which are avalable for this language.
-                 * @return The List of alternate abbreviations
-                 */
-                inline const QStringList alternativeAbbrevs() const {
+
+                /**
+                  \returns a list of alternative abbreviations for this language.
+                */
+                inline const QStringList & alternativeAbbrevs() const {
                     return m_altAbbrevs;
                 }
+
                 /**
-                 * Returns true if this language object is valid, i.e. has an abbrev and name.
-                 * @return True if the data is valid for this language.
-                 */
+                  \returns whether this language object is valid, i.e. has an
+                           abbreviation and an english name.
+                */
                 inline bool isValid() const {
-                    return (!abbrev().isEmpty() && !name().isEmpty());
+                    return (!m_abbrev.isEmpty() && !m_englishName.isEmpty());
                 }
 
-            private:
-                QString m_abbrev;
-                QString m_englishName;
-                QString m_translatedName;
-                QStringList m_altAbbrevs;
-        };
+            private: /* Methods: */
+
+                inline Language() {}
+
+                inline Language(const char * abbrev,
+                                const char * englishName,
+                                const QString & translatedName)
+                    : m_abbrev(abbrev)
+                    , m_englishName(QString::fromUtf8(englishName))
+                    , m_translatedName(translatedName) {}
+
+                inline Language(const QString & abbrev,
+                                const QString & englishName,
+                                const QString & translatedName)
+                    : m_abbrev(abbrev)
+                    , m_englishName(englishName)
+                    , m_translatedName(translatedName) {}
+
+                inline Language(const char * abbrev,
+                                const char * englishName,
+                                const QString & translatedName,
+                                const QStringList & altAbbrevs)
+                    : m_abbrev(abbrev)
+                    , m_englishName(QString::fromUtf8(englishName))
+                    , m_translatedName(translatedName)
+                    , m_altAbbrevs(altAbbrevs) {}
+
+            private: /* Fields: */
+
+                const QString m_abbrev;
+                const QString m_englishName;
+                const QString m_translatedName;
+                const QStringList m_altAbbrevs;
+
+        }; /* class Language { */
 
         typedef QList<Language*> LanguageList;
         typedef QHash<QString, const Language*> LangMap;
diff --git a/src/backend/managers/cswordbackend.cpp b/src/backend/managers/cswordbackend.cpp
index b5f4bff..c126c47 100644
--- a/src/backend/managers/cswordbackend.cpp
+++ b/src/backend/managers/cswordbackend.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -15,13 +15,13 @@
 #include <QSet>
 #include <QString>
 #include <QTextCodec>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/drivers/cswordbiblemoduleinfo.h"
 #include "backend/drivers/cswordbookmoduleinfo.h"
 #include "backend/drivers/cswordcommentarymoduleinfo.h"
 #include "backend/drivers/cswordlexiconmoduleinfo.h"
+#include "backend/filters/btosismorphsegmentation.h"
 #include "backend/filters/thmltoplain.h"
-#include "backend/filters/osismorphsegmentation.h"
 #include "btglobal.h"
 #include "util/directory.h"
 
@@ -37,18 +37,21 @@
 
 using namespace Rendering;
 
-CSwordBackend *CSwordBackend::m_instance = 0;
+CSwordBackend * CSwordBackend::m_instance = 0;
 
 CSwordBackend::CSwordBackend()
         : sword::SWMgr(0, 0, false,
-                       new sword::EncodingFilterMgr(sword::ENC_UTF8), true),
-          m_dataModel(this)
+                       new sword::EncodingFilterMgr(sword::ENC_UTF8), true)
+        , m_dataModel(this)
 {
     filterInit();
 }
 
-CSwordBackend::CSwordBackend(const QString& path, const bool augmentHome)
-        : sword::SWMgr(!path.isEmpty() ? path.toLocal8Bit().constData() : 0, false, new sword::EncodingFilterMgr( sword::ENC_UTF8 ), false, augmentHome) { // don't allow module renaming, because we load from a path
+CSwordBackend::CSwordBackend(const QString & path, const bool augmentHome)
+        : sword::SWMgr(!path.isEmpty() ? path.toLocal8Bit().constData() : 0,
+                       false, new sword::EncodingFilterMgr(sword::ENC_UTF8),
+                       false, augmentHome)
+{ // don't allow module renaming, because we load from a path
     filterInit();
 }
 
@@ -57,28 +60,28 @@ CSwordBackend::~CSwordBackend() {
 }
 
 void CSwordBackend::filterInit() {
-    //HACK: replace Sword's OSISMorphSegmentation filter, seems to be buggy, ours works
-    if (sword::SWOptionFilter* filter = optionFilters["OSISMorphSegmentation"]) {
+    // HACK: replace Sword's OSISMorphSegmentation filter, seems to be buggy, ours works
+    if (sword::SWOptionFilter * const filter = optionFilters["OSISMorphSegmentation"]) {
         cleanupFilters.remove(filter);
         optionFilters.erase("OSISMorphSegmentation");
         delete filter;
     }
-    sword::SWOptionFilter *tmpFilter = new Filters::OSISMorphSegmentation();
+    sword::SWOptionFilter * const tmpFilter = new Filters::BtOSISMorphSegmentation();
     optionFilters.insert(sword::OptionFilterMap::value_type("OSISMorphSegmentation", tmpFilter));
     cleanupFilters.push_back(tmpFilter);
 
-    //HACK: replace Sword's ThML strip filter with our own version
-    //remove this hack as soon as Sword is fixed
+    // HACK: replace Sword's ThML strip filter with our own version
+    // Remove this hack as soon as Sword is fixed
     cleanupFilters.remove(thmlplain);
     delete thmlplain;
     thmlplain = new Filters::ThmlToPlain();
     cleanupFilters.push_back(thmlplain);
 }
 
-QList<CSwordModuleInfo*> CSwordBackend::takeModulesFromList(const QStringList &names) {
-    QList<CSwordModuleInfo*> list;
-    Q_FOREACH (const QString &name, names) {
-        CSwordModuleInfo* mInfo = findModuleByName(name);
+QList<CSwordModuleInfo *> CSwordBackend::takeModulesFromList(const QStringList & names) {
+    QList<CSwordModuleInfo *> list;
+    Q_FOREACH (const QString & name, names) {
+        CSwordModuleInfo * const mInfo = findModuleByName(name);
         if (mInfo) {
             m_dataModel.removeModule(mInfo);
             list.append(mInfo);
@@ -89,82 +92,76 @@ QList<CSwordModuleInfo*> CSwordBackend::takeModulesFromList(const QStringList &n
     return list;
 }
 
-QList<CSwordModuleInfo*> CSwordBackend::getPointerList(const QStringList &names) const {
-    QList<CSwordModuleInfo*> list;
-    Q_FOREACH (const QString &name, names) {
-        CSwordModuleInfo *mInfo = findModuleByName(name);
-        if (mInfo) {
+QList<CSwordModuleInfo *> CSwordBackend::getPointerList(const QStringList & names) const {
+    QList<CSwordModuleInfo *> list;
+    Q_FOREACH (const QString & name, names) {
+        CSwordModuleInfo * const mInfo = findModuleByName(name);
+        if (mInfo)
             list.append(mInfo);
-        }
     }
     return list;
 }
 
-QList<const CSwordModuleInfo*> CSwordBackend::getConstPointerList(
-        const QStringList &names) const
+QList<const CSwordModuleInfo *> CSwordBackend::getConstPointerList(
+        const QStringList & names) const
 {
-    QList<const CSwordModuleInfo*> list;
-    Q_FOREACH (const QString &name, names) {
-        const CSwordModuleInfo *mInfo = findModuleByName(name);
-        if (mInfo) {
+    QList<const CSwordModuleInfo *> list;
+    Q_FOREACH (const QString & name, names) {
+        const CSwordModuleInfo * const mInfo = findModuleByName(name);
+        if (mInfo)
             list.append(mInfo);
-        }
     }
     return list;
 }
 
+CSwordBackend::LoadError CSwordBackend::initModules(const SetupChangedReason reason) {
+    // qWarning("globalSwordConfigPath is %s", globalConfPath);
 
-/** Initializes the Sword modules. */
-CSwordBackend::LoadError CSwordBackend::initModules(SetupChangedReason reason) {
-    //  qWarning("globalSwordConfigPath is %s", globalConfPath);
-    LoadError ret = NoError;
-
-    shutdownModules(); //remove previous modules
+    shutdownModules(); // Remove previous modules
     m_dataModel.clear();
 
     sword::ModMap::iterator end = Modules.end();
-    ret = LoadError( Load() );
+    const LoadError ret = static_cast<LoadError>(Load());
 
-    for (sword::ModMap::iterator it = Modules.begin(); it != end; it++) {
-        sword::SWModule* const curMod = (*it).second;
-        CSwordModuleInfo* newModule = 0;
+    for (sword::ModMap::iterator it = Modules.begin(); it != end; ++it) {
+        sword::SWModule * const curMod = it->second;
+        CSwordModuleInfo * newModule;
 
-        if (!strcmp(curMod->Type(), "Biblical Texts")) {
-            newModule = new CSwordBibleModuleInfo(curMod, this);
+        const char * const modType = curMod->getType();
+        if (!strcmp(modType, "Biblical Texts")) {
+            newModule = new CSwordBibleModuleInfo(curMod, *this);
             newModule->module()->setDisplay(&m_chapterDisplay);
-        }
-        else if (!strcmp(curMod->Type(), "Commentaries")) {
-            newModule = new CSwordCommentaryModuleInfo(curMod, this);
+        } else if (!strcmp(modType, "Commentaries")) {
+            newModule = new CSwordCommentaryModuleInfo(curMod, *this);
             newModule->module()->setDisplay(&m_entryDisplay);
-        }
-        else if (!strcmp(curMod->Type(), "Lexicons / Dictionaries")) {
-            newModule = new CSwordLexiconModuleInfo(curMod, this);
+        } else if (!strcmp(modType, "Lexicons / Dictionaries")) {
+            newModule = new CSwordLexiconModuleInfo(curMod, *this);
             newModule->module()->setDisplay(&m_entryDisplay);
-        }
-        else if (!strcmp(curMod->Type(), "Generic Books")) {
-            newModule = new CSwordBookModuleInfo(curMod, this);
+        } else if (!strcmp(modType, "Generic Books")) {
+            newModule = new CSwordBookModuleInfo(curMod, *this);
             newModule->module()->setDisplay(&m_bookDisplay);
+        } else {
+            continue;
         }
 
-        if (newModule) {
-            //Append the new modules to our list, but only if it's supported
-            //The constructor of CSwordModuleInfo prints a warning on stdout
-            if (!newModule->hasVersion() || (newModule->minimumSwordVersion() <= sword::SWVersion::currentVersion)) {
-                m_dataModel.addModule(newModule);
-            }
-            else {
-                delete newModule;
-            }
+        // Append the new modules to our list, but only if it's supported
+        // The constructor of CSwordModuleInfo prints a warning on stdout
+        if (!newModule->hasVersion()
+            || (newModule->minimumSwordVersion() <= sword::SWVersion::currentVersion))
+        {
+            m_dataModel.addModule(newModule);
+        } else {
+            delete newModule;
         }
     }
 
-    Q_FOREACH(CSwordModuleInfo* mod, m_dataModel.moduleList()) {
-        //unlock modules if keys are present
-        if ( mod->isEncrypted() ) {
-            const QString unlockKey = CBTConfig::getModuleEncryptionKey( mod->name() );
-            if (!unlockKey.isNull()) {
-                setCipherKey( mod->name().toUtf8().constData(), unlockKey.toUtf8().constData() );
-            }
+    // Unlock modules if keys are present:
+    Q_FOREACH(CSwordModuleInfo * mod, m_dataModel.moduleList()) {
+        if (mod->isEncrypted()) {
+            const QString unlockKey = btConfig().getModuleEncryptionKey(mod->name());
+            if (!unlockKey.isNull())
+                setCipherKey(mod->name().toUtf8().constData(),
+                             unlockKey.toUtf8().constData());
         }
     }
 
@@ -172,46 +169,36 @@ CSwordBackend::LoadError CSwordBackend::initModules(SetupChangedReason reason) {
     return ret;
 }
 
-void CSwordBackend::AddRenderFilters(sword::SWModule *module, sword::ConfigEntMap &section) {
-    sword::SWBuf moduleDriver;
-    sword::SWBuf sourceformat;
-    sword::ConfigEntMap::iterator entry;
-    bool noDriver = true;
-
-    sourceformat = ((entry = section.find("SourceType")) != section.end()) ? (*entry).second : (sword::SWBuf) "";
-    moduleDriver = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (sword::SWBuf) "";
-
-    if (sourceformat == "OSIS") {
-        module->AddRenderFilter(&m_osisFilter);
-        noDriver = false;
-    }
-    else if (sourceformat == "ThML") {
-        module->AddRenderFilter(&m_thmlFilter);
-        noDriver = false;
-    }
-    else if (sourceformat == "TEI") {
-        module->AddRenderFilter(&m_teiFilter);
-        noDriver = false;
-    }
-    else if (sourceformat == "GBF") {
-        module->AddRenderFilter(&m_gbfFilter);
-        noDriver = false;
-    }
-    else if (sourceformat == "PLAIN") {
-        module->AddRenderFilter(&m_plainFilter);
-        noDriver = false;
-    }
-
-    if (noDriver) { //no driver found
-        if ( (moduleDriver == "RawCom") || (moduleDriver == "RawLD") ) {
-            module->AddRenderFilter(&m_plainFilter);
-            noDriver = false;
+void CSwordBackend::AddRenderFilters(sword::SWModule * module,
+                                     sword::ConfigEntMap & section)
+{
+    sword::ConfigEntMap::const_iterator entry = section.find("SourceType");
+    if (entry != section.end()) {
+        if (entry->second == "OSIS") {
+            module->addRenderFilter(&m_osisFilter);
+            return;
+        } else if (entry->second == "ThML") {
+            module->addRenderFilter(&m_thmlFilter);
+            return;
+        } else if (entry->second == "TEI") {
+            module->addRenderFilter(&m_teiFilter);
+            return;
+        } else if (entry->second == "GBF") {
+            module->addRenderFilter(&m_gbfFilter);
+            return;
+        } else if (entry->second == "PLAIN") {
+            module->addRenderFilter(&m_plainFilter);
+            return;
         }
     }
+
+    // No driver found
+    entry = section.find("ModDrv");
+    if (entry != section.end() && (entry->second == "RawCom" || entry->second == "RawLD"))
+        module->addRenderFilter(&m_plainFilter);
 }
 
-/** This function deinitializes the modules and deletes them. */
-bool CSwordBackend::shutdownModules() {
+void CSwordBackend::shutdownModules() {
     m_dataModel.clear(true);
     //BT  mods are deleted now, delete Sword mods, too.
     DeleteMods();
@@ -221,117 +208,107 @@ bool CSwordBackend::shutdownModules() {
      * modules. If these modules are removed, the filters need to be removed as well,
      * so that they are re-created for the new module objects.
      */
-    sword::FilterMap::iterator cipher_it;
-    for (cipher_it = cipherFilters.begin(); cipher_it != cipherFilters.end(); cipher_it++) {
+    typedef sword::FilterMap::const_iterator FMCI;
+    for (FMCI it = cipherFilters.begin(); it != cipherFilters.end(); ++it) {
         //Delete the Filter and remove it from the cleanup list
-        cleanupFilters.remove(cipher_it->second);
-        delete cipher_it->second;
+        cleanupFilters.remove(it->second);
+        delete it->second;
     }
     cipherFilters.clear();
-
-    return true;
 }
 
-void CSwordBackend::setOption( const CSwordModuleInfo::FilterTypes type, const int state ) {
-    sword::SWBuf value;
-
-    switch (type) {
-
-        case CSwordModuleInfo::textualVariants:
-
-            if (state == 0) {
-                value = "Primary Reading";
-            }
-            else if (state == 1) {
-                value = "Secondary Reading";
-            }
-            else {
-                value = "All Readings";
-            }
-
+void CSwordBackend::setOption(const CSwordModuleInfo::FilterTypes type,
+                              const int state)
+{
+    if (type == CSwordModuleInfo::textualVariants) {
+        switch (state) {
+        case 0:
+            setGlobalOption(optionName(type).toUtf8().constData(),
+                            "Primary Reading");
+            break;
+        case 1:
+            setGlobalOption(optionName(type).toUtf8().constData(),
+                            "Secondary Reading");
             break;
-
         default:
-            value = state ? "On" : "Off";
+            setGlobalOption(optionName(type).toUtf8().constData(),
+                            "All Readings");
             break;
-    };
-
-    if (value.length())
-        setGlobalOption(optionName(type).toUtf8().constData(), value.c_str());
+        }
+    } else {
+        setGlobalOption(optionName(type).toUtf8().constData(),
+                        state ? "On" : "Off");
+    }
 }
 
-void CSwordBackend::setFilterOptions(const FilterOptions &options) {
-    setOption( CSwordModuleInfo::footnotes,      options.footnotes );
-    setOption( CSwordModuleInfo::strongNumbers,    options.strongNumbers );
-    setOption( CSwordModuleInfo::headings,       options.headings );
-    setOption( CSwordModuleInfo::morphTags,      options.morphTags );
-    setOption( CSwordModuleInfo::lemmas,        options.lemmas );
-    setOption( CSwordModuleInfo::hebrewPoints,     options.hebrewPoints );
-    setOption( CSwordModuleInfo::hebrewCantillation,  options.hebrewCantillation );
-    setOption( CSwordModuleInfo::greekAccents,     options.greekAccents );
-    setOption( CSwordModuleInfo::redLetterWords,   options.redLetterWords );
-    setOption( CSwordModuleInfo::textualVariants,   options.textualVariants );
-    setOption( CSwordModuleInfo::morphSegmentation,  options.morphSegmentation );
-    //  setOption( CSwordModuleInfo::transliteration,   options.transliteration );
-    setOption( CSwordModuleInfo::scriptureReferences, options.scriptureReferences);
+void CSwordBackend::setFilterOptions(const FilterOptions & options) {
+    setOption(CSwordModuleInfo::footnotes,           options.footnotes);
+    setOption(CSwordModuleInfo::strongNumbers,       options.strongNumbers);
+    setOption(CSwordModuleInfo::headings,            options.headings);
+    setOption(CSwordModuleInfo::morphTags,           options.morphTags);
+    setOption(CSwordModuleInfo::lemmas,              options.lemmas);
+    setOption(CSwordModuleInfo::hebrewPoints,        options.hebrewPoints);
+    setOption(CSwordModuleInfo::hebrewCantillation,  options.hebrewCantillation);
+    setOption(CSwordModuleInfo::greekAccents,        options.greekAccents);
+    setOption(CSwordModuleInfo::redLetterWords,      options.redLetterWords);
+    setOption(CSwordModuleInfo::textualVariants,     options.textualVariants);
+    setOption(CSwordModuleInfo::morphSegmentation,   options.morphSegmentation);
+    // setOption(CSwordModuleInfo::transliteration,   options.transliteration);
+    setOption(CSwordModuleInfo::scriptureReferences, options.scriptureReferences);
 }
 
-/** This function searches for a module with the specified description */
-CSwordModuleInfo* CSwordBackend::findModuleByDescription(const QString &description) const {
-    Q_FOREACH (CSwordModuleInfo *mod, m_dataModel.moduleList()) {
-        if (mod->config(CSwordModuleInfo::Description) == description) return mod;
-    }
+CSwordModuleInfo * CSwordBackend::findModuleByDescription(const QString & description) const {
+    Q_FOREACH (CSwordModuleInfo * mod, m_dataModel.moduleList())
+        if (mod->config(CSwordModuleInfo::Description) == description)
+            return mod;
     return 0;
 }
 
-/** This function searches for a module with the specified name */
-CSwordModuleInfo* CSwordBackend::findModuleByName(const QString &name) const {
-    Q_FOREACH (CSwordModuleInfo *mod, m_dataModel.moduleList()) {
-        if (mod->name() == name) return mod;
-    }
+CSwordModuleInfo * CSwordBackend::findModuleByName(const QString & name) const {
+    Q_FOREACH (CSwordModuleInfo * mod, m_dataModel.moduleList())
+        if (mod->name() == name)
+            return mod;
     return 0;
 }
 
-CSwordModuleInfo* CSwordBackend::findSwordModuleByPointer(const sword::SWModule * const swmodule) const {
-    Q_FOREACH (CSwordModuleInfo *mod, m_dataModel.moduleList()) {
-        if (mod->module() == swmodule) return mod;
-    }
+CSwordModuleInfo * CSwordBackend::findSwordModuleByPointer(const sword::SWModule * const swmodule) const {
+    Q_FOREACH (CSwordModuleInfo * mod, m_dataModel.moduleList())
+        if (mod->module() == swmodule)
+            return mod;
     return 0;
 }
 
-/** Returns the text used for the option given as parameter. */
-const QString CSwordBackend::optionName( const CSwordModuleInfo::FilterTypes option ) {
+QString CSwordBackend::optionName(const CSwordModuleInfo::FilterTypes option) {
     switch (option) {
         case CSwordModuleInfo::footnotes:
-            return QString("Footnotes");
+            return "Footnotes";
         case CSwordModuleInfo::strongNumbers:
-            return QString("Strong's Numbers");
+            return "Strong's Numbers";
         case CSwordModuleInfo::headings:
-            return QString("Headings");
+            return "Headings";
         case CSwordModuleInfo::morphTags:
-            return QString("Morphological Tags");
+            return "Morphological Tags";
         case CSwordModuleInfo::lemmas:
-            return QString("Lemmas");
+            return "Lemmas";
         case CSwordModuleInfo::hebrewPoints:
-            return QString("Hebrew Vowel Points");
+            return "Hebrew Vowel Points";
         case CSwordModuleInfo::hebrewCantillation:
-            return QString("Hebrew Cantillation");
+            return "Hebrew Cantillation";
         case CSwordModuleInfo::greekAccents:
-            return QString("Greek Accents");
+            return "Greek Accents";
         case CSwordModuleInfo::redLetterWords:
-            return QString("Words of Christ in Red");
+            return "Words of Christ in Red";
         case CSwordModuleInfo::textualVariants:
-            return QString("Textual Variants");
+            return "Textual Variants";
         case CSwordModuleInfo::scriptureReferences:
-            return QString("Cross-references");
+            return "Cross-references";
         case CSwordModuleInfo::morphSegmentation:
-            return QString("Morph Segmentation");
+            return "Morph Segmentation";
     }
     return QString::null;
 }
 
-/** Returns the translated name of the option given as parameter. */
-const QString CSwordBackend::translatedOptionName(const CSwordModuleInfo::FilterTypes option) {
+QString CSwordBackend::translatedOptionName(const CSwordModuleInfo::FilterTypes option) {
     switch (option) {
         case CSwordModuleInfo::footnotes:
             return QObject::tr("Footnotes");
@@ -362,58 +339,60 @@ const QString CSwordBackend::translatedOptionName(const CSwordModuleInfo::Filter
 }
 
 
-const QString CSwordBackend::configOptionName( const CSwordModuleInfo::FilterTypes option ) {
+QString CSwordBackend::configOptionName(const CSwordModuleInfo::FilterTypes option) {
     switch (option) {
         case CSwordModuleInfo::footnotes:
-            return QString("Footnotes");
+            return "Footnotes";
         case CSwordModuleInfo::strongNumbers:
-            return QString("Strongs");
+            return "Strongs";
         case CSwordModuleInfo::headings:
-            return QString("Headings");
+            return "Headings";
         case CSwordModuleInfo::morphTags:
-            return QString("Morph");
+            return "Morph";
         case CSwordModuleInfo::lemmas:
-            return QString("Lemma");
+            return "Lemma";
         case CSwordModuleInfo::hebrewPoints:
-            return QString("HebrewPoints");
+            return "HebrewPoints";
         case CSwordModuleInfo::hebrewCantillation:
-            return QString("Cantillation");
+            return "Cantillation";
         case CSwordModuleInfo::greekAccents:
-            return QString("GreekAccents");
+            return "GreekAccents";
         case CSwordModuleInfo::redLetterWords:
-            return QString("RedLetterWords");
+            return "RedLetterWords";
         case CSwordModuleInfo::textualVariants:
-            return QString("Variants");
+            return "Variants";
         case CSwordModuleInfo::scriptureReferences:
-            return QString("Scripref");
+            return "Scripref";
         case CSwordModuleInfo::morphSegmentation:
-            return QString("MorphSegmentation");
+            return "MorphSegmentation";
     }
     return QString::null;
 }
 
-const QString CSwordBackend::booknameLanguage( const QString& language ) {
+const QString CSwordBackend::booknameLanguage(const QString & language) {
     if (!language.isEmpty()) {
-        sword::LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName( language.toUtf8().constData() );
-
-        //refresh the locale of all Bible and commentary modules!
-        //use what sword returns, language may be different
-        QString newLocaleName( sword::LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName()  );
-
-        Q_FOREACH (CSwordModuleInfo *mod, m_dataModel.moduleList()) {
-            if ( (mod->type() == CSwordModuleInfo::Bible) || (mod->type() == CSwordModuleInfo::Commentary) ) {
-                //Create a new key, it will get the default bookname language
-                ((sword::VerseKey*)(mod->module()->getKey()))->setLocale( newLocaleName.toUtf8().constData() );
+        sword::LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(language.toUtf8().constData());
+
+        // Refresh the locale of all Bible and commentary modules!
+        // Use what sword returns, language may be different.
+        const QByteArray newLocaleName(QString(sword::LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName()).toUtf8());
+
+        Q_FOREACH (CSwordModuleInfo * mod, m_dataModel.moduleList()) {
+            if (mod->type() == CSwordModuleInfo::Bible
+                || mod->type() == CSwordModuleInfo::Commentary)
+            {
+                // Create a new key, it will get the default bookname language:
+                typedef sword::VerseKey VK;
+                VK & vk = *static_cast<VK *>(mod->module()->getKey());
+                vk.setLocale(newLocaleName.constData());
             }
         }
 
     }
-    return QString( sword::LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName() );
+    return sword::LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName();
 }
 
-
-/** Reload all Sword modules. */
-void CSwordBackend::reloadModules(SetupChangedReason reason) {
+void CSwordBackend::reloadModules(const SetupChangedReason reason) {
     shutdownModules();
 
     //delete Sword's config to make Sword reload it!
@@ -425,8 +404,7 @@ void CSwordBackend::reloadModules(SetupChangedReason reason) {
         findConfig(&configType, &prefixPath, &configPath, &augPaths, &sysConfig);
         // now re-read module configuration files
         loadConfigDir(configPath);
-    }
-    else if (config) {
+    } else if (config) {
         config->Load();
     }
 
@@ -435,17 +413,13 @@ void CSwordBackend::reloadModules(SetupChangedReason reason) {
 
 // Get one or more shared sword config (sword.conf) files
 QStringList CSwordBackend::getSharedSwordConfigFiles() const {
-    QStringList configPath;
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     //  %ALLUSERSPROFILE%\Sword\sword.conf
-    QString tmp = util::directory::getSharedSwordDir().filePath("sword.conf");
-    QString globalPath = util::directory::convertDirSeparators(QString(getenv("SWORD_PATH")));
-    configPath << globalPath.append("/Sword/sword.conf");
+    return QStringList(util::directory::convertDirSeparators(QString(getenv("SWORD_PATH"))) += "/Sword/sword.conf");
 #else
     // /etc/sword.conf, /usr/local/etc/sword.conf
-    configPath = QString(globalConfPath).split(":");
+    return QString(globalConfPath).split(":");
 #endif
-    return configPath;
 }
 
 // Get the private sword directory
@@ -454,15 +428,13 @@ QString CSwordBackend::getPrivateSwordConfigPath() const {
 }
 
 QString CSwordBackend::getPrivateSwordConfigFile() const {
-    QString file(getPrivateSwordConfigPath() + "/sword.conf");
-    return util::directory::convertDirSeparators(file);
+    return util::directory::convertDirSeparators(getPrivateSwordConfigPath() += "/sword.conf");
 }
 
 // Return a list of used Sword dirs. Useful for the installer.
 QStringList CSwordBackend::swordDirList() const {
     namespace DU = util::directory;
     typedef QStringList::const_iterator SLCI;
-    typedef sword::ConfigEntMap::const_iterator CEMCI;
 
     // Get the set of sword directories that could contain modules:
     QSet<QString> swordDirSet;
@@ -471,8 +443,7 @@ QStringList CSwordBackend::swordDirList() const {
     if (QFile(getPrivateSwordConfigFile()).exists()) {
         // Use the private sword.conf file:
         configs << getPrivateSwordConfigFile();
-    }
-    else {
+    } else {
         /*
           Did not find private sword.conf, will use shared sword.conf files to
           build the private one. Once the private sword.conf exist, the shared
@@ -480,7 +451,7 @@ QStringList CSwordBackend::swordDirList() const {
         */
         configs = getSharedSwordConfigFiles();
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
         /*
           On Windows, add the shared sword directory to the set so the new
           private sword.conf will have it. The user could decide to delete this
@@ -491,53 +462,49 @@ QStringList CSwordBackend::swordDirList() const {
     }
 
     // Search the sword.conf file(s) for sword directories that could contain modules
-    for (SLCI it(configs.begin()); it != configs.end(); it++) {
-        if (!QFileInfo(*it).exists()) {
+    for (SLCI it = configs.begin(); it != configs.end(); ++it) {
+        if (!QFileInfo(*it).exists())
             continue;
-        }
 
         /*
           Get all DataPath and AugmentPath entries from the config file and add
           them to the list:
         */
-        sword::SWConfig conf((*it).toUtf8().constData());
+        sword::SWConfig conf(it->toUtf8().constData());
         swordDirSet << QDir(QTextCodec::codecForLocale()->toUnicode(conf["Install"]["DataPath"].c_str())).absolutePath();
 
-        sword::ConfigEntMap group(conf["Install"]);
-        const sword::ConfigEntMap::iterator start(group.equal_range("AugmentPath").first);
-        const sword::ConfigEntMap::iterator end(group.equal_range("AugmentPath").second);
-
-        for (CEMCI it(start); it != end; it++) {
-            QDir(QTextCodec::codecForLocale()->toUnicode(it->second.c_str())).absolutePath();
+        const sword::ConfigEntMap group(conf["Install"]);
+        typedef sword::ConfigEntMap::const_iterator CEMCI;
+        for (std::pair<CEMCI, CEMCI> its = group.equal_range("AugmentPath");
+             its.first != its.second;
+             ++(its.first))
+        {
             // Added augment path:
-            swordDirSet << QDir(QTextCodec::codecForLocale()->toUnicode(it->second.c_str())).absolutePath();
+            swordDirSet << QDir(QTextCodec::codecForLocale()->toUnicode(its.first->second.c_str())).absolutePath();
         }
     }
 
     // Add the private sword path to the set if not there already:
     swordDirSet << getPrivateSwordConfigPath();
 
-    return swordDirSet.values();
+    return QStringList::fromSet(swordDirSet);
 }
 
 void CSwordBackend::deleteOrphanedIndices() {
-    QDir dir(CSwordModuleInfo::getGlobalBaseIndexLocation());
-    dir.setFilter(QDir::Dirs);
-    CSwordModuleInfo* module;
-
-    for (unsigned int i = 0; i < dir.count(); i++) {
-        if (dir[i] != "." && dir[i] != "..") {
-            if ( (module = this->findModuleByName(dir[i])) ) { //mod exists
-                if (!module->hasIndex()) { //index files found, but wrong version etc.
-                    qDebug() << "deleting outdated index for module" << dir[i];
-                    CSwordModuleInfo::deleteIndexForModule( dir[i] );
-                }
+    const QStringList entries = QDir(CSwordModuleInfo::getGlobalBaseIndexLocation()).entryList(QDir::Dirs);
+    Q_FOREACH(const QString & entry, entries) {
+        if (entry == "." || entry == "..")
+            continue;
+        CSwordModuleInfo * const module = findModuleByName(entry);
+        if (module) { //mod exists
+            if (!module->hasIndex()) { //index files found, but wrong version etc.
+                qDebug() << "deleting outdated index for module" << entry;
+                CSwordModuleInfo::deleteIndexForModule(entry);
             }
-            else { //no module exists
-                if (CBTConfig::get( CBTConfig::autoDeleteOrphanedIndices ) ) {
-                    qDebug() << "deleting orphaned index in directory" << dir[i];
-                    CSwordModuleInfo::deleteIndexForModule( dir[i] );
-                }
+        } else { //no module exists
+            if (btConfig().value<bool>("settings/behaviour/autoDeleteOrphanedIndices", true)) {
+                qDebug() << "deleting orphaned index in directory" << entry;
+                CSwordModuleInfo::deleteIndexForModule(entry);
             }
         }
     }
diff --git a/src/backend/managers/cswordbackend.h b/src/backend/managers/cswordbackend.h
index 764d6d5..21da696 100644
--- a/src/backend/managers/cswordbackend.h
+++ b/src/backend/managers/cswordbackend.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -10,7 +12,6 @@
 #ifndef CSWORDBACKEND_H
 #define CSWORDBACKEND_H
 
-#include <QMap>
 #include <QObject>
 #include <QString>
 #include <QStringList>
@@ -44,215 +45,241 @@
         BibleTimeApp::~BibleTimeApp(). Only when \ref BackendNotSingleton
         "managing modules" separate backends are created.
 */
-class CSwordBackend : public QObject, public sword::SWMgr {
-        Q_OBJECT
-    public:
-
-        /** The reason for the sigSwordSetupChanged signal, i.e. why the module list has changed. */
-        enum SetupChangedReason {
-            AddedModules = 1,
-            RemovedModules = 2,
-            HidedModules = 4,
-            PathChanged = 8,
-            OtherChange = 16
-        };
-
-        /** The error codes which may be returned by the @ref Load() call.
-        */
-        enum LoadError { // the values exist to cast from the char return of SWMgr::Load
-            NoSwordConfig = -1,
-            NoError = 0,
-            NoModules = 1
-        };
-        /**
-        * The constructor of the Sword backend. Used by BtInstallBackend only.
-        * Notice that using augmentHome=false can mess up the system because it is true elsewhere.
-        * @param path The path which is used to load modules
-        * @param augmentHome True if the $HOME/.sword/ modules should be augmented with the other modules
-        */
-        CSwordBackend( const QString& path, const bool augmentHome = true );
-
-        /**
-        * The destrctor of this backend. This function shuts the modules down using @ref shutdownModules.
-        */
-        ~CSwordBackend();
-
-        /** Creates and returns the instance. */
-        static inline CSwordBackend *createInstance() {
-            Q_ASSERT(m_instance == 0);
-            m_instance = new CSwordBackend();
-            return m_instance;
-        }
-
-        /** Returns the singleton instance, creating it if one does not exist. */
-        static inline CSwordBackend *instance() { return m_instance; }
-
-        /** Destroys the singleton instance, if one exists. */
-        static void destroyInstance() { delete m_instance; }
-
-        /**
-        * This function returns the list of available modules managed by this
-        * backend. You have to call initModules() first; This method is
-        * equivalent to model()->modules().
-        *
-        * @return The list of modules managed by this backend
-        */
-        inline const QList<CSwordModuleInfo*>& moduleList() const;
-
-        inline BtBookshelfModel *model();
-
-        /**
-        * Initializes the Sword modules.
-        *
-        * @return True if the initializiation was succesful, otherwise return false.
-        */
-        CSwordBackend::LoadError initModules(SetupChangedReason reason);
-        /**
-        * This function deinitializes the modules and deletes them.
-        *
-        * @return True if it was succesful, otherwise return false
-        */
-        bool shutdownModules();
-        /**
-        * Sets the given options enabled or disabled depending on the second parameter.
-        *
-        * @param type This is the type this function should set enabled or disabled
-        * @param enable If this is true the option will be enabled, otherwise it will be disabled.
-        */
-        void setOption( const CSwordModuleInfo::FilterTypes type, const int state );
-
-        void setFilterOptions(const FilterOptions &options);
-        /**
-        * Sets the language for the international booknames of Sword.
-        * @param langName The abbreviation string which should be used for the Sword backend
-        */
-        const QString booknameLanguage( const QString& langName = QString::null );
-        /**
-        * This function searches for a module with the specified description
-        * @param description The description of the desired module
-        * @return pointer to the desired module; null if no module has the specified description
-        */
-        CSwordModuleInfo* findModuleByDescription(const QString &description) const;
-
-        /**
-        * This function searches for a module with the specified name
-        * @param name The name of the desired module
-        * @return Pointer to the desired module; null if no module has the specified name
-        */
-        CSwordModuleInfo* findModuleByName(const QString &name) const;
-        /**
-        * This function searches for a module with the specified sword module as module() object!
-        * @param swmodule to a Sword module
-        * @return pointer to the desired module; null if no module has the specified name
-        */
-        CSwordModuleInfo* findSwordModuleByPointer(const sword::SWModule * const swmodule) const;
-
-        /**
-        * @return Our global config object which contains the configs of all modules merged together.
-        */
-        inline sword::SWConfig* getConfig() const;
-
-        /**
-        * Returns the text used for the option given as parameter.
-        * @param The paramter enum
-        * @return The name of the option given by the parameter
-        */
-        static const QString optionName( const CSwordModuleInfo::FilterTypes option );
-        /**
-        * Returns the text used for the option given as parameter.
-        */
-        static const QString configOptionName( const CSwordModuleInfo::FilterTypes option );
-        /**
-        * Returns the translated name of the option given as parameter.
-        * @param The translated option name
-        */
-        static const QString translatedOptionName(const CSwordModuleInfo::FilterTypes option );
-
-        /**
-        * Reload all Sword modules.
-        */
-        void reloadModules(SetupChangedReason reason);
-
-        /**
-        * Takes off the given modules from the list and returns them.
-        * User must take care of the deletion of the returned CSwordModuleInfo pointers.
-        */
-        QList<CSwordModuleInfo*> takeModulesFromList(const QStringList &names);
-
-        /**
-          \returns a list of pointers to modules, created from a list of module
-                   names.
-        */
-        QList<CSwordModuleInfo*> getPointerList(const QStringList &names) const;
-
-        /**
-          \returns a list of pointers to const modules, created from a list of
-                   module names.
-        */
-        QList<const CSwordModuleInfo*> getConstPointerList(const QStringList &names) const;
-
-        /** Sword prefix list.
-        * @return A list of all known Sword prefix dirs
-        */
-        QStringList swordDirList() const;
-        /**
-         * delete all orphaned indexes (no module present) if autoDeleteOrphanedIndices is true
-         * delete all indices of modules where hasIndex() returns false (because of wrong index version etc.)
-         */
-        void deleteOrphanedIndices();
-
-    signals:
-        void sigSwordSetupChanged(CSwordBackend::SetupChangedReason reason);
-
-    protected:
-        /**
-          Creates the SWModule objects using SWMgr's methods, it adds the
-          necessary filters for the module format.
-        */
-        CSwordBackend();
-
-        /**
-        * Reimplemented from sword::SWMgr.
-        */
-        void AddRenderFilters(sword::SWModule *module, sword::ConfigEntMap &section);
-        /**
-        * Overrides Sword filters which appear to be buggy.
-        */
-        void filterInit();
-
-        QStringList getSharedSwordConfigFiles() const;
-        QString getPrivateSwordConfigPath() const;
-        QString getPrivateSwordConfigFile() const;
-
-    private: /* Fields: */
-        // Filters:
-        Filters::GbfToHtml   m_gbfFilter;
-        Filters::OsisToHtml  m_osisFilter;
-        Filters::PlainToHtml m_plainFilter;
-        Filters::TeiToHtml   m_teiFilter;
-        Filters::ThmlToHtml  m_thmlFilter;
-
-        // Displays:
-        Rendering::CChapterDisplay m_chapterDisplay;
-        Rendering::CEntryDisplay   m_entryDisplay;
-        Rendering::CBookDisplay    m_bookDisplay;
-
-        BtBookshelfModel m_dataModel;
-
-        static CSwordBackend *m_instance;
+class CSwordBackend: public QObject, public sword::SWMgr {
+
+    Q_OBJECT
+
+public: /* Types: */
+
+    /**
+      \brief The reason for the sigSwordSetupChanged signal, i.e. why the module
+             list has changed.
+    */
+    enum SetupChangedReason {
+        AddedModules = 1,
+        RemovedModules = 2,
+        HidedModules = 4,
+        PathChanged = 8,
+        OtherChange = 16
+    };
+
+    /**
+      \brief The error codes which may be returned by the \ref Load() call.
+      \note These values exist to cast from the char return of SWMgr::Load().
+    */
+    enum LoadError {
+        NoSwordConfig = -1,
+        NoError = 0,
+        NoModules = 1
+    };
+
+public: /* Methods: */
+
+    /**
+      \note Used by BtInstallBackend only.
+      \note Using augmentHome=false can mess up the system because it is true
+            elsewhere.
+      \param[in] path The path which is used to load modules.
+      \param[in] augmentHome Whether $HOME/.sword/ modules should be augmented
+                             with the other modules.
+    */
+    CSwordBackend(const QString & path, const bool augmentHome = true);
+
+    ~CSwordBackend();
+
+    /** \returns the CSwordBackend singleton instance (created if needed). */
+    static inline CSwordBackend * createInstance() {
+        Q_ASSERT(!m_instance);
+        m_instance = new CSwordBackend();
+        return m_instance;
+    }
+
+    /** \returns the singleton instance, creating it if one does not exist. */
+    static inline CSwordBackend * instance() { return m_instance; }
+
+    /** \brief Destroys the singleton instance, if one exists. */
+    static inline void destroyInstance() {
+        delete m_instance;
+        m_instance = NULL;
+    }
+
+    /**
+      \warning You have to call initModules() first.
+      \note This method is equivalent to model()->modules().
+      \returns The list of modules managed by this backend.
+    */
+    inline const QList<CSwordModuleInfo *> & moduleList() const;
+
+    inline BtBookshelfModel * model();
+
+    /**
+      \brief Initializes the Sword modules.
+      \returns whether the initializiation was successful.
+    */
+    CSwordBackend::LoadError initModules(const SetupChangedReason reason);
+
+    /**
+      \brief Deinitializes and frees the modules.
+      \returns whether the method succeeded.
+    */
+    void shutdownModules();
+
+    /**
+      \brief Sets the state of the given filter option.
+      \param[in] type The filter type whose state to set.
+      \param[in] state The new filter option state.
+    */
+    void setOption(const CSwordModuleInfo::FilterTypes type, const int state);
+
+    void setFilterOptions(const FilterOptions & options);
+
+    /**
+      \brief Sets the language for the international booknames of Sword.
+      \param[in] langName The abbreviation string which should be used for the
+                          Sword backend.
+    */
+    const QString booknameLanguage(const QString & langName = QString::null);
+
+    /**
+      \brief Searches for a module with the given description.
+      \param[in] description The description of the desired module.
+      \returns a pointer to the desired module or NULL if not found.
+    */
+    CSwordModuleInfo * findModuleByDescription(const QString & description) const;
+
+    /**
+      \brief Searches for a module with the given name.
+      \param[in] name The name of the desired module.
+      \returns a pointer to the desired module or NULL if not found.
+    */
+    CSwordModuleInfo * findModuleByName(const QString & name) const;
+
+    /**
+      \brief Searches for a module with the given sword module as module().
+      \param[in] swmodule The SWModule of the desired module.
+      \returns a pointer to the desired module or NULL if not found.
+    */
+    CSwordModuleInfo * findSwordModuleByPointer(const sword::SWModule * const swmodule) const;
+
+    /**
+      \returns The global config object containing the configs of all modules
+               merged together.
+    */
+    inline sword::SWConfig * getConfig() const;
+
+    /**
+      \param[in] option The option name to return.
+      \returns The name of the option given by the parameter.
+    */
+    static QString optionName(const CSwordModuleInfo::FilterTypes option);
+
+    /**
+      \param[in] option The configuration option name to return.
+      \returns the text used for the configuration option given.
+    */
+    static QString configOptionName(const CSwordModuleInfo::FilterTypes option);
+
+    /**
+      \param[in] option The translated option name.
+      \returns the translated name of the option given.
+    */
+    static QString translatedOptionName(const CSwordModuleInfo::FilterTypes option);
+
+    /**
+      \brief Reloads all Sword modules.
+      \param[in] reason The reason for the reload.
+    */
+    void reloadModules(const SetupChangedReason reason);
+
+    /**
+      \brief Takes off the given modules from the list and returns them.
+      \param[in] names The names of the modules to take.
+      \note User must take care of the deletion of the returned CSwordModuleInfo
+            pointers.
+    */
+    QList<CSwordModuleInfo *> takeModulesFromList(const QStringList & names);
+
+    /**
+      \param[in] names The names of the modules to return.
+      \returns a list of pointers to modules, created from a list of module
+               names.
+    */
+    QList<CSwordModuleInfo *> getPointerList(const QStringList & names) const;
+
+    /**
+      \param[in] names The names of the modules to return.
+      \returns a list of pointers to const modules, created from a list of
+               module names.
+    */
+    QList<const CSwordModuleInfo *> getConstPointerList(const QStringList & names) const;
+
+    /**
+      \brief Sword prefix list.
+      \returns A list of all known Sword prefix dirs
+    */
+    QStringList swordDirList() const;
+
+    /**
+      Deletes all indices of modules where hasIndex() returns false (because of
+      wrong index version etc.) and deletes all orphaned indexes (no module
+      present) if autoDeleteOrphanedIndices is true.
+    */
+    void deleteOrphanedIndices();
+
+signals:
+
+    void sigSwordSetupChanged(CSwordBackend::SetupChangedReason reason);
+
+protected: /* Methods: */
+
+    /**
+      Creates the SWModule objects using SWMgr's methods, it adds the
+      necessary filters for the module format.
+    */
+    CSwordBackend();
+
+    /** Reimplemented from sword::SWMgr. */
+    void AddRenderFilters(sword::SWModule * module,
+                          sword::ConfigEntMap & section);
+
+    /** Overrides Sword filters which appear to be buggy. */
+    void filterInit();
+
+    QStringList getSharedSwordConfigFiles() const;
+    QString getPrivateSwordConfigPath() const;
+    QString getPrivateSwordConfigFile() const;
+
+private: /* Fields: */
+
+    // Filters:
+    Filters::GbfToHtml   m_gbfFilter;
+    Filters::OsisToHtml  m_osisFilter;
+    Filters::PlainToHtml m_plainFilter;
+    Filters::TeiToHtml   m_teiFilter;
+    Filters::ThmlToHtml  m_thmlFilter;
+
+    // Displays:
+    Rendering::CChapterDisplay m_chapterDisplay;
+    Rendering::CEntryDisplay   m_entryDisplay;
+    Rendering::CBookDisplay    m_bookDisplay;
+
+    BtBookshelfModel m_dataModel;
+
+    static CSwordBackend * m_instance;
+
 };
 
 /**Returns The list of modules managed by this backend*/
-inline const QList<CSwordModuleInfo*> &CSwordBackend::moduleList() const {
+inline const QList<CSwordModuleInfo *> & CSwordBackend::moduleList() const {
     return m_dataModel.moduleList();
 }
 
-inline BtBookshelfModel *CSwordBackend::model() {
+inline BtBookshelfModel * CSwordBackend::model() {
     return &m_dataModel;
 }
 
 /** Returns our local config object to store the cipher keys etc. locally for each user. The values of the config are merged with the global config. */
-inline sword::SWConfig* CSwordBackend::getConfig() const {
+inline sword::SWConfig * CSwordBackend::getConfig() const {
     return config;
 }
 
diff --git a/src/backend/managers/referencemanager.cpp b/src/backend/managers/referencemanager.cpp
index 0a17645..144ad8c 100644
--- a/src/backend/managers/referencemanager.cpp
+++ b/src/backend/managers/referencemanager.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -12,8 +12,10 @@
 #include <algorithm>
 #include <QRegExp>
 #include <QDebug>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/keys/cswordversekey.h"
+#include "backend/drivers/cswordmoduleinfo.h"
+#include "backend/managers/cswordbackend.h"
 
 
 /** Returns a hyperlink used to be imbedded in the display windows. At the moment the format is sword://module/key */
@@ -250,33 +252,26 @@ const QString ReferenceManager::preferredModule( const ReferenceManager::Type ty
     switch (type) {
 
         case ReferenceManager::Bible:
-            module = CBTConfig::get(CBTConfig::standardBible);
+            module = btConfig().getDefaultSwordModuleByType( "standardBible" );
             break;
-
         case ReferenceManager::Commentary:
-            module = CBTConfig::get(CBTConfig::standardCommentary);
+            module = btConfig().getDefaultSwordModuleByType( "standardCommentary" );
             break;
-
         case ReferenceManager::Lexicon:
-            module = CBTConfig::get(CBTConfig::standardLexicon);
+            module = btConfig().getDefaultSwordModuleByType( "standardLexicon" );
             break;
-
         case ReferenceManager::StrongsHebrew:
-            module = CBTConfig::get(CBTConfig::standardHebrewStrongsLexicon);
+            module = btConfig().getDefaultSwordModuleByType( "standardHebrewStrongsLexicon" );
             break;
-
         case ReferenceManager::StrongsGreek:
-            module = CBTConfig::get(CBTConfig::standardGreekStrongsLexicon);
+            module = btConfig().getDefaultSwordModuleByType( "standardGreekStrongsLexicon" );
             break;
-
         case ReferenceManager::MorphHebrew:
-            module = CBTConfig::get(CBTConfig::standardHebrewMorphLexicon);
+            module = btConfig().getDefaultSwordModuleByType( "standardHebrewMorphLexicon" );
             break;
-
         case ReferenceManager::MorphGreek:
-            module = CBTConfig::get(CBTConfig::standardGreekMorphLexicon);
+            module = btConfig().getDefaultSwordModuleByType( "standardGreekMorphLexicon" );
             break;
-
         default:
             module = 0;
             break;
@@ -353,18 +348,18 @@ const QString ReferenceManager::parseVerseReference( const QString& ref, const R
 
 //     qDebug("Parsing '%s' in '%s' using '%s' as base, source lang '%s', dest lang '%s'", ref.latin1(), options.refDestinationModule.latin1(), baseKey.key().latin1(), sourceLanguage.latin1(), destinationLanguage.latin1());
 
-    for (QStringList::iterator it = refList.begin(); it != refList.end(); it++) {
+    for (QStringList::iterator it = refList.begin(); it != refList.end(); ++it) {
         //The listkey may contain more than one item, because a ref lik "Gen 1:3,5" is parsed into two single refs
-        sword::ListKey lk = dummy.ParseVerseList((*it).toUtf8().constData(), baseKey.key().toUtf8().constData(), true);
-        Q_ASSERT(!dummy.Error());
+        sword::ListKey lk = dummy.parseVerseList((*it).toUtf8().constData(), baseKey.key().toUtf8().constData(), true);
+        Q_ASSERT(!dummy.popError());
 
         //Q_ASSERT(lk.Count());
-        if (!lk.Count()) {
+        if (!lk.getCount()) {
             ret.append( *it ); //don't change the original
             continue;
         }
 
-        for (int i = 0; i < lk.Count(); ++i) {
+        for (int i = 0; i < lk.getCount(); ++i) {
             if (dynamic_cast<sword::VerseKey*>(lk.getElement(i))) { // a range
                 sword::VerseKey* k = dynamic_cast<sword::VerseKey*>(lk.getElement(i));
                 Q_ASSERT(k);
diff --git a/src/backend/managers/referencemanager.h b/src/backend/managers/referencemanager.h
index a07b480..80d00d6 100644
--- a/src/backend/managers/referencemanager.h
+++ b/src/backend/managers/referencemanager.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/rendering/cbookdisplay.cpp b/src/backend/rendering/cbookdisplay.cpp
index 6589e99..e139c6f 100644
--- a/src/backend/rendering/cbookdisplay.cpp
+++ b/src/backend/rendering/cbookdisplay.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/rendering/cbookdisplay.h b/src/backend/rendering/cbookdisplay.h
index 4bd5c22..6ed1bba 100644
--- a/src/backend/rendering/cbookdisplay.h
+++ b/src/backend/rendering/cbookdisplay.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/rendering/cchapterdisplay.cpp b/src/backend/rendering/cchapterdisplay.cpp
index eea2a72..e4fd1a1 100644
--- a/src/backend/rendering/cchapterdisplay.cpp
+++ b/src/backend/rendering/cchapterdisplay.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -42,13 +42,13 @@ const QString Rendering::CChapterDisplay::text(
     Q_ASSERT((module->type() == CSwordModuleInfo::Bible));
 
     if (module->type() == CSwordModuleInfo::Bible) {
-        ((sword::VerseKey*)(module->module()->getKey()))->Headings(1); //HACK: enable headings for VerseKeys
+        ((sword::VerseKey*)(module->module()->getKey()))->setIntros(true); //HACK: enable headings for VerseKeys
 
         Q_ASSERT(dynamic_cast<const CSBMI*>(module) != 0);
         const CSBMI *bible = static_cast<const CSBMI*>(module);
 
         CSwordVerseKey k1(module);
-        k1.Headings(1);
+        k1.setIntros(true);
         k1.setKey(keyName);
 
         if (k1.getChapter() == 1)
diff --git a/src/backend/rendering/cchapterdisplay.h b/src/backend/rendering/cchapterdisplay.h
index c245c57..b19f103 100644
--- a/src/backend/rendering/cchapterdisplay.h
+++ b/src/backend/rendering/cchapterdisplay.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/rendering/cdisplayrendering.cpp b/src/backend/rendering/cdisplayrendering.cpp
index bd5aa87..cbcc046 100644
--- a/src/backend/rendering/cdisplayrendering.cpp
+++ b/src/backend/rendering/cdisplayrendering.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -15,6 +15,7 @@
 #include "backend/keys/cswordversekey.h"
 #include "backend/managers/cdisplaytemplatemgr.h"
 #include "backend/managers/referencemanager.h"
+#include "backend/config/btconfig.h"
 
 
 namespace Rendering {
@@ -33,7 +34,7 @@ QString CDisplayRendering::entryLink(const KeyTreeItem &item,
 
     const bool isBible = module && (module->type() == CSwordModuleInfo::Bible);
     CSwordVerseKey vk(module); //only valid for bible modules, i.e. isBible == true
-    vk.Headings(true);
+    vk.setIntros(true);
 
     if (isBible) {
         vk.setKey(item.key());
diff --git a/src/backend/rendering/cdisplayrendering.h b/src/backend/rendering/cdisplayrendering.h
index 362fc2a..da87b79 100644
--- a/src/backend/rendering/cdisplayrendering.h
+++ b/src/backend/rendering/cdisplayrendering.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -11,6 +13,7 @@
 #define RENDERINGCDISPLAYRENDERING_H
 
 #include "backend/rendering/chtmlexportrendering.h"
+#include "backend/config/btconfig.h"
 
 
 namespace Rendering {
@@ -27,8 +30,8 @@ class CDisplayRendering : public CHTMLExportRendering {
         static QString keyToHTMLAnchor(const QString &key);
 
         CDisplayRendering(
-            const DisplayOptions &displayOptions = CBTConfig::getDisplayOptionDefaults(),
-            const FilterOptions &filterOptions = CBTConfig::getFilterOptionDefaults());
+            const DisplayOptions &displayOptions = btConfig().getDisplayOptions(),
+            const FilterOptions &filterOptions = btConfig().getFilterOptions());
 
     protected: /* Methods: */
 
diff --git a/src/backend/rendering/centrydisplay.cpp b/src/backend/rendering/centrydisplay.cpp
index 7415eda..3dbe63f 100644
--- a/src/backend/rendering/centrydisplay.cpp
+++ b/src/backend/rendering/centrydisplay.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -12,7 +12,6 @@
 #include <QApplication>
 #include <QRegExp>
 
-#include "backend/config/cbtconfig.h"
 #include "backend/drivers/cswordbookmoduleinfo.h"
 #include "backend/keys/cswordkey.h"
 #include "backend/keys/cswordversekey.h"
@@ -40,10 +39,10 @@ const QString CEntryDisplay::text(
 
     //in Bibles and Commentaries we need to check if 0:0 and X:0 contain something
     if (module->type() == CSwordModuleInfo::Bible || module->type() == CSwordModuleInfo::Commentary) {
-        ((sword::VerseKey*)(module->module()->getKey()))->Headings(1); //HACK: enable headings for VerseKeys
+        ((sword::VerseKey*)(module->module()->getKey()))->setIntros(true); //HACK: enable headings for VerseKeys
 
         CSwordVerseKey k1(module);
-        k1.Headings(1);
+        k1.setIntros(true);
         k1.setKey(keyName);
 
         // don't print the key
diff --git a/src/backend/rendering/centrydisplay.h b/src/backend/rendering/centrydisplay.h
index 50b6447..8773eb7 100644
--- a/src/backend/rendering/centrydisplay.h
+++ b/src/backend/rendering/centrydisplay.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -14,7 +16,7 @@
 
 // Sword includes:
 #include <swdisp.h>
-
+#include <swmodule.h>
 
 class CSwordModuleInfo;
 struct DisplayOptions;
@@ -35,6 +37,8 @@ class CEntryDisplay: public sword::SWDisplay {
                                    const DisplayOptions &displayOptions,
                                    const FilterOptions &filterOptions);
 
+        virtual char display(sword::SWModule& mod) { (void)mod; return 'c';}
+
 }; /* class CEntryDisplay */
 
 } /* namespace Rendering */
diff --git a/src/backend/rendering/chtmlexportrendering.cpp b/src/backend/rendering/chtmlexportrendering.cpp
index 0e19897..7c467b1 100644
--- a/src/backend/rendering/chtmlexportrendering.cpp
+++ b/src/backend/rendering/chtmlexportrendering.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -65,7 +65,7 @@ QString CHTMLExportRendering::renderEntry(const KeyTreeItem& i, CSwordKey* k) {
         ret.append(i.getAlternativeContent());
 
         //   Q_ASSERT(i.hasChildItems());
- 
+
         if (!i.childList()->isEmpty()) {
             const KeyTree & tree = *i.childList();
 
@@ -97,7 +97,7 @@ QString CHTMLExportRendering::renderEntry(const KeyTreeItem& i, CSwordKey* k) {
     CSwordVerseKey* myVK = dynamic_cast<CSwordVerseKey*>(key);
 
     if (myVK) {
-        myVK->Headings(1);
+        myVK->setIntros(true);
     }
 
     QString renderedText( (modules.count() > 1) ? "\n\t\t<tr>\n" : "\n" );
@@ -128,9 +128,9 @@ QString CHTMLExportRendering::renderEntry(const KeyTreeItem& i, CSwordKey* k) {
         }
         else {
             langAttr = QString("xml:lang=\"")
-                       .append((*mod_Itr)->module()->Lang())
+                       .append((*mod_Itr)->module()->getLanguage())
                        .append("\" lang=\"")
-                       .append((*mod_Itr)->module()->Lang())
+                       .append((*mod_Itr)->module()->getLanguage())
                        .append("\"");
         }
 
@@ -139,7 +139,7 @@ QString CHTMLExportRendering::renderEntry(const KeyTreeItem& i, CSwordKey* k) {
         if (m_filterOptions.headings) {
 
             // only process EntryAttributes, do not render, this might destroy the EntryAttributes again
-            (*mod_Itr)->module()->RenderText(0, -1, 0);
+            (*mod_Itr)->module()->renderText(0, -1, 0);
 
             sword::AttributeValue::const_iterator it =
                 (*mod_Itr)->module()->getEntryAttributes()["Heading"]["Preverse"].begin();
@@ -150,12 +150,16 @@ QString CHTMLExportRendering::renderEntry(const KeyTreeItem& i, CSwordKey* k) {
                 QString unfiltered = QString::fromUtf8(it->second.c_str());
 
                 /// \todo This is only a preliminary workaround to strip the tags:
-                QRegExp filter("<title>(.*)</title>");
-                if (unfiltered.indexOf(filter) >= 0) {
-                    preverseHeading = filter.cap(1);
-                } else {
-                    preverseHeading = unfiltered;
+                QRegExp filter("(.*)<title[^>]*>(.*)</title>(.*)");
+                while(filter.indexIn(unfiltered) >= 0) {
+                    unfiltered = filter.cap(1) + filter.cap(2) + filter.cap(3);
+                }
+                // Fiter out offending self-closing div tags, which are bad HTML
+                QRegExp ofilter("(.*)<div[^>]*/>(.*)");
+                while(ofilter.indexIn(unfiltered) >= 0) {
+                    unfiltered = ofilter.cap(1) + ofilter.cap(2);
                 }
+                preverseHeading = unfiltered;
 
                 /// \todo Take care of the heading type!
                 if (!preverseHeading.isEmpty()) {
@@ -237,7 +241,9 @@ QString CHTMLExportRendering::finishText(const QString &text, const KeyTree &tre
         settings.langAbbrev = "unknown";
     }
 
-    return CDTM::instance()->fillTemplate(QObject::tr("Export"), text, settings);
+    return CDTM::instance()->fillTemplate(CDisplayTemplateMgr::activeTemplateName(),
+                                          text,
+                                          settings);
 }
 
 /*!
diff --git a/src/backend/rendering/chtmlexportrendering.h b/src/backend/rendering/chtmlexportrendering.h
index db90707..51041a3 100644
--- a/src/backend/rendering/chtmlexportrendering.h
+++ b/src/backend/rendering/chtmlexportrendering.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -12,7 +14,7 @@
 
 #include "backend/rendering/ctextrendering.h"
 
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/managers/cswordbackend.h"
 #include "btglobal.h"
 
@@ -31,8 +33,10 @@ class CHTMLExportRendering: public CTextRendering {
 
         CHTMLExportRendering(
             bool addText,
-            const DisplayOptions &displayOptions = CBTConfig::getDisplayOptionDefaults(),
-            const FilterOptions &filterOptions = CBTConfig::getFilterOptionDefaults());
+            const DisplayOptions &displayOptions = btConfig().getDisplayOptions(),
+            const FilterOptions &filterOptions = btConfig().getFilterOptions());
+
+        ~CHTMLExportRendering() {};
 
     protected: /* Methods: */
 
diff --git a/src/backend/rendering/cplaintextexportrendering.cpp b/src/backend/rendering/cplaintextexportrendering.cpp
index 4bff025..e462e53 100644
--- a/src/backend/rendering/cplaintextexportrendering.cpp
+++ b/src/backend/rendering/cplaintextexportrendering.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/backend/rendering/cplaintextexportrendering.h b/src/backend/rendering/cplaintextexportrendering.h
index 9360474..45ad8ac 100644
--- a/src/backend/rendering/cplaintextexportrendering.h
+++ b/src/backend/rendering/cplaintextexportrendering.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -11,6 +13,7 @@
 #define RENDERINGCPLAINTEXTEXPORTRENDERING_H
 
 #include "backend/rendering/chtmlexportrendering.h"
+#include "backend/config/btconfig.h"
 
 
 namespace Rendering {
@@ -26,8 +29,8 @@ class CPlainTextExportRendering: public CHTMLExportRendering {
 
         CPlainTextExportRendering(
             bool addText,
-            const DisplayOptions &displayOptions = CBTConfig::getDisplayOptionDefaults(),
-            const FilterOptions &filterOptions = CBTConfig::getFilterOptionDefaults());
+            const DisplayOptions &displayOptions = btConfig().getDisplayOptions(),
+            const FilterOptions &filterOptions = btConfig().getFilterOptions());
 
     protected: /* Methods: */
 
diff --git a/src/backend/rendering/ctextrendering.cpp b/src/backend/rendering/ctextrendering.cpp
index 72e4e12..409a601 100644
--- a/src/backend/rendering/ctextrendering.cpp
+++ b/src/backend/rendering/ctextrendering.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -136,19 +136,19 @@ CTextRendering::KeyTreeItem::KeyTreeItem(const QString &startKey,
     else {
         sword::VerseKey vk(startKey.toUtf8().constData(), stopKey.toUtf8().constData());
 
-        if (vk.LowerBound().getBook() != vk.UpperBound().getBook()) {
+        if (vk.getLowerBound().getBook() != vk.getUpperBound().getBook()) {
             m_alternativeContent = QString::fromUtf8(vk.getRangeText());
         }
-        else if (vk.LowerBound().getChapter() != vk.UpperBound().getChapter()) {
+        else if (vk.getLowerBound().getChapter() != vk.getUpperBound().getChapter()) {
             m_alternativeContent = QString("%1 - %2:%3")
-                                   .arg(QString::fromUtf8(vk.LowerBound().getText()))
-                                   .arg(vk.UpperBound().getChapter())
-                                   .arg(vk.UpperBound().getVerse());
+                                   .arg(QString::fromUtf8(vk.getLowerBound().getText()))
+                                   .arg(vk.getUpperBound().getChapter())
+                                   .arg(vk.getUpperBound().getVerse());
         }
         else { //only verses differ (same book, same chapter)
             m_alternativeContent = QString("%1 - %2")
-                                   .arg(QString::fromUtf8(vk.LowerBound().getText()))
-                                   .arg(vk.UpperBound().getVerse());
+                                   .arg(QString::fromUtf8(vk.getLowerBound().getText()))
+                                   .arg(vk.getUpperBound().getVerse());
         }
     }
 
@@ -231,8 +231,8 @@ const QString CTextRendering::renderKeyRange(
         CSwordVerseKey* vk_stop = dynamic_cast<CSwordVerseKey*>(upperBound.data());
         Q_ASSERT(vk_stop);
 
-        bool ok = true;
-        while (ok && ((*vk_start < *vk_stop) || (*vk_start == *vk_stop))) {
+        while ((*vk_start < *vk_stop) || (*vk_start == *vk_stop)) {
+
             //make sure the key given by highlightKey gets marked as current key
             settings.highlight = (!highlightKey.isEmpty() ? (vk_start->key() == highlightKey) : false);
 
@@ -249,7 +249,10 @@ const QString CTextRendering::renderKeyRange(
                 vk_start->setVerse(0);
             }
             tree.append( new KeyTreeItem(vk_start->key(), modules, settings) );
-            ok = vk_start->next(CSwordVerseKey::UseVerse);
+            if (!vk_start->next(CSwordVerseKey::UseVerse)) {
+                /// \todo Notify the user about this failure.
+                break;
+            }
         }
         return renderKeyTree(tree);
     }
diff --git a/src/backend/rendering/ctextrendering.h b/src/backend/rendering/ctextrendering.h
index 9d467cc..c62a877 100644
--- a/src/backend/rendering/ctextrendering.h
+++ b/src/backend/rendering/ctextrendering.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -134,7 +136,7 @@ class CTextRendering {
 
     public: /* Methods: */
 
-        virtual inline ~CTextRendering() {}
+        virtual ~CTextRendering() {};
 
         const QString renderKeyTree(const KeyTree &tree);
 
diff --git a/src/bibletime.cpp b/src/bibletime.cpp
index 72cb4cd..95461e5 100644
--- a/src/bibletime.cpp
+++ b/src/bibletime.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,10 +16,9 @@
 #include <QDebug>
 #include <QInputDialog>
 #include <QMdiSubWindow>
-#include <QMessageBox>
 #include <QSplashScreen>
 #include <QSplitter>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/drivers/cswordbiblemoduleinfo.h"
 #include "backend/drivers/cswordbookmoduleinfo.h"
 #include "backend/drivers/cswordcommentarymoduleinfo.h"
@@ -27,21 +26,22 @@
 #include "backend/drivers/cswordmoduleinfo.h"
 #include "backend/keys/cswordldkey.h"
 #include "backend/keys/cswordversekey.h"
+#include "bibletimeapp.h"
 #include "frontend/btaboutmoduledialog.h"
 #include "frontend/cmdiarea.h"
+#include "frontend/display/btfindwidget.h"
 #include "frontend/displaywindow/btactioncollection.h"
 #include "frontend/displaywindow/cdisplaywindow.h"
 #include "frontend/displaywindow/cdisplaywindowfactory.h"
 #include "frontend/displaywindow/creadwindow.h"
-#include "frontend/displaywindow/cwritewindow.h"
 #include "frontend/keychooser/ckeychooser.h"
+#include "frontend/messagedialog.h"
 #include "frontend/searchdialog/csearchdialog.h"
 #include "util/cresmgr.h"
 #include "util/directory.h"
+#include "util/geticon.h"
 
 
-using namespace Profile;
-
 BibleTime *BibleTime::m_instance = 0;
 
 BibleTime::BibleTime(QWidget *parent, Qt::WindowFlags flags)
@@ -55,14 +55,15 @@ BibleTime::BibleTime(QWidget *parent, Qt::WindowFlags flags)
     QSplashScreen *splash = 0;
     QString splashHtml;
 
-    if (CBTConfig::get(CBTConfig::logo)) {
+    if (btConfig().value<bool>("GUI/showSplashScreen", true)) {
         splashHtml = "<div style='background:transparent;color:white;font-weight:bold'>%1"
                      "</div>";
 
+        static const char splash1[] = "startuplogo.png";
+        static const char splash2[] = "startuplogo_christmas.png";
+        static const char splash3[] = "startuplogo_easter.jpg";
         static const char * const splashes[3] = {
-            "startuplogo.png",
-            "startuplogo_christmas.png",
-            "startuplogo_easter.jpg"
+            splash1, splash2, splash3
         };
         QString splashImage = DU::getPicsDir().canonicalPath().append("/")
                                               .append(splashes[rand() % 3]);
@@ -98,7 +99,7 @@ BibleTime::BibleTime(QWidget *parent, Qt::WindowFlags flags)
     initConnections();
 
     setWindowTitle("BibleTime " BT_VERSION);
-    setWindowIcon(DU::getIcon(CResMgr::mainWindow::icon));
+    setWindowIcon(util::getIcon(CResMgr::mainWindow::icon));
     retranslateUi();
 }
 
@@ -108,10 +109,7 @@ BibleTime::~BibleTime() {
 #ifdef BT_DEBUG
     deleteDebugWindow();
 #endif
-    CProfile* p = m_profileMgr.startupProfile();
-    if (p) {
-        saveProfile(p);
-    }
+    saveProfile();
 }
 
 /** Creates a new presenter in the MDI area according to the type of the module. */
@@ -144,7 +142,7 @@ CDisplayWindow* BibleTime::createReadDisplayWindow(CSwordModuleInfo* module, con
     return createReadDisplayWindow(list, key);
 }
 
-CDisplayWindow* BibleTime::createWriteDisplayWindow(CSwordModuleInfo* module, const QString& key, const CWriteWindow::WriteWindowType& type) {
+CDisplayWindow * BibleTime::createWriteDisplayWindow(CSwordModuleInfo * module, const QString & key, CPlainWriteWindow::WriteWindowType type) {
     qApp->setOverrideCursor( QCursor(Qt::WaitCursor) );
 
     QList<CSwordModuleInfo*> modules;
@@ -169,14 +167,14 @@ CDisplayWindow* BibleTime::moduleEditPlain(CSwordModuleInfo *module) {
     /// \todo Refactor this.
     return createWriteDisplayWindow(module,
                                     QString::null,
-                                    CWriteWindow::PlainTextWindow);
+                                    CPlainWriteWindow::PlainTextWindow);
 }
 
 CDisplayWindow* BibleTime::moduleEditHtml(CSwordModuleInfo *module) {
     /// \todo Refactor this.
     return createWriteDisplayWindow(module,
                                     QString::null,
-                                    CWriteWindow::HTMLWindow);
+                                    CPlainWriteWindow::HTMLWindow);
 }
 
 
@@ -213,7 +211,7 @@ bool BibleTime::moduleUnlock(CSwordModuleInfo *module, QWidget *parent) {
         }
 
         if (!module->isLocked()) break;
-        QMessageBox::warning(parent, tr("Warning: Invalid unlock key!"),
+        message::showWarning(parent, tr("Warning: Invalid unlock key!"),
                              tr("The unlock key you provided did not properly unlock this "
                                 "module. Please try again."));
     }
@@ -242,7 +240,7 @@ void BibleTime::refreshDisplayWindows() const {
 
 /** Refresh main window accelerators */
 void BibleTime::refreshBibleTimeAccel() {
-    CBTConfig::setupAccelSettings(CBTConfig::application, m_actionCollection);
+    m_actionCollection->readShortcuts("Application shortcuts");
 }
 
 void BibleTime::closeEvent(QCloseEvent *event) {
@@ -263,29 +261,26 @@ void BibleTime::closeEvent(QCloseEvent *event) {
 }
 
 void BibleTime::processCommandline(bool ignoreSession, const QString &bibleKey) {
-    if (CBTConfig::get(CBTConfig::crashedTwoTimes)) {
+    if (btConfig().value<bool>("state/crashedTwoTimes", false)) {
         return;
     }
 
     // Restore workspace if not not ignoring session data:
-    if (!ignoreSession) {
-        CProfile * p = m_profileMgr.startupProfile();
-        if (p)
-            loadProfile(p);
-    }
+    if (!ignoreSession)
+        reloadProfile();
 
-    if (CBTConfig::get(CBTConfig::crashedLastTime)) {
+    if (btConfig().value<bool>("state/crashedLastTime", false)) {
         return;
     }
 
     if (!bibleKey.isNull()) {
-        CSwordModuleInfo* bible = CBTConfig::get(CBTConfig::standardBible);
+        CSwordModuleInfo* bible = btConfig().getDefaultSwordModuleByType("standardBible");
         if (bibleKey == "random") {
             CSwordVerseKey vk(0);
             const int maxIndex = 31100;
             int newIndex = rand() % maxIndex;
             vk.setPosition(sword::TOP);
-            vk.Index(newIndex);
+            vk.setIndex(newIndex);
             createReadDisplayWindow(bible, vk.key());
         } else {
             createReadDisplayWindow(bible, bibleKey);
@@ -297,6 +292,14 @@ void BibleTime::processCommandline(bool ignoreSession, const QString &bibleKey)
         */
         m_mdi->myTileVertical();
     }
+
+    if (btConfig().value<bool>("state/crashedLastTime", false)) {
+        btConfig().setValue("state/crashedTwoTimes", true);
+    }
+    else {
+        btConfig().setValue("state/crashedLastTime", true);
+    }
+    btConfig().sync();
 }
 
 bool BibleTime::event(QEvent* event) {
@@ -304,3 +307,19 @@ bool BibleTime::event(QEvent* event) {
         Search::CSearchDialog::closeDialog();
     return QMainWindow::event(event);
 }
+
+const CSwordModuleInfo* BibleTime::getCurrentModule() {
+    QMdiSubWindow* activeSubWindow = m_mdi->activeSubWindow();
+    if (!activeSubWindow)
+        return 0;
+    CDisplayWindow* w = dynamic_cast<CDisplayWindow*>(activeSubWindow->widget());
+    if (!w)
+        return 0;
+    return w->modules().first();
+}
+
+void BibleTime::openFindWidget()
+{
+    m_findWidget->setVisible(true);
+    m_findWidget->showAndSelect();
+}
diff --git a/src/bibletime.h b/src/bibletime.h
index 22faac2..5712515 100644
--- a/src/bibletime.h
+++ b/src/bibletime.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -14,8 +16,7 @@
 
 #include <QList>
 #include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/displaywindow/cwritewindow.h"
-#include "frontend/profile/cprofilemgr.h"
+#include "frontend/displaywindow/cplainwritewindow.h"
 #include <QSignalMapper>
 #ifdef BT_DEBUG
 #include <QMutex>
@@ -27,6 +28,7 @@ class CInfoDisplay;
 }
 class BtActionClass;
 class BtBookshelfDockWidget;
+class BtFindWidget;
 class BtOpenWorkAction;
 class CBookmarkIndex;
 class CDisplayWindow;
@@ -34,7 +36,9 @@ class CMDIArea;
 class CSwordModuleInfo;
 class QAction;
 class QLabel;
+class QMdiSubWindow;
 class QMenu;
+class QActionGroup;
 class QToolBar;
 class QSplitter;
 class QSignalMapper;
@@ -136,14 +140,6 @@ class BibleTime : public QMainWindow {
         static inline BibleTime *instance() { return m_instance; }
 
         /**
-        * Apply the settings given by the profile p
-        */
-        void applyProfileSettings( Profile::CProfile* p );
-        /**
-        * Stores the settings of the mainwindow in the profile p
-        */
-        void storeProfileSettings( Profile::CProfile* p );
-        /**
         *  Save the configuration dialog settings, don't open dialog
         */
         void saveConfigSettings();
@@ -194,7 +190,17 @@ class BibleTime : public QMainWindow {
         */
         static bool moduleUnlock(CSwordModuleInfo *module, QWidget *parent = 0);
 
-    public slots:
+        /**
+          Get a pointer to the module associated with the current window
+        */
+        const CSwordModuleInfo* getCurrentModule();
+
+        /**
+          Open the BtFindWidget below the mdi area
+        */
+        void openFindWidget();
+
+public slots:
         /**
         * Opens the optionsdialog of BibleTime.
         */
@@ -240,6 +246,10 @@ class BibleTime : public QMainWindow {
         */
         void createMenuAndToolBar();
         /**
+          Creates mdi and and BtFindWidget
+        */
+        void createCentralWidget();
+        /**
         * Initializes the sword.conf in the $HOME\Sword directory
         */
         void initSwordConfigFile();
@@ -300,7 +310,7 @@ class BibleTime : public QMainWindow {
          */
         CDisplayWindow* createReadDisplayWindow(QList<CSwordModuleInfo*> modules, const QString& key);
         CDisplayWindow* createReadDisplayWindow(CSwordModuleInfo* module, const QString& key = QString::null);
-        CDisplayWindow* createWriteDisplayWindow(CSwordModuleInfo* module, const QString& key, const CWriteWindow::WriteWindowType& type);
+        CDisplayWindow* createWriteDisplayWindow(CSwordModuleInfo * module, const QString & key, CPlainWriteWindow::WriteWindowType type);
         CDisplayWindow* moduleEditPlain(CSwordModuleInfo *module);
         CDisplayWindow* moduleEditHtml(CSwordModuleInfo *module);
         void searchInModule(CSwordModuleInfo *module);
@@ -316,35 +326,13 @@ class BibleTime : public QMainWindow {
          * Is called when the open windows menu is about to show ;-)
          */
         void slotOpenWindowsMenuAboutToShow();
-        /**
-         * This slot is connected with the windowAutoTileVerticalAction object
-         */
-        void slotAutoTileVertical();
-        /**
-         * This slot is connected with the windowAutoTileHorizontalAction object
-         */
-        void slotAutoTileHorizontal();
-        /**
-         * This slot is connected with the windowAutoTileAction object
-         */
-        void slotAutoTile();
-        /**
-         * This slot is connected with the windowAutoTabbedAction object
-         */
-        void slotAutoTabbed();
-        /**
-         * This slot is connected with the windowAutoCascadeAction object
-         */
-        void slotAutoCascade();
-        void slotUpdateWindowArrangementActions( QAction* );
+        void slotUpdateWindowArrangementActions(QAction * trigerredAction);
 
         void slotCascade();
         void slotTile();
         void slotTileVertical();
         void slotTileHorizontal();
 
-        void slotManualArrangementMode();
-
         /**
          * Shows/hides the main toolbar
          */
@@ -367,13 +355,13 @@ class BibleTime : public QMainWindow {
          */
         void slotSetActiveSubWindow(QWidget* window);
         /**
-        * Saves to the profile with the menu id ID
-        */
-        void saveProfile(QAction* action);
+         * The active window was changed
+         */
+        void slotActiveWindowChanged(QMdiSubWindow* window);
         /**
-        * Saves the current settings into the currently activatred profile.
+        * Saves the current settings into the currently activated profile.
         */
-        void saveProfile(Profile::CProfile* p);
+        void saveProfile();
         /**
         * Deletes the chosen session from the menu and from disk.
         */
@@ -381,11 +369,15 @@ class BibleTime : public QMainWindow {
         /**
         * Loads the profile with the menu id ID
         */
-        void loadProfile(QAction* action);
+        void loadProfile(QAction * action);
+        /**
+        * Loads the profile with the given key
+        */
+        void loadProfile(const QString & profileKey);
         /**
-        * Loads the profile with the menu ID id
+        * Reloads the current profile
         */
-        void loadProfile(Profile::CProfile* p);
+        void reloadProfile();
         /**
         * Toggles between normal and fullscreen mode.
         */
@@ -474,6 +466,7 @@ class BibleTime : public QMainWindow {
         QAction *m_windowTileVerticalAction;
         QAction *m_windowManualModeAction;
         QMenu *m_windowArrangementMenu;
+        QActionGroup *m_windowArrangementActionGroup;
         QAction *m_windowAutoCascadeAction;
         QAction *m_windowAutoTileAction;
         QAction *m_windowAutoTabbedAction;
@@ -481,6 +474,10 @@ class BibleTime : public QMainWindow {
         QAction *m_windowAutoTileHorizontalAction;
         QAction *m_windowCloseAction;
         QAction *m_windowCloseAllAction;
+        QAction* m_windowSaveToNewProfileAction;
+        QMenu* m_windowLoadProfileMenu;
+        QActionGroup* m_windowLoadProfileActionGroup;
+        QMenu* m_windowDeleteProfileMenu;
 
         // Settings menu:
         QMenu *m_settingsMenu;
@@ -496,10 +493,7 @@ class BibleTime : public QMainWindow {
 
         BtActionCollection* m_actionCollection;
 
-        QMenu* m_windowSaveProfileMenu;
-        QAction* m_windowSaveToNewProfileAction;
-        QMenu* m_windowLoadProfileMenu;
-        QMenu* m_windowDeleteProfileMenu;
+
         QAction* m_windowFullscreenAction;
 
         /**
@@ -510,8 +504,7 @@ class BibleTime : public QMainWindow {
         // QList<QAction*> m_windowOpenWindowsList;
 
         CMDIArea* m_mdi;
-
-        Profile::CProfileMgr m_profileMgr;
+        BtFindWidget* m_findWidget;
 
 
     protected: //DBUS interface implementation
@@ -532,7 +525,12 @@ class BibleTime : public QMainWindow {
         void syncAllModulesByType(const CSwordModuleInfo::ModuleType type, const QString& key);
 
     private:
+        /**
+         * Set the visibility of all tool bars according to the configuration
+         * taking the toolbarsInEachWindow setting into account.
+         */
         void showOrHideToolBars();
+
 #ifdef BT_DEBUG
         void deleteDebugWindow();
     private slots:
diff --git a/src/bibletime_dbus.cpp b/src/bibletime_dbus.cpp
index 9b983c1..6beb7fd 100644
--- a/src/bibletime_dbus.cpp
+++ b/src/bibletime_dbus.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -32,7 +32,6 @@ void BibleTime::syncAllModulesByType(const CSwordModuleInfo::ModuleType type, co
 void BibleTime::closeAllModuleWindows() {
     m_mdi->closeAllSubWindows();
 }
-
 QStringList BibleTime::searchInModule(const QString& moduleName, const QString& searchText) {
     QStringList ret;
     CSwordModuleInfo* mod = CSwordBackend::instance()->findModuleByName(moduleName);
@@ -46,7 +45,7 @@ QStringList BibleTime::searchInModule(const QString& moduleName, const QString&
 
         const QString lead = QString("[%1] ").arg(moduleName);
 
-        for ( int i = 0; i < result.Count(); ++i ) {
+        for (int i = 0; i < result.getCount(); i++) {
             sword::SWKey* key = result.getElement(i);
             Q_ASSERT(key);
 
diff --git a/src/bibletime_dbus_adaptor.cpp b/src/bibletime_dbus_adaptor.cpp
index 6912ff1..b393a11 100644
--- a/src/bibletime_dbus_adaptor.cpp
+++ b/src/bibletime_dbus_adaptor.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -12,7 +12,7 @@
 #include "bibletime_dbus_adaptor.h"
 
 #include <QDebug>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 
 BibleTimeDBusAdaptor::BibleTimeDBusAdaptor(BibleTime *pBibleTime)
     : QDBusAbstractAdaptor(pBibleTime)
@@ -50,7 +50,7 @@ void BibleTimeDBusAdaptor::openWindow(const QString &moduleName, const QString &
 
 void BibleTimeDBusAdaptor::openDefaultBible(const QString &key) {
     qDebug() << "DBUS: open default bible ...";
-    CSwordModuleInfo *module = CBTConfig::get(CBTConfig::standardBible);
+    CSwordModuleInfo *module = btConfig().getDefaultSwordModuleByType("standardBible");
     if (module)
         m_bibletime->createReadDisplayWindow(module, key);
 }
@@ -77,7 +77,7 @@ QStringList BibleTimeDBusAdaptor::searchInOpenModules(const QString &searchText)
 
 QStringList BibleTimeDBusAdaptor::searchInDefaultBible(const QString &searchText) {
     qDebug() << "DBUS: search in default bible ...";
-    CSwordModuleInfo *bible = CBTConfig::get(CBTConfig::standardBible);
+    CSwordModuleInfo *bible = btConfig().getDefaultSwordModuleByType("standardBible");
     return m_bibletime->searchInModule(bible->name(), searchText);
 }
 
diff --git a/src/bibletime_dbus_adaptor.h b/src/bibletime_dbus_adaptor.h
index 65c5c7b..cf7200c 100644
--- a/src/bibletime_dbus_adaptor.h
+++ b/src/bibletime_dbus_adaptor.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/bibletime_init.cpp b/src/bibletime_init.cpp
index df8fdea..7a3c5b7 100644
--- a/src/bibletime_init.cpp
+++ b/src/bibletime_init.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -20,20 +20,24 @@
 #include <QToolBar>
 #include <QToolButton>
 #include <QVBoxLayout>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/managers/btstringmgr.h"
 #include "backend/managers/clanguagemgr.h"
 #include "backend/managers/cswordbackend.h"
+#include "bibletimeapp.h"
 #include "frontend/btbookshelfdockwidget.h"
 #include "frontend/btopenworkaction.h"
 #include "frontend/cinfodisplay.h"
 #include "frontend/cmdiarea.h"
 #include "frontend/cprinter.h"
+#include "frontend/display/btfindwidget.h"
 #include "frontend/displaywindow/btactioncollection.h"
 #include "frontend/displaywindow/btmodulechooserbar.h"
 #include "frontend/bookmarks/cbookmarkindex.h"
+#include "frontend/settingsdialogs/btlanguagesettings.h"
 #include "util/cresmgr.h"
 #include "util/directory.h"
+#include "util/geticon.h"
 
 // Sword includes:
 #include <swlog.h>
@@ -47,7 +51,6 @@
 
 
 using namespace InfoDisplay;
-using namespace Profile;
 
 /**Initializes the view of this widget*/
 void BibleTime::initView() {
@@ -55,8 +58,7 @@ void BibleTime::initView() {
     // Create menu and toolbar before the mdi area
     createMenuAndToolBar();
 
-    m_mdi = new CMDIArea(this);
-    setCentralWidget(m_mdi);
+    createCentralWidget();
 
     m_bookshelfDock = new BtBookshelfDockWidget(this);
     addDockWidget(Qt::LeftDockWidgetArea, m_bookshelfDock);
@@ -85,11 +87,9 @@ void BibleTime::initView() {
 QAction* BibleTime::initAction(QAction* action, QString text, QString icon,
                                QKeySequence accel, const QString& tooltip,
                                const QString& actionName, const char* slot) {
-    namespace DU = util::directory;
-
     action->setText(text);
     if ( ! icon.isEmpty() )
-        action->setIcon(DU::getIcon(icon));
+        action->setIcon(util::getIcon(icon));
     action->setShortcut(accel);
     if (tooltip != QString::null) action->setToolTip(tooltip);
     m_actionCollection->addAction(actionName, action);
@@ -100,18 +100,16 @@ QAction* BibleTime::initAction(QAction* action, QString text, QString icon,
 // Creates QAction's for all actions that can have keyboard shortcuts
 // Used in creating the main window and by the configuration dialog for setting shortcuts
 void BibleTime::insertKeyboardActions( BtActionCollection* const a ) {
-    namespace DU = util::directory;
-
     QAction* action = new QAction(a);
     action->setText(tr("&Quit"));
-    action->setIcon(DU::getIcon("exit.svg"));
+    action->setIcon(util::getIcon("exit.svg"));
     action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
     action->setToolTip(tr("Quit BibleTime"));
     a->addAction("quit", action);
 
     action = new QAction(a);
     action->setText(tr("&Fullscreen mode"));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::window::showFullscreen::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::window::showFullscreen::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::window::showFullscreen::accel));
     action->setToolTip(tr("Toggle fullscreen mode of the main window"));
     a->addAction("toggleFullscreen", action);
@@ -123,132 +121,132 @@ void BibleTime::insertKeyboardActions( BtActionCollection* const a ) {
 
     action = new QAction(a);
     action->setText(tr("Search in &open works..."));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::mainIndex::search::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::mainIndex::search::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::mainIndex::search::accel));
     action->setToolTip(tr("Search in all works that are currently open"));
     a->addAction("searchOpenWorks", action);
 
     action = new QAction(a);
     action->setText(tr("Search in standard &Bible..."));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::mainIndex::searchdefaultbible::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::mainIndex::searchdefaultbible::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::mainIndex::searchdefaultbible::accel));
     action->setToolTip(tr("Search in the standard Bible"));
     a->addAction("searchStdBible", action);
 
     action = new QAction(a);
     action->setText(tr("Save as &new session..."));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::window::saveToNewProfile::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::window::saveToNewProfile::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::window::saveToNewProfile::accel));
     action->setToolTip(tr("Create and save a new session"));
     a->addAction("saveNewSession", action);
 
     action = new QAction(a);
     action->setText(tr("&Manual mode"));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::window::arrangementMode::manual::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::window::arrangementMode::manual::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::window::arrangementMode::manual::accel));
     action->setToolTip(tr("Manually arrange the open windows"));
     a->addAction("manualArrangement", action);
 
     action = new QAction(a);
     action->setText(tr("Auto-tile &vertically"));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::window::arrangementMode::autoTileVertical::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::window::arrangementMode::autoTileVertical::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::window::arrangementMode::autoTileVertical::accel));
     action->setToolTip(tr("Automatically tile the open windows vertically (arrange side by side)"));
     a->addAction("autoVertical", action);
 
     action = new QAction(a);
     action->setText(tr("Auto-tile &horizontally"));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::accel));
     action->setToolTip(tr("Automatically tile the open windows horizontally (arrange on top of each other)"));
     a->addAction("autoHorizontal", action);
 
     action = new QAction(a);
     action->setText(tr("Auto-&tile"));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::window::arrangementMode::autoTile::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::window::arrangementMode::autoTile::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::window::arrangementMode::autoTile::accel));
     action->setToolTip(tr("Automatically tile the open windows"));
     a->addAction("autoTile", action);
 
     action = new QAction(a);
     action->setText(tr("Ta&bbed"));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::window::arrangementMode::autoTabbed::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::window::arrangementMode::autoTabbed::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::window::arrangementMode::autoTabbed::accel));
     action->setToolTip(tr("Automatically tab the open windows"));
     a->addAction("autoTabbed", action);
 
     action = new QAction(a);
     action->setText(tr("Auto-&cascade"));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::window::arrangementMode::autoCascade::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::window::arrangementMode::autoCascade::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::window::arrangementMode::autoCascade::accel));
     action->setToolTip(tr("Automatically cascade the open windows"));
     a->addAction("autoCascade", action);
 
     action = new QAction(a);
     action->setText(tr("&Cascade"));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::window::cascade::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::window::cascade::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::window::cascade::accel));
     action->setToolTip(tr("Cascade the open windows"));
     a->addAction("cascade", action);
 
     action = new QAction(a);
     action->setText(tr("&Tile"));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::window::tile::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::window::tile::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::window::tile::accel));
     action->setToolTip(tr("Tile the open windows"));
     a->addAction("tile", action);
 
     action = new QAction(a);
     action->setText(tr("Tile &vertically"));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::window::tileVertical::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::window::tileVertical::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::window::tileVertical::accel));
     action->setToolTip(tr("Vertically tile (arrange side by side) the open windows"));
     a->addAction("tileVertically", action);
 
     action = new QAction(a);
     action->setText(tr("Tile &horizontally"));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::window::tileHorizontal::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::window::tileHorizontal::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::window::tileHorizontal::accel));
     action->setToolTip(tr("Horizontally tile (arrange on top of each other) the open windows"));
     a->addAction("tileHorizontally", action);
 
     action = new QAction(a);
     action->setText(tr("Close &window"));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::window::close::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::window::close::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::window::close::accel));
     action->setToolTip(tr("Close the current open window"));
     a->addAction("closeWindow", action);
 
     action = new QAction(a);
     action->setText(tr("Cl&ose all windows"));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::window::closeAll::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::window::closeAll::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::window::closeAll::accel));
     action->setToolTip(tr("Close all open windows inside BibleTime"));
     a->addAction("closeAllWindows", action);
 
     action = new QAction(a);
     action->setText(tr("&Configure BibleTime..."));
-    action->setIcon(DU::getIcon("configure.svg"));
+    action->setIcon(util::getIcon("configure.svg"));
     action->setToolTip(tr("Set BibleTime's preferences"));
     a->addAction("setPreferences", action);
 
     action = new QAction(a);
     action->setText(tr("Bookshelf &Manager..."));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::settings::swordSetupDialog::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::settings::swordSetupDialog::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::settings::swordSetupDialog::accel));
     action->setToolTip(tr("Configure your bookshelf and install/update/remove/index works"));
     a->addAction("bookshelfManager", action);
 
     action = new QAction(a);
     action->setText(tr("&Handbook"));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::help::handbook::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::help::handbook::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::help::handbook::accel));
     action->setToolTip(tr("Open BibleTime's handbook"));
     a->addAction("openHandbook", action);
 
     action = new QAction(a);
     action->setText(tr("&Bible Study Howto"));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::help::bibleStudyHowTo::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::help::bibleStudyHowTo::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::help::bibleStudyHowTo::accel));
     action->setToolTip(tr("Open the Bible study HowTo included with BibleTime.<br/>This HowTo is an introduction on how to study the Bible in an efficient way."));
     a->addAction("bibleStudyHowto", action);
@@ -260,7 +258,7 @@ void BibleTime::insertKeyboardActions( BtActionCollection* const a ) {
 
     action = new QAction(a);
     action->setText(tr("&Tip of the day..."));
-    action->setIcon(DU::getIcon(CResMgr::mainMenu::help::tipOfTheDay::icon));
+    action->setIcon(util::getIcon(CResMgr::mainMenu::help::tipOfTheDay::icon));
     action->setShortcut(QKeySequence(CResMgr::mainMenu::help::tipOfTheDay::accel));
     action->setToolTip(tr("Show tips about BibleTime"));
     a->addAction("tipOfTheDay", action);
@@ -321,7 +319,7 @@ void BibleTime::createMenuAndToolBar()
     addToolBar(m_mainToolBar);
 
     // Set visibility of main window toolbars based on config
-    bool visible = ! CBTConfig::get(CBTConfig::showToolbarsInEachWindow);
+    bool visible = ! btConfig().sessionValue<bool>("GUI/showToolbarsInEachWindow", true);
 
     m_navToolBar = createToolBar("NavToolBar", this, visible);
     addToolBar(m_navToolBar);
@@ -338,6 +336,36 @@ void BibleTime::createMenuAndToolBar()
     addToolBar(m_formatToolBar);
 }
 
+void BibleTime::createCentralWidget()
+{
+    m_mdi = new CMDIArea(this);
+    m_findWidget = new BtFindWidget(this);
+    m_findWidget->setVisible(false);
+
+    QVBoxLayout* layout = new QVBoxLayout();
+    layout->addWidget(m_mdi);
+    layout->addWidget(m_findWidget);
+
+    QWidget* widget = new QWidget(this);
+    widget->setLayout(layout);
+    setCentralWidget(widget);
+
+    bool ok = connect(m_findWidget, SIGNAL(findNext(const QString&,bool)),
+        m_mdi, SLOT(findNextTextInActiveWindow(const QString &, bool)));
+    Q_ASSERT(ok);
+
+    ok = connect(m_findWidget, SIGNAL(findPrevious(const QString&,bool)),
+        m_mdi, SLOT(findPreviousTextInActiveWindow(const QString &, bool)));
+    Q_ASSERT(ok);
+    ok = connect(m_findWidget, SIGNAL(highlightText(const QString&,bool)),
+        m_mdi, SLOT(highlightTextInActiveWindow(const QString &, bool)));
+    Q_ASSERT(ok);
+
+    ok = connect(m_mdi, SIGNAL(subWindowActivated(QMdiSubWindow*)),
+            this, SLOT(slotActiveWindowChanged(QMdiSubWindow*)));
+    Q_ASSERT(ok);
+}
+
 /** Initializes the action objects of the GUI */
 void BibleTime::initActions() {
     m_actionCollection = new BtActionCollection(this);
@@ -349,11 +377,13 @@ void BibleTime::initActions() {
             this,           SLOT(slotSetActiveSubWindow(QWidget*)));
 
     // File menu actions:
-    m_openWorkAction = new BtOpenWorkAction("GUI/MainWindow/OpenWorkAction/grouping", this);
+    m_openWorkAction = new BtOpenWorkAction("GUI/mainWindow/openWorkAction/grouping", this);
+    Q_ASSERT(m_openWorkAction != 0);
     connect(m_openWorkAction, SIGNAL(triggered(CSwordModuleInfo*)),
             this,             SLOT(createReadDisplayWindow(CSwordModuleInfo*)));
 
     m_quitAction = m_actionCollection->action("quit");
+    m_quitAction->setMenuRole(QAction::QuitRole);
     Q_ASSERT(m_quitAction != 0);
     connect(m_quitAction, SIGNAL(triggered()),
             this,         SLOT(quit()));
@@ -367,68 +397,68 @@ void BibleTime::initActions() {
             this,                     SLOT(toggleFullscreen()));
 
     // Special case these actions, overwrite those already in collection
-    namespace DU = util::directory;
     m_showBookshelfAction = m_bookshelfDock->toggleViewAction();
-    m_showBookshelfAction->setIcon(DU::getIcon(CResMgr::mainMenu::view::showBookshelf::icon));
+    m_showBookshelfAction->setIcon(util::getIcon(CResMgr::mainMenu::view::showBookshelf::icon));
     m_showBookshelfAction->setToolTip(tr("Toggle visibility of the bookshelf window"));
     m_actionCollection->addAction("showBookshelf", m_showBookshelfAction);
     m_showBookmarksAction = m_bookmarksDock->toggleViewAction();
-    m_showBookmarksAction->setIcon(DU::getIcon(CResMgr::mainMenu::view::showBookmarks::icon));
+    m_showBookmarksAction->setIcon(util::getIcon(CResMgr::mainMenu::view::showBookmarks::icon));
     m_showBookmarksAction->setToolTip(tr("Toggle visibility of the bookmarks window"));
     m_actionCollection->addAction("showBookmarks", m_showBookmarksAction);
     m_showMagAction = m_magDock->toggleViewAction();
-    m_showMagAction->setIcon(DU::getIcon(CResMgr::mainMenu::view::showMag::icon));
+    m_showMagAction->setIcon(util::getIcon(CResMgr::mainMenu::view::showMag::icon));
     m_showMagAction->setToolTip(tr("Toggle visibility of the mag window"));
     m_actionCollection->addAction("showMag", m_showMagAction);
 
     m_showTextAreaHeadersAction = m_actionCollection->action("showParallelTextHeaders");
     Q_ASSERT(m_showTextAreaHeadersAction != 0);
     m_showTextAreaHeadersAction->setCheckable(true);
-    m_showTextAreaHeadersAction->setChecked(CBTConfig::get(CBTConfig::showTextWindowHeaders));
+    m_showTextAreaHeadersAction->setChecked(btConfig().sessionValue<bool>("GUI/showTextWindowHeaders", true));
     connect(m_showTextAreaHeadersAction, SIGNAL(toggled(bool)),
             this,                        SLOT(slotToggleTextWindowHeader()));
 
     m_showMainWindowToolbarAction = m_actionCollection->action("showToolbar");
     Q_ASSERT(m_showMainWindowToolbarAction != 0);
     m_showMainWindowToolbarAction->setCheckable(true);
-    m_showMainWindowToolbarAction->setChecked(CBTConfig::get(CBTConfig::showMainWindowToolbar));
+    m_showMainWindowToolbarAction->setChecked(btConfig().sessionValue<bool>("GUI/showMainToolbar", true));
     connect( m_showMainWindowToolbarAction, SIGNAL(triggered()),
             this,                SLOT(slotToggleMainToolbar()));
 
     m_showTextWindowNavigationAction = m_actionCollection->action("showNavigation");
     Q_ASSERT(m_showTextWindowNavigationAction != 0);
     m_showTextWindowNavigationAction->setCheckable(true);
-    m_showTextWindowNavigationAction->setChecked(CBTConfig::get(CBTConfig::showTextWindowNavigator));
+    m_showTextWindowNavigationAction->setChecked(btConfig().sessionValue<bool>("GUI/showTextWindowNavigator", true));
     connect(m_showTextWindowNavigationAction, SIGNAL(toggled(bool)),
             this,                             SLOT(slotToggleNavigatorToolbar()));
 
     m_showTextWindowModuleChooserAction = m_actionCollection->action("showWorks");
     Q_ASSERT(m_showTextWindowModuleChooserAction != 0);
     m_showTextWindowModuleChooserAction->setCheckable(true);
-    m_showTextWindowModuleChooserAction->setChecked(CBTConfig::get(CBTConfig::showTextWindowModuleSelectorButtons));
+    m_showTextWindowModuleChooserAction->setChecked(btConfig().sessionValue<bool>("GUI/showTextWindowModuleSelectorButtons", true));
     connect(m_showTextWindowModuleChooserAction, SIGNAL(toggled(bool)),
             this,                                SLOT(slotToggleWorksToolbar()));
 
     m_showTextWindowToolButtonsAction = m_actionCollection->action("showTools");
     Q_ASSERT(m_showTextWindowToolButtonsAction != 0);
     m_showTextWindowToolButtonsAction->setCheckable(true);
-    m_showTextWindowToolButtonsAction->setChecked(CBTConfig::get(CBTConfig::showTextWindowToolButtons));
+    m_showTextWindowToolButtonsAction->setChecked(btConfig().sessionValue<bool>("GUI/showTextWindowToolButtons", true));
     connect(m_showTextWindowToolButtonsAction, SIGNAL(toggled(bool)),
             this,                              SLOT(slotToggleToolsToolbar()));
 
     m_showFormatToolbarAction = m_actionCollection->action("showFormat");
     Q_ASSERT(m_showFormatToolbarAction != 0);
     m_showFormatToolbarAction->setCheckable(true);
-    m_showFormatToolbarAction->setChecked(CBTConfig::get(CBTConfig::showFormatToolbarButtons));
+    m_showFormatToolbarAction->setChecked(btConfig().sessionValue<bool>("GUI/showFormatToolbarButtons", true));
     bool ok = connect(m_showFormatToolbarAction, SIGNAL(toggled(bool)),
                       this,                      SLOT(slotToggleFormatToolbar()));
+    Q_ASSERT(ok);
 
     m_toolbarsInEachWindow = m_actionCollection->action("showToolbarsInTextWindows");
     Q_ASSERT(m_toolbarsInEachWindow != 0);
     m_toolbarsInEachWindow->setCheckable(true);
-    m_toolbarsInEachWindow->setChecked(CBTConfig::get(CBTConfig::showToolbarsInEachWindow));
+    m_toolbarsInEachWindow->setChecked(btConfig().sessionValue<bool>("GUI/showToolbarsInEachWindow", true));
     ok = connect(m_toolbarsInEachWindow, SIGNAL(toggled(bool)),
-                      this,                   SLOT(slotToggleToolBarsInEachWindow()));
+                 this,                   SLOT(slotToggleToolBarsInEachWindow()));
     Q_ASSERT(ok);
 
     // Search menu actions:
@@ -473,81 +503,56 @@ void BibleTime::initActions() {
     connect(m_windowTileHorizontalAction, SIGNAL(triggered()),
             this,                          SLOT(slotTileHorizontal()));
 
+    alignmentMode alignment = btConfig().sessionValue<alignmentMode>("GUI/alignmentMode", autoTileVertical);
+
     m_windowManualModeAction = m_actionCollection->action("manualArrangement");
     Q_ASSERT(m_windowManualModeAction != 0);
     m_windowManualModeAction->setCheckable(true);
-    m_windowManualModeAction->setChecked(true);
-    connect(m_windowManualModeAction, SIGNAL(triggered()),
-            this,                      SLOT(slotManualArrangementMode()));
 
     m_windowAutoTabbedAction = m_actionCollection->action("autoTabbed");
     Q_ASSERT(m_windowAutoTabbedAction != 0);
     m_windowAutoTabbedAction->setCheckable(true);
-    if(CBTConfig::get(CBTConfig::autoTabbed) == true) {
-        m_windowManualModeAction->setChecked(false);
-        m_windowAutoTabbedAction->setChecked(true);
-    }
-    connect(m_windowAutoTabbedAction, SIGNAL(triggered()),
-            this,                      SLOT(slotAutoTabbed()));
 
     //: Vertical tiling means that windows are vertical, placed side by side
     m_windowAutoTileVerticalAction = m_actionCollection->action("autoVertical");
     Q_ASSERT(m_windowAutoTileVerticalAction != 0);
     m_windowAutoTileVerticalAction->setCheckable(true);
-    if(CBTConfig::get(CBTConfig::autoTileVertical) == true) {
-        m_windowManualModeAction->setChecked(false);
-        m_windowAutoTileVerticalAction->setChecked(true);
-    }
-    connect(m_windowAutoTileVerticalAction, SIGNAL(triggered()),
-            this,                            SLOT(slotAutoTileVertical()));
 
     //: Horizontal tiling means that windows are horizontal, placed on top of each other
     m_windowAutoTileHorizontalAction = m_actionCollection->action("autoHorizontal");
     Q_ASSERT(m_windowAutoTileHorizontalAction != 0);
     m_windowAutoTileHorizontalAction->setCheckable(true);
-    if(CBTConfig::get(CBTConfig::autoTileHorizontal) == true) {
-        m_windowManualModeAction->setChecked(false);
-        m_windowAutoTileHorizontalAction->setChecked(true);
-    }
-    connect(m_windowAutoTileHorizontalAction, SIGNAL(triggered()),
-            this,                              SLOT(slotAutoTileHorizontal()));
 
     m_windowAutoTileAction = m_actionCollection->action("autoTile");
     Q_ASSERT(m_windowAutoTileAction != 0);
     m_windowAutoTileAction->setCheckable(true);
-    if(CBTConfig::get(CBTConfig::autoTile) == true) {
-        m_windowManualModeAction->setChecked(false);
-        m_windowAutoTileAction->setChecked(true);
-    }
-    connect(m_windowAutoTileAction, SIGNAL(triggered()),
-            this,                    SLOT(slotAutoTile()));
 
     m_windowAutoCascadeAction = m_actionCollection->action("autoCascade");
     Q_ASSERT(m_windowAutoCascadeAction != 0);
     m_windowAutoCascadeAction->setCheckable(true);
-    if(CBTConfig::get(CBTConfig::autoCascade) == true) {
-        m_windowManualModeAction->setChecked(false);
-        m_windowAutoCascadeAction->setChecked(true);
-    }
-    connect(m_windowAutoCascadeAction, SIGNAL(triggered()),
-            this,                       SLOT(slotAutoCascade()));
 
     /*
      * All actions related to arrangement modes have to be initialized before calling a slot on them,
      * thus we call them afterwards now.
      */
-    if(m_windowAutoTabbedAction->isChecked() == true)
-        slotAutoTabbed();
-    else if(m_windowAutoTileVerticalAction->isChecked() == true)
-        slotAutoTileVertical();
-    else if(m_windowAutoTileHorizontalAction->isChecked() == true)
-        slotAutoTileHorizontal();
-    else if(m_windowAutoTileAction->isChecked() == true)
-        slotAutoTile();
-    else if(m_windowAutoCascadeAction->isChecked() == true)
-        slotAutoCascade();
-    else
-        slotManualArrangementMode();
+    QAction * alignmentAction;
+    switch (alignment) {
+        case autoTabbed:
+            alignmentAction = m_windowAutoTabbedAction; break;
+        case autoTileVertical:
+            alignmentAction = m_windowAutoTileVerticalAction; break;
+        case autoTileHorizontal:
+            alignmentAction = m_windowAutoTileHorizontalAction; break;
+        case autoTile:
+            alignmentAction = m_windowAutoTileAction; break;
+        case autoCascade:
+            alignmentAction = m_windowAutoCascadeAction; break;
+        case manual:
+        default:
+            alignmentAction = m_windowManualModeAction; break;
+    }
+    alignmentAction->setChecked(true);
+    slotUpdateWindowArrangementActions(alignmentAction);
 
     m_windowSaveToNewProfileAction = m_actionCollection->action("saveNewSession");
     Q_ASSERT(m_windowSaveToNewProfileAction != 0);
@@ -556,11 +561,13 @@ void BibleTime::initActions() {
 
     m_setPreferencesAction = m_actionCollection->action("setPreferences");
     Q_ASSERT(m_setPreferencesAction != 0);
+    m_setPreferencesAction->setMenuRole( QAction::PreferencesRole );
     connect(m_setPreferencesAction, SIGNAL(triggered()),
             this,                   SLOT(slotSettingsOptions()));
 
     m_bookshelfManagerAction = m_actionCollection->action("bookshelfManager");
     Q_ASSERT(m_bookshelfManagerAction != 0);
+    m_bookshelfManagerAction->setMenuRole( QAction::ApplicationSpecificRole );
     connect(m_bookshelfManagerAction, SIGNAL(triggered()),
             this,                     SLOT(slotSwordSetupDialog()));
 
@@ -576,6 +583,7 @@ void BibleTime::initActions() {
 
     m_aboutBibleTimeAction = m_actionCollection->action("aboutBibleTime");
     Q_ASSERT(m_aboutBibleTimeAction != 0);
+    m_aboutBibleTimeAction->setMenuRole( QAction::AboutRole );
     connect(m_aboutBibleTimeAction,  SIGNAL(triggered()),
             this,                    SLOT(slotOpenAboutDialog()) );
 
@@ -641,25 +649,32 @@ void BibleTime::initMenubar() {
     m_windowMenu->addAction(m_windowTileVerticalAction);
     m_windowMenu->addAction(m_windowTileHorizontalAction);
     m_windowArrangementMenu = new QMenu(this);
+    m_windowArrangementActionGroup = new QActionGroup(m_windowArrangementMenu);
     m_windowArrangementMenu->addAction(m_windowManualModeAction);
+    m_windowArrangementActionGroup->addAction(m_windowManualModeAction);
     m_windowArrangementMenu->addAction(m_windowAutoTabbedAction);
+    m_windowArrangementActionGroup->addAction(m_windowAutoTabbedAction);
     m_windowArrangementMenu->addAction(m_windowAutoTileVerticalAction);
+    m_windowArrangementActionGroup->addAction(m_windowAutoTileVerticalAction);
     m_windowArrangementMenu->addAction(m_windowAutoTileHorizontalAction);
+    m_windowArrangementActionGroup->addAction(m_windowAutoTileHorizontalAction);
     m_windowArrangementMenu->addAction(m_windowAutoTileAction);
+    m_windowArrangementActionGroup->addAction(m_windowAutoTileAction);
     m_windowArrangementMenu->addAction(m_windowAutoCascadeAction);
+    m_windowArrangementActionGroup->addAction(m_windowAutoCascadeAction);
+    connect(m_windowArrangementActionGroup, SIGNAL(triggered(QAction *)),
+            this,                           SLOT(slotUpdateWindowArrangementActions(QAction *)));
+
     m_windowMenu->addMenu(m_windowArrangementMenu);
     m_windowMenu->addSeparator();
-    m_windowSaveProfileMenu = new QMenu(this);
-    m_windowMenu->addMenu(m_windowSaveProfileMenu);
     m_windowMenu->addAction(m_windowSaveToNewProfileAction);
     m_windowLoadProfileMenu = new QMenu(this);
+    m_windowLoadProfileActionGroup = new QActionGroup(m_windowLoadProfileMenu);
     m_windowMenu->addMenu(m_windowLoadProfileMenu);
     m_windowDeleteProfileMenu = new QMenu(this);
     m_windowMenu->addMenu(m_windowDeleteProfileMenu);
     connect(m_windowLoadProfileMenu, SIGNAL(triggered(QAction*)),
             this,                    SLOT(loadProfile(QAction*)));
-    connect(m_windowSaveProfileMenu, SIGNAL(triggered(QAction*)),
-            this,                    SLOT(saveProfile(QAction*)));
     connect(m_windowDeleteProfileMenu, SIGNAL(triggered(QAction*)),
             this,                      SLOT(deleteProfile(QAction*)));
     refreshProfileMenus();
@@ -667,12 +682,18 @@ void BibleTime::initMenubar() {
     connect(m_windowMenu, SIGNAL(aboutToShow()),
             this,         SLOT(slotWindowMenuAboutToShow()));
 
-    // Settings menu:
+    #ifndef Q_OS_MAC
     m_settingsMenu = new QMenu(this);
     m_settingsMenu->addAction(m_setPreferencesAction);
     m_settingsMenu->addSeparator();
     m_settingsMenu->addAction(m_bookshelfManagerAction);
     menuBar()->addMenu(m_settingsMenu);
+    #else
+    // On MAC OS, the settings actions will be moved to a system menu item.
+    // Therefore the settings menu would be empty, so we do not show it.
+    m_fileMenu->addAction(m_setPreferencesAction);
+    m_fileMenu->addAction(m_bookshelfManagerAction);
+    #endif
 
     // Help menu:
     m_helpMenu = new QMenu(this);
@@ -719,16 +740,20 @@ void BibleTime::retranslateUi() {
 
     m_fileMenu->setTitle(tr("&File"));
     m_viewMenu->setTitle(tr("&View"));
-        m_toolBarsMenu->setTitle(tr("Toolbars"));
+    m_toolBarsMenu->setTitle(tr("Toolbars"));
 
     m_searchMenu->setTitle(tr("&Search"));
     m_windowMenu->setTitle(tr("&Window"));
-        m_openWindowsMenu->setTitle(tr("O&pen windows"));
-        m_windowArrangementMenu->setTitle(tr("&Arrangement mode"));
-        m_windowSaveProfileMenu->setTitle(tr("&Save session"));
-        m_windowLoadProfileMenu->setTitle(tr("&Load session"));
-        m_windowDeleteProfileMenu->setTitle(tr("&Delete session"));
+    m_openWindowsMenu->setTitle(tr("O&pen windows"));
+    m_windowArrangementMenu->setTitle(tr("&Arrangement mode"));
+    m_windowLoadProfileMenu->setTitle(tr("Sw&itch session"));
+    m_windowDeleteProfileMenu->setTitle(tr("&Delete session"));
+
+    #ifndef Q_OS_MAC
+    // This item is not present on Mac OS
     m_settingsMenu->setTitle(tr("Se&ttings"));
+    #endif
+
     m_helpMenu->setTitle(tr("&Help"));
 
     #ifdef BT_DEBUG
@@ -802,8 +827,7 @@ void BibleTime::initSwordConfigFile() {
 // It will contain the LocalePath which is used for sword locales
 // It also contains a DataPath to the %ALLUSERSPROFILE%\Sword directory
 // If this is not done here, the sword locales.d won't be found
-#ifdef Q_WS_WIN
-    namespace DU = util::directory;
+#ifdef Q_OS_WIN
     QString configFile = util::directory::getUserHomeSwordDir().filePath("sword.conf");
     QFile file(configFile);
     if (file.exists()) {
@@ -815,14 +839,13 @@ void BibleTime::initSwordConfigFile() {
     QTextStream out(&file);
     out << "\n";
     out << "[Install]\n";
-    out << "DataPath="   << DU::convertDirSeparators( DU::getSharedSwordDir().absolutePath()) << "\n";
-    out << "LocalePath=" << DU::convertDirSeparators(DU::getApplicationSwordDir().absolutePath()) << "\n";
+    out << "DataPath="   << util::directory::convertDirSeparators( util::directory::getSharedSwordDir().absolutePath()) << "\n";
+    out << "LocalePath=" << util::directory::convertDirSeparators(util::directory::getApplicationSwordDir().absolutePath()) << "\n";
     out << "\n";
     file.close();
 #endif
 
-#ifdef Q_WS_MAC
-    namespace DU = util::directory;
+#ifdef Q_OS_MAC
     QString configFile = util::directory::getUserHomeSwordDir().filePath("sword.conf");
     QFile file(configFile);
     if (file.exists()) {
@@ -834,7 +857,7 @@ void BibleTime::initSwordConfigFile() {
     QTextStream out(&file);
     out << "\n";
     out << "[Install]\n";
-    out << "DataPath="   << DU::convertDirSeparators( DU::getUserHomeSwordDir().absolutePath()) << "\n";
+    out << "DataPath="   << util::directory::convertDirSeparators( util::directory::getUserHomeSwordDir().absolutePath()) << "\n";
     out << "\n";
     file.close();
 #endif
@@ -844,22 +867,31 @@ void BibleTime::initSwordConfigFile() {
 void BibleTime::initBackends() {
     initSwordConfigFile();
 
-    sword::StringMgr::setSystemStringMgr( new BTStringMgr() );
+    sword::StringMgr::setSystemStringMgr( new BtStringMgr() );
     sword::SWLog::getSystemLog()->setLogLevel(sword::SWLog::LOG_ERROR);
 
     if (qApp->property("--debug").toBool()) {
         sword::SWLog::getSystemLog()->setLogLevel(sword::SWLog::LOG_DEBUG);
     }
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     // set a LocaleMgr with a fixed path to the locales.d of the DMG image on MacOS
     // note: this must be done after setting the BTStringMgr, because this will reset the LocaleMgr
     qDebug() << "Using sword locales dir: " << util::directory::getSwordLocalesDir().absolutePath().toUtf8();
     sword::LocaleMgr::setSystemLocaleMgr(new sword::LocaleMgr(util::directory::getSwordLocalesDir().absolutePath().toUtf8()));
 #endif
 
+    /*
+      Set book names language if not set. This is a hack. We do this call here,
+      because we need to keep the setting displayed in BtLanguageSettingsPage in
+      sync with the language of the book names displayed, so that both would
+      always use the same setting.
+    */
+    BtLanguageSettingsPage::resetLanguage(); /// \todo refactor this hack
+
+
     CSwordBackend *backend = CSwordBackend::createInstance();
-    backend->booknameLanguage(CBTConfig::get(CBTConfig::language) );
+    backend->booknameLanguage(btConfig().value<QString>("language", QLocale::system().name()));
 
     const CSwordBackend::LoadError errorCode = CSwordBackend::instance()->initModules(CSwordBackend::OtherChange);
 
@@ -906,53 +938,6 @@ void BibleTime::initBackends() {
 
 }
 
-void BibleTime::applyProfileSettings( CProfile* p ) {
-    Q_ASSERT(p);
-    if (!p) return;
-
-    //first Main Window geometry
-    restoreGeometry(p->getMainwindowGeometry());
-    restoreState(p->getMainwindowState());
-    m_windowFullscreenAction->setChecked(isFullScreen());
-
-    const CMDIArea::MDIArrangementMode newArrangementMode = p->getMDIArrangementMode();
-    //make sure actions are updated by calling the slot functions
-    //updatesEnabled in the MDI area is false atm, so changes won't actually be displayed yet
-    switch (newArrangementMode) {
-        case CMDIArea::ArrangementModeTileVertical:
-            slotAutoTileVertical();
-            break;
-        case CMDIArea::ArrangementModeTileHorizontal:
-            slotAutoTileHorizontal();
-            break;
-        case CMDIArea::ArrangementModeCascade:
-            slotAutoCascade();
-            break;
-        case CMDIArea::ArrangementModeTile:
-            slotAutoTile();
-            break;
-        case CMDIArea::ArrangementModeTabbed:
-            slotAutoTabbed();
-            break;
-        case CMDIArea::ArrangementModeManual:
-            slotManualArrangementMode();
-            break;
-        default:
-            slotAutoTileVertical();
-            break;
-    }
-    layout()->invalidate();
-}
-
-void BibleTime::storeProfileSettings( CProfile* p ) {
-    Q_ASSERT(p && m_windowFullscreenAction);
-    if (!p || !m_windowFullscreenAction) return;
-
-    p->setMainwindowState(saveState());
-    p->setMainwindowGeometry(saveGeometry());
-    p->setMDIArrangementMode(m_mdi->getMDIArrangementMode());
-}
-
 #if BT_DEBUG
 
 QLabel *BibleTime::m_debugWindow = 0;
diff --git a/src/bibletime_slots.cpp b/src/bibletime_slots.cpp
index 05729bf..0572f73 100644
--- a/src/bibletime_slots.cpp
+++ b/src/bibletime_slots.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -22,23 +22,22 @@
 #include <QtGlobal>
 #include <QToolBar>
 #include <QUrl>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/keys/cswordversekey.h"
 #include "frontend/btaboutdialog.h"
 #include "frontend/cinfodisplay.h"
 #include "frontend/cmdiarea.h"
 #include "frontend/bookshelfmanager/btmodulemanagerdialog.h"
+#include "frontend/display/btfindwidget.h"
 #include "frontend/displaywindow/btmodulechooserbar.h"
 #include "frontend/displaywindow/cdisplaywindow.h"
+#include "frontend/messagedialog.h"
 #include "frontend/searchdialog/csearchdialog.h"
 #include "frontend/settingsdialogs/cconfigurationdialog.h"
 #include "frontend/tips/bttipdialog.h"
 #include "util/directory.h"
 
 
-using namespace Profile;
-
-
 /** Opens the optionsdialog of BibleTime. */
 void BibleTime::slotSettingsOptions() {
     qDebug() << "BibleTime::slotSettingsOptions";
@@ -58,7 +57,7 @@ void BibleTime::saveConfigSettings() {
 /** Is called when settings in the optionsdialog were changed (ok or apply) */
 void BibleTime::slotSettingsChanged() {
     qDebug() << "BibleTime::slotSettingsChanged";
-    const QString language = CBTConfig::get(CBTConfig::language);
+    const QString language = btConfig().value<QString>("language", QLocale::system().name());
     CSwordBackend::instance()->booknameLanguage(language);
 
 // \todo update the bookmarks after Bible bookname language has been changed
@@ -91,38 +90,24 @@ void BibleTime::slotSwordSetupDialog() {
 void BibleTime::slotWindowMenuAboutToShow() {
     Q_ASSERT(m_windowMenu);
 
-    if ( m_mdi->subWindowList().isEmpty() ) {
-        m_windowCascadeAction->setEnabled(false);
-        m_windowTileVerticalAction->setEnabled(false);
-        m_windowTileHorizontalAction->setEnabled(false);
-        m_windowCloseAction->setEnabled(false);
-        m_windowCloseAllAction->setEnabled(false);
-        m_openWindowsMenu->setEnabled(false);
-    }
-    else if (m_mdi->subWindowList().count() == 1) {
-        m_windowTileVerticalAction->setEnabled(false);
-        m_windowTileHorizontalAction->setEnabled(false);
-        m_windowCascadeAction->setEnabled(false);
-        m_windowCloseAction->setEnabled(true);
-        m_windowCloseAllAction->setEnabled(true);
-        m_openWindowsMenu->setEnabled(true);
-        //   m_windowMenu->insertSeparator();
-    }
-    else {
-        slotUpdateWindowArrangementActions(0); //update the window tile/cascade states
-        m_windowCloseAction->setEnabled(true);
-        m_windowCloseAllAction->setEnabled(true);
-        m_openWindowsMenu->setEnabled(true);
-    }
+    const int numSubWindows = m_mdi->subWindowList().count();
+    m_windowCloseAction->setEnabled(numSubWindows);
+    m_windowCloseAllAction->setEnabled(numSubWindows);
+    m_openWindowsMenu->setEnabled(numSubWindows);
+
+    const bool enableManualArrangeActions = numSubWindows > 1;
+    m_windowCascadeAction->setEnabled(enableManualArrangeActions);
+    m_windowTileAction->setEnabled(enableManualArrangeActions);
+    m_windowTileVerticalAction->setEnabled(enableManualArrangeActions);
+    m_windowTileHorizontalAction->setEnabled(enableManualArrangeActions);
 }
 
 /** Is called just before the open windows menu is shown. */
 void BibleTime::slotOpenWindowsMenuAboutToShow() {
     Q_ASSERT(m_openWindowsMenu);
 
-    QList<QMdiSubWindow*> windows = m_mdi->usableWindowList();
     m_openWindowsMenu->clear();
-    Q_FOREACH (QMdiSubWindow * const window, windows) {
+    Q_FOREACH (QMdiSubWindow * const window, m_mdi->usableWindowList()) {
         QAction *openWindowAction = m_openWindowsMenu->addAction(window->windowTitle());
         openWindowAction->setCheckable(true);
         openWindowAction->setChecked(window == m_mdi->activeSubWindow());
@@ -132,134 +117,56 @@ void BibleTime::slotOpenWindowsMenuAboutToShow() {
 }
 
 /** This slot is connected with the windowAutoTileAction object */
-void BibleTime::slotUpdateWindowArrangementActions( QAction* clickedAction ) {
-    /* If a toggle action was clicked we see if it is checked or unchecked and
-    * enable/disable the simple cascade and tile options accordingly
-    */
-    m_windowTileVerticalAction->setEnabled( m_windowManualModeAction->isChecked() );
-    m_windowTileHorizontalAction->setEnabled( m_windowManualModeAction->isChecked() );
-    m_windowCascadeAction->setEnabled( m_windowManualModeAction->isChecked() );
-    m_windowTileAction->setEnabled( m_windowManualModeAction->isChecked() );
-
-    if (clickedAction) {
-        m_windowManualModeAction->setEnabled(
-            m_windowManualModeAction != clickedAction
-            && m_windowTileHorizontalAction != clickedAction
-            && m_windowTileVerticalAction != clickedAction
-            && m_windowCascadeAction != clickedAction
-            && m_windowTileAction != clickedAction
-        );
-        m_windowAutoTileVerticalAction->setEnabled( m_windowAutoTileVerticalAction != clickedAction );
-        m_windowAutoTileHorizontalAction->setEnabled( m_windowAutoTileHorizontalAction != clickedAction );
-        m_windowAutoCascadeAction->setEnabled( m_windowAutoCascadeAction != clickedAction );
-        m_windowAutoTileAction->setEnabled( m_windowAutoTileAction != clickedAction );
-        m_windowAutoTabbedAction->setEnabled( m_windowAutoTabbedAction != clickedAction );
-    }
+void BibleTime::slotUpdateWindowArrangementActions(QAction * trigerredAction) {
+    Q_ASSERT(trigerredAction);
 
-    if (clickedAction == m_windowManualModeAction) {
-        m_windowAutoTileVerticalAction->setChecked(false);
-        m_windowAutoTileHorizontalAction->setChecked(false);
-        m_windowAutoCascadeAction->setChecked(false);
-        m_windowAutoTileAction->setChecked(false);
-        m_windowAutoTabbedAction->setChecked(false);
-        m_mdi->enableWindowMinMaxFlags(true);
-        m_mdi->setMDIArrangementMode( CMDIArea::ArrangementModeManual );
-        CBTConfig::set(CBTConfig::autoTileVertical, false);
-        CBTConfig::set(CBTConfig::autoTileHorizontal, false);
-        CBTConfig::set(CBTConfig::autoTile, false);
-        CBTConfig::set(CBTConfig::autoTabbed, false);
-        CBTConfig::set(CBTConfig::autoCascade, false);
-    }
-    else if (clickedAction == m_windowAutoTileVerticalAction) {
-        m_windowManualModeAction->setChecked(false);
-        m_windowAutoTileHorizontalAction->setChecked(false);
-        m_windowAutoCascadeAction->setChecked(false);
-        m_windowAutoTileAction->setChecked(false);
-        m_windowAutoTabbedAction->setChecked(false);
-        m_mdi->enableWindowMinMaxFlags(false);
-        m_mdi->setMDIArrangementMode( CMDIArea::ArrangementModeTileVertical );
-        CBTConfig::set(CBTConfig::autoTileVertical, true);
-    }
-    else if (clickedAction == m_windowAutoTileHorizontalAction) {
-        m_windowManualModeAction->setChecked(false);
-        m_windowAutoTileVerticalAction->setChecked(false);
-        m_windowAutoCascadeAction->setChecked(false);
-        m_windowAutoTileAction->setChecked(false);
-        m_windowAutoTabbedAction->setChecked(false);
-        m_mdi->enableWindowMinMaxFlags(false);
-        m_mdi->setMDIArrangementMode( CMDIArea::ArrangementModeTileHorizontal );
-        CBTConfig::set(CBTConfig::autoTileHorizontal, true);
+    if (trigerredAction == m_windowAutoTileVerticalAction) {
+        m_mdi->setMDIArrangementMode(CMDIArea::ArrangementModeTileVertical);
+        btConfig().setSessionValue("GUI/alignmentMode", autoTileVertical);
     }
-    else if (clickedAction == m_windowAutoTileAction) {
-        m_windowManualModeAction->setChecked(false);
-        m_windowAutoTileHorizontalAction->setChecked(false);
-        m_windowAutoTileVerticalAction->setChecked(false);
-        m_windowAutoTabbedAction->setChecked(false);
-        m_windowAutoCascadeAction->setChecked(false);
-        m_mdi->enableWindowMinMaxFlags(false);
-        m_mdi->setMDIArrangementMode( CMDIArea::ArrangementModeTile );
-        CBTConfig::set(CBTConfig::autoTile, true);
+    else if (trigerredAction == m_windowAutoTileHorizontalAction) {
+        m_mdi->setMDIArrangementMode(CMDIArea::ArrangementModeTileHorizontal);
+        btConfig().setSessionValue("GUI/alignmentMode", autoTileHorizontal);
     }
-    else if (clickedAction == m_windowAutoTabbedAction) {
-        m_windowManualModeAction->setChecked(false);
-        m_windowAutoTileHorizontalAction->setChecked(false);
-        m_windowAutoTileVerticalAction->setChecked(false);
-        m_windowAutoTileAction->setChecked(false);
-        m_windowAutoCascadeAction->setChecked(false);
-        m_mdi->enableWindowMinMaxFlags(false);
-        m_mdi->setMDIArrangementMode( CMDIArea::ArrangementModeTabbed );
-        CBTConfig::set(CBTConfig::autoTabbed, true);
+    else if (trigerredAction == m_windowAutoTileAction) {
+        m_mdi->setMDIArrangementMode(CMDIArea::ArrangementModeTile);
+        btConfig().setSessionValue("GUI/alignmentMode", autoTile);
     }
-    else if (clickedAction == m_windowAutoCascadeAction) {
-        m_windowManualModeAction->setChecked(false);
-        m_windowAutoTileHorizontalAction->setChecked(false);
-        m_windowAutoTileVerticalAction->setChecked(false);
-        m_windowAutoTileAction->setChecked(false);
-        m_windowAutoTabbedAction->setChecked(false);
-        m_mdi->enableWindowMinMaxFlags(false);
-        m_mdi->setMDIArrangementMode( CMDIArea::ArrangementModeCascade );
-        CBTConfig::set(CBTConfig::autoCascade, true);
+    else if (trigerredAction == m_windowAutoTabbedAction) {
+        m_mdi->setMDIArrangementMode(CMDIArea::ArrangementModeTabbed);
+        btConfig().setSessionValue("GUI/alignmentMode", autoTabbed);
     }
-    else if (clickedAction == m_windowTileAction) {
-        m_mdi->setMDIArrangementMode( CMDIArea::ArrangementModeManual );
-        m_mdi->myTile();
+    else if (trigerredAction == m_windowAutoCascadeAction) {
+        m_mdi->setMDIArrangementMode(CMDIArea::ArrangementModeCascade);
+        btConfig().setSessionValue("GUI/alignmentMode", autoCascade);
     }
-    else if (clickedAction == m_windowCascadeAction) {
-        m_mdi->setMDIArrangementMode( CMDIArea::ArrangementModeManual );
-        m_mdi->myCascade();
-    }
-    else if (clickedAction == m_windowTileVerticalAction) {
-        m_mdi->setMDIArrangementMode( CMDIArea::ArrangementModeManual );
-        m_mdi->myTileVertical();
-    }
-    else if (clickedAction == m_windowTileHorizontalAction) {
-        m_mdi->setMDIArrangementMode( CMDIArea::ArrangementModeManual );
-        m_mdi->myTileHorizontal();
-    }
-}
-
-void BibleTime::slotManualArrangementMode() {
-    slotUpdateWindowArrangementActions( m_windowManualModeAction );
-}
+    else {
+        Q_ASSERT(trigerredAction == m_windowManualModeAction
+                 || trigerredAction == m_windowTileAction
+                 || trigerredAction == m_windowCascadeAction
+                 || trigerredAction == m_windowTileVerticalAction
+                 || trigerredAction == m_windowTileHorizontalAction);
 
-/** This slot is connected with the windowAutoTileAction object */
-void BibleTime::slotAutoTileHorizontal() {
-    slotUpdateWindowArrangementActions( m_windowAutoTileHorizontalAction );
-}
+        if (trigerredAction != m_windowManualModeAction)
+            m_windowManualModeAction->setChecked(true);
 
-/** This slot is connected with the windowAutoTileAction object */
-void BibleTime::slotAutoTileVertical() {
-    slotUpdateWindowArrangementActions( m_windowAutoTileVerticalAction );
-}
+        m_mdi->enableWindowMinMaxFlags(true);
+        m_mdi->setMDIArrangementMode(CMDIArea::ArrangementModeManual);
+        btConfig().setSessionValue("GUI/alignmentMode", manual);
+
+        if (trigerredAction == m_windowTileAction)
+            m_mdi->myTile();
+        else if (trigerredAction == m_windowCascadeAction)
+            m_mdi->myCascade();
+        else if (trigerredAction == m_windowTileVerticalAction)
+            m_mdi->myTileVertical();
+        else if (trigerredAction == m_windowTileHorizontalAction)
+            m_mdi->myTileHorizontal();
 
-/** This slot is connected with the windowAutoTileAction object */
-void BibleTime::slotAutoTile() {
-    slotUpdateWindowArrangementActions( m_windowAutoTileAction );
-}
+        return;
+    }
 
-/** This slot is connected with the windowAutoTabbedAction object */
-void BibleTime::slotAutoTabbed() {
-    slotUpdateWindowArrangementActions( m_windowAutoTabbedAction );
+    m_mdi->enableWindowMinMaxFlags(false);
 }
 
 void BibleTime::slotTile() {
@@ -278,16 +185,11 @@ void BibleTime::slotTileHorizontal() {
     slotUpdateWindowArrangementActions( m_windowTileHorizontalAction );
 }
 
-/** This slot is connected with the windowAutoCascadeAction object */
-void BibleTime::slotAutoCascade() {
-    slotUpdateWindowArrangementActions( m_windowAutoCascadeAction );
-}
-
 /** Shows/hides the toolbar */
 void BibleTime::slotToggleMainToolbar() {
     Q_ASSERT(m_mainToolBar);
-    bool currentState = CBTConfig::get(CBTConfig::showMainWindowToolbar);
-    CBTConfig::set(CBTConfig::showMainWindowToolbar, !currentState);
+    bool currentState = btConfig().sessionValue<bool>("GUI/showMainToolbar", true);
+    btConfig().setSessionValue("GUI/showMainToolbar", !currentState);
     if ( m_showMainWindowToolbarAction->isChecked()) {
         m_mainToolBar->show();
     }
@@ -297,84 +199,77 @@ void BibleTime::slotToggleMainToolbar() {
 }
 
 void BibleTime::slotToggleTextWindowHeader() {
-    bool currentState = CBTConfig::get(CBTConfig::showTextWindowHeaders);
-    CBTConfig::set(CBTConfig::showTextWindowHeaders, !currentState);
+    bool currentState = btConfig().sessionValue<bool>("GUI/showTextWindowHeaders", true);
+    btConfig().setSessionValue("GUI/showTextWindowHeaders", !currentState);
     emit toggledTextWindowHeader(!currentState);
 }
 
 void BibleTime::slotToggleNavigatorToolbar() {
-    bool currentState = CBTConfig::get(CBTConfig::showTextWindowNavigator);
-    CBTConfig::set(CBTConfig::showTextWindowNavigator, !currentState);
-    showOrHideToolBars();
-    if (CBTConfig::get(CBTConfig::showToolbarsInEachWindow))
+    bool currentState = btConfig().sessionValue<bool>("GUI/showTextWindowNavigator", true);
+    btConfig().setSessionValue("GUI/showTextWindowNavigator", !currentState);
+    if (btConfig().sessionValue<bool>("GUI/showToolbarsInEachWindow", true))
         emit toggledTextWindowNavigator(!currentState);
     else
-        emit toggledTextWindowNavigator(false);
+        m_navToolBar->setVisible(btConfig().sessionValue<bool>("GUI/showTextWindowNavigator", true));
 }
 
 void BibleTime::slotToggleToolsToolbar() {
-    bool currentState = CBTConfig::get(CBTConfig::showTextWindowToolButtons);
-    CBTConfig::set(CBTConfig::showTextWindowToolButtons, !currentState);
-    showOrHideToolBars();
-    if (CBTConfig::get(CBTConfig::showToolbarsInEachWindow))
+    bool currentState = btConfig().sessionValue<bool>("GUI/showTextWindowToolButtons", true);
+    btConfig().setSessionValue("GUI/showTextWindowToolButtons", !currentState);
+    if (btConfig().sessionValue<bool>("GUI/showToolbarsInEachWindow", true))
         emit toggledTextWindowToolButtons(!currentState);
     else
-        emit toggledTextWindowToolButtons(false);
+        m_toolsToolBar->setVisible(btConfig().sessionValue<bool>("GUI/showTextWindowToolButtons", true));
 }
 
 void BibleTime::slotToggleWorksToolbar() {
-    bool currentState = CBTConfig::get(CBTConfig::showTextWindowModuleSelectorButtons);
-    CBTConfig::set(CBTConfig::showTextWindowModuleSelectorButtons, !currentState);
-    showOrHideToolBars();
-    if (CBTConfig::get(CBTConfig::showToolbarsInEachWindow))
+    bool currentState = btConfig().sessionValue<bool>("GUI/showTextWindowModuleSelectorButtons", true);
+    btConfig().setSessionValue("GUI/showTextWindowModuleSelectorButtons", !currentState);
+    if (btConfig().sessionValue<bool>("GUI/showToolbarsInEachWindow", true))
         emit toggledTextWindowModuleChooser(!currentState);
     else
-        emit toggledTextWindowModuleChooser(false);
+        m_worksToolBar->setVisible(btConfig().sessionValue<bool>("GUI/showTextWindowModuleSelectorButtons", true));
 }
 
 void BibleTime::slotToggleFormatToolbar() {
-    bool currentState = CBTConfig::get(CBTConfig::showFormatToolbarButtons);
-    CBTConfig::set(CBTConfig::showFormatToolbarButtons, !currentState);
-    showOrHideToolBars();
-    if (CBTConfig::get(CBTConfig::showToolbarsInEachWindow))
+    bool currentState = btConfig().sessionValue<bool>("GUI/showFormatToolbarButtons", true);
+    btConfig().setSessionValue("GUI/showFormatToolbarButtons", !currentState);
+    if (btConfig().sessionValue<bool>("GUI/showToolbarsInEachWindow", true))
         emit toggledTextWindowFormatToolbar(!currentState);
     else
-        emit toggledTextWindowFormatToolbar(false);
+        m_formatToolBar->setVisible(!currentState);
 }
 
 void BibleTime::slotToggleToolBarsInEachWindow() {
-    bool currentState = CBTConfig::get(CBTConfig::showToolbarsInEachWindow);
-    CBTConfig::set(CBTConfig::showToolbarsInEachWindow, !currentState);
+    bool currentState = btConfig().sessionValue<bool>("GUI/showToolbarsInEachWindow", true);
+    btConfig().setSessionValue("GUI/showToolbarsInEachWindow", !currentState);
     showOrHideToolBars();
-
-    if (!currentState) {
-        emit toggledTextWindowNavigator(CBTConfig::get(CBTConfig::showTextWindowNavigator));
-        emit toggledTextWindowToolButtons(CBTConfig::get(CBTConfig::showTextWindowToolButtons));
-        emit toggledTextWindowModuleChooser(CBTConfig::get(CBTConfig::showTextWindowModuleSelectorButtons));
-        emit toggledTextWindowFormatToolbar(CBTConfig::get(CBTConfig::showFormatToolbarButtons));
-    }
-    else {
-        emit toggledTextWindowNavigator(false);
-        emit toggledTextWindowToolButtons(false);
-        emit toggledTextWindowModuleChooser(false);
-        emit toggledTextWindowFormatToolbar(false);
-    }
-
-
 }
 
 void BibleTime::showOrHideToolBars() {
-    if (CBTConfig::get(CBTConfig::showToolbarsInEachWindow)) {
+    if (btConfig().sessionValue<bool>("GUI/showToolbarsInEachWindow", true)) {
+        // set main window widgets invisible
         m_navToolBar->setVisible(false);
         m_worksToolBar->setVisible(false);
         m_toolsToolBar->setVisible(false);
         m_formatToolBar->setVisible(false);
+        // set state of sub window widets
+        emit toggledTextWindowNavigator(btConfig().sessionValue<bool>("GUI/showTextWindowNavigator", true));
+        emit toggledTextWindowModuleChooser(btConfig().sessionValue<bool>("GUI/showTextWindowModuleSelectorButtons", true));
+        emit toggledTextWindowToolButtons(btConfig().sessionValue<bool>("GUI/showTextWindowToolButtons", true));
+        emit toggledTextWindowFormatToolbar(btConfig().sessionValue<bool>("GUI/showFormatToolbarButtons", true));
     }
     else {
-        m_navToolBar->setVisible(CBTConfig::get(CBTConfig::showTextWindowNavigator));
-        m_worksToolBar->setVisible(CBTConfig::get(CBTConfig::showTextWindowModuleSelectorButtons));
-        m_toolsToolBar->setVisible(CBTConfig::get(CBTConfig::showTextWindowToolButtons));
-        m_formatToolBar->setVisible(CBTConfig::get(CBTConfig::showFormatToolbarButtons));
+        // set state of main window widgets
+        m_navToolBar->setVisible(btConfig().sessionValue<bool>("GUI/showTextWindowNavigator", true));
+        m_worksToolBar->setVisible(btConfig().sessionValue<bool>("GUI/showTextWindowModuleSelectorButtons", true));
+        m_toolsToolBar->setVisible(btConfig().sessionValue<bool>("GUI/showTextWindowToolButtons", true));
+        m_formatToolBar->setVisible(btConfig().sessionValue<bool>("GUI/showFormatToolbarButtons", true));
+        //set sub window widgets invisible
+        emit toggledTextWindowNavigator(false);
+        emit toggledTextWindowToolButtons(false);
+        emit toggledTextWindowModuleChooser(false);
+        emit toggledTextWindowFormatToolbar(false);
     }
 }
 
@@ -398,12 +293,18 @@ void BibleTime::slotSearchModules() {
     Search::CSearchDialog::openDialog(modules, QString::null);
 }
 
+void BibleTime::slotActiveWindowChanged(QMdiSubWindow* window)
+{
+    if (window == 0)
+        m_findWidget->setVisible(false);
+}
+
 /* Search default Bible slot
  * Call CSearchDialog::openDialog with only the default bible module
  */
 void BibleTime::slotSearchDefaultBible() {
     QList<const CSwordModuleInfo*> module;
-    CSwordModuleInfo* bible = CBTConfig::get(CBTConfig::standardBible);
+    CSwordModuleInfo* bible = btConfig().getDefaultSwordModuleByType("standardBible");
     if (bible) {
         module.append(bible);
     }
@@ -430,117 +331,187 @@ void BibleTime::slotOpenTipDialog() {
     dlg->show();
 }
 
-/** Saves the current settings into the currently activated profile. */
-void BibleTime::saveProfile(QAction* action) {
-    m_mdi->setUpdatesEnabled(false);
-
-    CProfile * p = (CProfile *) action->property("CProfilePointer").value<void *>();
-    Q_ASSERT(p);
-    Q_ASSERT(p == m_profileMgr.profile(action->text().remove("&")));
-    if ( p ) {
-        saveProfile(p);
-    }
-
-    m_mdi->setUpdatesEnabled(true);
-}
+void BibleTime::saveProfile() {
+    // Save main window settings:
+    BtConfig & conf = btConfig();
+    conf.setSessionValue("MainWindow/geometry", saveGeometry());
+    conf.setSessionValue("MainWindow/state", saveState());
+    conf.setSessionValue("MainWindow/MDIArrangementMode", static_cast<int>(m_mdi->getMDIArrangementMode()));
 
-void BibleTime::saveProfile(CProfile* profile) {
-    if (!profile) {
-        return;
-    }
-    //save mainwindow settings
-    storeProfileSettings(profile);
+    conf.setSessionValue("FindIsVisible", m_findWidget->isVisibleTo(this));
 
-    QList<CProfileWindow*> profileWindows;
-    Q_FOREACH (const QMdiSubWindow * const w, m_mdi->subWindowList(QMdiArea::StackingOrder)) {
+    QStringList windowsList;
+    Q_FOREACH (const QMdiSubWindow * const w,
+               m_mdi->subWindowList(QMdiArea::StackingOrder))
+    {
         CDisplayWindow * const displayWindow = dynamic_cast<CDisplayWindow*>(w->widget());
-        if (displayWindow == 0) {
+        if (!displayWindow)
             continue;
-        }
 
-        CProfileWindow * const profileWindow = new CProfileWindow();
-        displayWindow->storeProfileSettings(profileWindow);
-        profileWindows.append(profileWindow);
+        const QString windowKey = QString::number(windowsList.size());
+        windowsList.append(windowKey);
+        const QString windowGroup = "window/" + windowKey + '/';
+        displayWindow->storeProfileSettings(windowGroup);
     }
-    profile->save(profileWindows);
-
-    //clean up memory - delete all created profile windows
-    //profileWindows.setAutoDelete(true);
-    qDeleteAll(profileWindows);
-    profileWindows.clear();
+    conf.setSessionValue("windowsList", windowsList);
 }
 
-void BibleTime::loadProfile(QAction* action) {
-    CProfile * p = (CProfile *) action->property("CProfilePointer").value<void *>();
-    Q_ASSERT(p);
-    Q_ASSERT(p == m_profileMgr.profile(action->text().remove("&")));
-    if ( p ) {
-        m_mdi->closeAllSubWindows();
-        loadProfile(p);
-    }
+void BibleTime::loadProfile(QAction * action) {
+    Q_ASSERT(action);
+    QVariant keyProperty = action->property("ProfileKey");
+    Q_ASSERT(keyProperty.type() == QVariant::String);
+    Q_ASSERT(btConfig().sessionNames().contains(keyProperty.toString()));
+    loadProfile(keyProperty.toString());
 }
 
-void BibleTime::loadProfile(CProfile* p) {
-    if (!p)
-        return;
-
-    QList<CProfileWindow*> windows = p->load();
+void BibleTime::loadProfile(const QString & profileKey) {
+    Q_ASSERT(btConfig().sessionNames().contains(profileKey));
 
-    m_mdi->setUpdatesEnabled(false);//don't auto tile or auto cascade, this would mess up everything!!
+    // do nothing if requested session is the current session
+    if (profileKey == btConfig().currentSessionKey())
+        return;
 
-    //load mainwindow setttings
-    applyProfileSettings(p);
+    // Save old profile:
+    saveProfile();
 
-    QWidget* focusWindow = 0;
+    // Close all open windows BEFORE switching profile:
+    m_mdi->closeAllSubWindows();
 
-    //   for (CProfileWindow* w = windows.last(); w; w = windows.prev()) { //from the last one to make sure the order is right in the mdi area
-    Q_FOREACH (CProfileWindow * w, windows) {
-        const QString &key = w->key;
+    // Switch profile Activate profile:
+    btConfig().setCurrentSession(profileKey);
+    reloadProfile();
+    refreshProfileMenus();
+}
 
-        QList<CSwordModuleInfo*> modules;
-        Q_FOREACH (const QString &moduleName, w->modules) {
+namespace {
+
+/// Helper object for reloadProfile()
+struct WindowLoadStatus {
+    inline WindowLoadStatus() : window(0) {}
+    QStringList failedModules;
+    QList<CSwordModuleInfo*> okModules;
+    CDisplayWindow * window;
+};
+
+} // anonymous namespace
+
+void BibleTime::reloadProfile() {
+    typedef CMDIArea::MDIArrangementMode MAM;
+    typedef CPlainWriteWindow::WriteWindowType WWT;
+    using message::setQActionCheckedNoTrigger;
+
+    // Cache pointer to config:
+    BtConfig & conf = btConfig();
+
+    // Disable updates while doing big changes:
+    setUpdatesEnabled(false);
+
+    // Close all open windows:
+    m_mdi->closeAllSubWindows();
+
+    // Reload main window settings:
+    restoreGeometry(conf.sessionValue<QByteArray>("MainWindow/geometry"));
+    restoreState(conf.sessionValue<QByteArray>("MainWindow/state"));
+
+    /*
+     * restoreState includes visibility of child widgets, the manually added
+     * qactions (so not including bookmark, bookshelf and mag) are not restored
+     * though, so we restore their state here.
+     */
+    setQActionCheckedNoTrigger(m_windowFullscreenAction, isFullScreen());
+    setQActionCheckedNoTrigger(m_showTextAreaHeadersAction, conf.sessionValue<bool>("GUI/showTextWindowHeaders", true));
+    setQActionCheckedNoTrigger(m_showMainWindowToolbarAction, conf.sessionValue<bool>("GUI/showMainToolbar", true));
+    setQActionCheckedNoTrigger(m_showTextWindowNavigationAction, conf.sessionValue<bool>("GUI/showTextWindowNavigator", true));
+    setQActionCheckedNoTrigger(m_showTextWindowModuleChooserAction, conf.sessionValue<bool>("GUI/showTextWindowModuleSelectorButtons", true));
+    setQActionCheckedNoTrigger(m_showTextWindowToolButtonsAction, conf.sessionValue<bool>("GUI/showTextWindowToolButtons", true));
+    setQActionCheckedNoTrigger(m_showFormatToolbarAction, conf.sessionValue<bool>("GUI/showFormatToolbarButtons", true));
+    setQActionCheckedNoTrigger(m_toolbarsInEachWindow, conf.sessionValue<bool>("GUI/showToolbarsInEachWindow", true));
+
+    m_mdi->setMDIArrangementMode(static_cast<MAM>(conf.sessionValue<int>("MainWindow/MDIArrangementMode")));
+
+    m_findWidget->setVisible(conf.sessionValue<bool>("FindIsVisible", false));
+
+    QWidget * focusWindow = 0;
+    QMap<QString, WindowLoadStatus> failedWindows;
+    Q_FOREACH (const QString & w,
+               conf.sessionValue<QStringList>("windowsList"))
+    {
+        const QString windowGroup = "window/" + w + '/';
+
+        // Try to determine window modules:
+        WindowLoadStatus wls;
+        Q_FOREACH (const QString &moduleName,
+                   conf.sessionValue<QStringList>(windowGroup + "modules"))
+        {
             CSwordModuleInfo * const m = CSwordBackend::instance()->findModuleByName(moduleName);
-            if (m != 0) {
-                modules.append(m);
+            if (m) {
+                wls.okModules.append(m);
+            } else {
+                wls.failedModules.append(moduleName);
             }
         }
-        if (modules.isEmpty()) { //are the modules still installed? If not continue wih next session window
+
+        // Check whether the window totally failed (no modules can be loaded):
+        if (wls.okModules.isEmpty()) {
+            failedWindows.insert(w, wls);
             continue;
         }
 
-        //is w->isWriteWindow is false we create a write window, otherwise a read window
-        CDisplayWindow* displayWindow = 0;
-        if (w->writeWindowType > 0) { //create a write window
-            displayWindow = createWriteDisplayWindow(modules.first(), key, CWriteWindow::WriteWindowType(w->writeWindowType) );
-        }
-        else { //create a read window
-            displayWindow = createReadDisplayWindow(modules, key);
+        // Check whether the window partially failed:
+        if (!wls.failedModules.isEmpty())
+            failedWindows.insert(w, wls);
+
+        // Try to respawn the window:
+        Q_ASSERT(!wls.window);
+        const QString key = conf.sessionValue<QString>(windowGroup + "key");
+        WWT wwt = static_cast<WWT>(conf.sessionValue<int>(windowGroup + "writeWindowType", 0));
+        if (wwt > 0) {
+            // Note, that we *might* lose the rest of wls.okModules here:
+            if (wls.okModules.size() > 1)
+                qWarning() << "Got more modules for a \"write window\" than expected from the profile!";
+
+            wls.window = createWriteDisplayWindow(wls.okModules.first(), key, wwt);
+        } else {
+            wls.window = createReadDisplayWindow(wls.okModules, key);
         }
 
-        if (displayWindow) { //if a window was created initialize it.
-            if (w->hasFocus) {
-                focusWindow = displayWindow;
-            }
-
-            displayWindow->applyProfileSettings(w);
+        if (wls.window) {
+            wls.window->applyProfileSettings(windowGroup);
+            if (conf.sessionValue<bool>(windowGroup + "hasFocus", false))
+                focusWindow = wls.window;
+        } else {
+            failedWindows.insert(w, wls);
         }
     }
 
-    m_mdi->setUpdatesEnabled(true);
+    /* This call is necessary to restore the visibility of the toolbars in the child
+     * windows, since their state is not saved automatically.
+     */
+    showOrHideToolBars();
+
+    // Re-arrange MDI:
     m_mdi->triggerWindowUpdate();
 
-    if (focusWindow) {
+    // Activate focused window:
+    if (focusWindow)
         focusWindow->setFocus();
-    }
+
+    // Re-enable updates and repaint:
+    setUpdatesEnabled(true);
+    repaint(); /// \bug The main window (except decors) is all black without this (not even hover over toolbar buttons work)
+    raise(); /// \bug The main window would not refresh at all. A call to this function or adjustSize() seems to fix this
+
+    /// \todo For windows in failedWindows ask whether to keep the settings / close windows etc
 }
 
 void BibleTime::deleteProfile(QAction* action) {
-    //HACK: work around the inserted & char by KPopupMenu
-    CProfile * p = (CProfile *) action->property("CProfilePointer").value<void *>();
-    Q_ASSERT(p);
-    Q_ASSERT(p == m_profileMgr.profile(action->text().remove("&")));
-    if (p)
-        m_profileMgr.remove(p);
+    Q_ASSERT(action);
+    QVariant keyProperty = action->property("ProfileKey");
+    Q_ASSERT(keyProperty.type() == QVariant::String);
+    Q_ASSERT(btConfig().sessionNames().contains(keyProperty.toString()));
+
+    /// \todo Ask for confirmation
+    btConfig().deleteSession(keyProperty.toString());
     refreshProfileMenus();
 }
 
@@ -551,40 +522,75 @@ void BibleTime::toggleFullscreen() {
 
 /** Saves current settings into a new profile. */
 void BibleTime::saveToNewProfile() {
-    bool ok = false;
-    const QString name = QInputDialog::getText(this, tr("New Session"),
-                         tr("Please enter a name for the new session."), QLineEdit::Normal, QString::null, &ok);
-    if (ok && !name.isEmpty()) {
-        CProfile* profile = m_profileMgr.create(name);
-        saveProfile(profile);
+    BtConfig & conf = btConfig();
+
+    // Get new unique name:
+    QString name;
+    for (;;) {
+        bool ok;
+        name = QInputDialog::getText(
+                   this, tr("New Session"),
+                   tr("Please enter a name for the new session."),
+                   QLineEdit::Normal, name, &ok);
+        if (!ok)
+            return;
+
+        if (!name.isEmpty()) {
+            // Check whether name already exists:
+            if (conf.sessionNames().values().contains(name)) {
+                message::showInformation(this, tr("Session already exists"),
+                                         tr("Session with the name \"%1\" "
+                                            "already exists. Please provide a "
+                                            "different name.").arg(name));
+            } else {
+                break;
+            }
+        }
     }
+
+    // Also save old profile:
+    saveProfile();
+
+    // Save new profile:
+    conf.setCurrentSession(conf.addSession(name));
+    saveProfile();
+
+    // Refresh profile menus:
     refreshProfileMenus();
 }
 
-/** Slot to refresh the save profile and load profile menus. */
+/** Slot to refresh the saved profile and load profile menus. */
 void BibleTime::refreshProfileMenus() {
-    m_windowSaveProfileMenu->clear();
+    typedef BtConfig::SessionNamesHashMap SNHM;
+    typedef SNHM::const_iterator SNHMCI;
+
     m_windowLoadProfileMenu->clear();
     m_windowDeleteProfileMenu->clear();
 
-    //refresh the load, save and delete profile menus
-    m_profileMgr.refresh();
-    const QList<CProfile*> profiles = m_profileMgr.profiles();
+    BtConfig & conf = btConfig();
+    const BtConfig::SessionNamesHashMap &sessions = conf.sessionNames();
 
-    const bool enableActions = !profiles.isEmpty();
-    m_windowSaveProfileMenu->setEnabled(enableActions);
+    const bool enableActions = sessions.size() > 1;
     m_windowLoadProfileMenu->setEnabled(enableActions);
     m_windowDeleteProfileMenu->setEnabled(enableActions);
 
-    Q_FOREACH (const CProfile * const p, profiles) {
-        const QString &profileName = p->name();
-        QAction * a;
-        a = m_windowSaveProfileMenu->addAction(profileName);
-        a->setProperty("CProfilePointer", QVariant::fromValue((void *) p));
-        a = m_windowLoadProfileMenu->addAction(profileName);
-        a->setProperty("CProfilePointer", QVariant::fromValue((void *) p));
-        a = m_windowDeleteProfileMenu->addAction(profileName);
-        a->setProperty("CProfilePointer", QVariant::fromValue((void *) p));
+
+    if (enableActions) {
+        for (SNHMCI it = sessions.constBegin(); it != sessions.constEnd(); ++it) {
+            QAction * a;
+
+            a = m_windowLoadProfileMenu->addAction(it.value());
+            a->setProperty("ProfileKey", it.key());
+            a->setActionGroup(m_windowLoadProfileActionGroup);
+            a->setCheckable(true);
+            if (it.key() == conf.currentSessionKey())
+                a->setChecked(true);
+
+            a = m_windowDeleteProfileMenu->addAction(it.value());
+            a->setProperty("ProfileKey", it.key());
+            if (it.key() == conf.currentSessionKey())
+                a->setDisabled(true);
+        }
     }
 }
 
diff --git a/src/bibletimeapp.cpp b/src/bibletimeapp.cpp
index f73d501..c8e4274 100644
--- a/src/bibletimeapp.cpp
+++ b/src/bibletimeapp.cpp
@@ -2,38 +2,61 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
 
 #include "bibletimeapp.h"
 
-#include <QMessageBox>
-#include "backend/config/cbtconfig.h"
+#include <QDebug>
+#include <QFile>
+#include "frontend/messagedialog.h"
+#include "backend/config/btconfig.h"
+#include "backend/managers/cswordbackend.h"
 #include "backend/managers/cdisplaytemplatemgr.h"
-#include "util/cresmgr.h"
+#include "util/geticon.h"
 
 
+BibleTimeApp::BibleTimeApp(int &argc, char **argv)
+    : QApplication(argc, argv)
+    , m_init(false)
+{
+    setApplicationName("bibletime");
+    setApplicationVersion(BT_VERSION);
+}
+
 BibleTimeApp::~BibleTimeApp() {
     // Prevent writing to the log file before the directory cache is init:
-    if (!m_init)
+    if (!m_init || BtConfig::m_instance == 0)
         return;
 
     //we can set this safely now because we close now (hopyfully without crash)
-    CBTConfig::set(CBTConfig::crashedLastTime, false);
-    CBTConfig::set(CBTConfig::crashedTwoTimes, false);
+    btConfig().setValue("state/crashedLastTime", false);
+    btConfig().setValue("state/crashedTwoTimes", false);
 
     delete CDisplayTemplateMgr::instance();
     CLanguageMgr::destroyInstance();
     CSwordBackend::destroyInstance();
+    util::clearIconCache();
+
+    BtConfig::destroyInstance();
+}
+
+bool BibleTimeApp::initBtConfig() {
+    Q_ASSERT(m_init);
+
+    return BtConfig::initBtConfig();
 }
 
 bool BibleTimeApp::initDisplayTemplateManager() {
+    Q_ASSERT(m_init);
+
     QString errorMessage;
     new CDisplayTemplateMgr(errorMessage);
     if (errorMessage.isNull())
         return true;
-    QMessageBox::critical(0, tr("Fatal error!"), errorMessage);
+    message::showCritical(0, tr("Fatal error!"), errorMessage);
     return false;
 }
+
diff --git a/src/bibletimeapp.h b/src/bibletimeapp.h
index 7ac1ebf..23a1ce8 100644
--- a/src/bibletimeapp.h
+++ b/src/bibletimeapp.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -18,15 +20,24 @@
   delete all created module objects.
 */
 class BibleTimeApp : public QApplication {
-    public:
-        inline BibleTimeApp(int &argc, char **argv) : QApplication(argc, argv), m_init(false) {}
+
+    Q_OBJECT
+
+    public: /* Methods: */
+
+        BibleTimeApp(int &argc, char **argv);
         ~BibleTimeApp();
 
         inline void startInit() { m_init = true; }
+        bool initBtConfig();
         bool initDisplayTemplateManager();
 
-    private:
+    private: /* Fields: */
+
         bool m_init;
+
 };
 
+#define bApp (static_cast<BibleTimeApp *>(QCoreApplication::instance()))
+
 #endif
diff --git a/src/btglobal.h b/src/btglobal.h
index 1b584e8..1b956b7 100644
--- a/src/btglobal.h
+++ b/src/btglobal.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -45,11 +47,13 @@ struct DisplayOptions {
 
 /**
   Work around for Windows compiler bug in Visual Studio 2008 & 2010. The Crash
-  occurs at the return statement of CBTConfig::getDisplayOptionDefaults and is
-  caused by a bad calling sequence when called from CDisplayWindow::init.
+  occurs at the return statement of the not anymore existing
+  CBTConfig::getDisplayOptionDefaults and is caused by a bad calling sequence
+  when called from CDisplayWindow::init. The bug might still occur but now
+  caused by BtConfig::getDisplayOptions.
   \todo Properly identify this bug and remove the #ifdef when fix is available.
 */
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     int notUsed;
 #endif
 
diff --git a/src/display-templates/Basic.tmpl b/src/display-templates/Basic.tmpl
index 192e5b4..6d0df9d 100644
--- a/src/display-templates/Basic.tmpl
+++ b/src/display-templates/Basic.tmpl
@@ -2,25 +2,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>#TITLE#</title>
-	<meta name="GENERATOR" content="BibleTime - www.bibletime.info" />
-	<meta name="AUTHOR" content="BibleTime - www.bibletime.info" />
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<style type="text/css">
-	/* <![CDATA[ */
+    <title>#TITLE#</title>
+    <meta name="GENERATOR" content="BibleTime - www.bibletime.info" />
+    <meta name="AUTHOR" content="BibleTime - www.bibletime.info" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <style type="text/css">
+    /* <![CDATA[ */
 #LANG_CSS#
 
 
-	/* ]]> */
-	</style>
+    /* ]]> */
+    </style>
 
-	<!-- Link to the application default stylesheet -->
-	<link rel="stylesheet" type="text/css" href="file://#THEME_STYLE#" />
-	<!-- Link to module stylesheet, if applicable -->
+    <!-- Link to the application default stylesheet -->
+    <style type="text/css">#THEME_STYLE#</style>
+    <!-- Link to module stylesheet, if applicable -->
 
 </head>
 
 <body id="#DISPLAYTYPE#" class="#MODTYPE# #MODTYPE#_#MODNAME#">
-	<div id="content" lang="#LANG_ABBREV#" xml:lang="#LANG_ABBREV#" dir="#PAGE_DIRECTION#">#CONTENT#</div>
+    <div id="content" lang="#LANG_ABBREV#" xml:lang="#LANG_ABBREV#" dir="#PAGE_DIRECTION#">#CONTENT#</div>
 </body>
 </html>
diff --git a/src/display-templates/Blue.css b/src/display-templates/Blue.css
index 229289c..eafe85b 100644
--- a/src/display-templates/Blue.css
+++ b/src/display-templates/Blue.css
@@ -2,148 +2,148 @@
  * Theme by BibleTime - www.bibletime.info *
  */
 body {
-	background-color: white;
-	color: black;
+    background-color: white;
+    color: black;
 }
 #content {
-	margin:10px;
+    margin:10px;
 }
 #content > table {
-	margin: 0;
-	padding: 0;
-	border-spacing:10px;
+    margin: 0;
+    padding: 0;
+    border-spacing:10px;
 }
 #content > table th {
-	padding: 0 0 2px 0;
-	text-align: center;
-	font-weight: bold;
-	font-size: 110%;
-	border-bottom: 1px dotted #7B7B7B;
+    padding: 0 0 2px 0;
+    text-align: center;
+    font-weight: bold;
+    font-size: 110%;
+    border-bottom: 1px dotted #7B7B7B;
 }
 
 a {
-	text-decoration:none;
-	font-weight:normal;
-	color: #7B7B7B;
-	padding:0 2px;
+    text-decoration:none;
+    font-weight:normal;
+    color: #7B7B7B;
+    padding:0 2px;
 }
 a:hover {
-	text-decoration:none;
-	color: #0000FF;
-	padding:0 2px;
+    text-decoration:none;
+    color: #0000FF;
+    padding:0 2px;
 }
 
 
 /* Settings which apply to all entries in all modules */
 .entry {
-	padding: 2px;
- 	/*vertical-align: middle;*/
- 	text-align: justify;
+    padding: 2px;
+     /*vertical-align: middle;*/
+     text-align: justify;
 }
 td.entry, td.currententry {
-	vertical-align: top;
- 	text-align: justify !important;
+    vertical-align: top;
+     text-align: justify !important;
 }
 #printer .entry {
-	font-size: 90%;
-	text-align: left;
+    font-size: 90%;
+    text-align: left;
 }
 .entry[dir=rtl] {
-	text-align: right !important;
+    text-align: right !important;
 }
 #printer .entry[dir=rtl] {
-	text-align:right !important;
+    text-align:right !important;
 }
 
 /* Keep the values the same as in .entry (take the border into account!) */
 .currententry {
-	padding: 2px;
- 	/*vertical-align: middle;*/
-	text-align: justify;
-	background-color: #E6E4FF;
+    padding: 2px;
+     /*vertical-align: middle;*/
+    text-align: justify;
+    background-color: #E6E4FF;
 }
 .currententry[dir=rtl] {
-	text-align:right !important;
+    text-align:right !important;
 }
 div.currententry {
 }
 span.currententry {
-	background-color: #EDEFFF !important;
+    background-color: #EDEFFF !important;
 }
 
 /* Space between the columns of modules displayed side by side */
 td.entry + td.entry {
-	margin-left: 5px;
+    margin-left: 5px;
 }
 
 /* Several additional settings for display of modules*/
 #bible div.currententry, #bible td.currententry {
-	border: 1px solid #B7B7B7;
-	padding: 2px;
+    border: 1px solid #B7B7B7;
+    padding: 2px;
 }
 
 
 /*Same for books!*/
 #book div.currententry, #book td.currententry {
-	border: 1px solid #B7B7B7;
-	padding: 2px;
+    border: 1px solid #B7B7B7;
+    padding: 2px;
 }
 #book .entryname + .entry {
-	margin-top:2px;
-	padding-top:1px;
+    margin-top:2px;
+    padding-top:1px;
 }
 /* To remove the gap between the entrynam and the entry's content*/
 #book .entry > *, #book .currententry > * {
-	margin-top:0px;
-	padding-top:0px;
+    margin-top:0px;
+    padding-top:0px;
 }
 
 .entryname {
-	font-size:80%;
-	padding:0 2px 0 0;
-	vertical-align:super;
+    font-size:80%;
+    padding:0 2px 0 0;
+    vertical-align:super;
 }
 .entry[dir=rtl] .entryname, .currententry[dir=rtl] .entryname {
-	padding: 0 0 0 2px;
-	font-size: 80%;
-	vertical-align: super;
+    padding: 0 0 0 2px;
+    font-size: 80%;
+    vertical-align: super;
 }
 .entryname a, #printer .entryname  {
 }
 
 #printer .entry  .entry, #printer .entry .sectiontitle , #printer .entry .booktitle {
-	padding-top: 0.05em;
-	margin-left: 10px;
+    padding-top: 0.05em;
+    margin-left: 10px;
 }
 
 .footnote {
-	vertical-align:super;
-	font-weight: normal;
-	color: blue;
-	font-size: 80%;
-	cursor: help;
+    vertical-align:super;
+    font-weight: normal;
+    color: blue;
+    font-size: 80%;
+    cursor: help;
 }
 
 .footnote:before { content:"("; }
 .footnote:after { content:")"; }
 
 .footnotepre {
- 	font-style: italic;
+     font-style: italic;
 }
 
 
 .crossreference {
-	font-size: 80%;
-	color: blue;
+    font-size: 80%;
+    color: blue;
 }
 #bible .crossreference:before  { content:" ["; }
 #bible .crossreference:after  { content:"]"; }
 
 .crossreference a {
-	color: blue;
+    color: blue;
 }
 .crossreference a:hover {
-	color: blue;
+    color: blue;
 }
 
 .alternative {}
@@ -155,36 +155,36 @@ td.entry + td.entry {
 }
 
 .sectiontitle {
-	font-weight: bold;
-	font-size: 110%;
+    font-weight: bold;
+    font-size: 110%;
 }
 #printer .sectiontitle {
-	font-weight: bold;
-	font-size: 100%;
+    font-weight: bold;
+    font-size: 100%;
 }
 * + .sectiontitle {
-	margin-top:15px;
+    margin-top:15px;
 }
 
 .booktitle {
-	font-weight: bold;
-	font-size: 120%;
-	font-variant: small-caps;
+    font-weight: bold;
+    font-size: 120%;
+    font-variant: small-caps;
 }
 #printer .booktitle {
-	font-weight: bold;
-	font-size: 120%;
-	font-variant: small-caps;
+    font-weight: bold;
+    font-size: 120%;
+    font-variant: small-caps;
 }
 .foreign {
 }
 .jesuswords {
-	color:#9C2323;
+    color:#9C2323;
 }
 
 .introduction {
-	font-size:80%;
-	text-align:justify;
+    font-size:80%;
+    text-align:justify;
 }
 
 .quotation {
@@ -192,25 +192,25 @@ td.entry + td.entry {
 .poetry {
 }
 .sup {
-	vertical-align: super;
+    vertical-align: super;
 }
 .sub {
-	vertical-align: sub;
+    vertical-align: sub;
 }
 .right {
-	text-align: right;
+    text-align: right;
 }
 .center {
-	text-align: center;
+    text-align: center;
 }
 
 .bold {
-	font-weight:bold;
+    font-weight:bold;
 }
 .illuminated {
 }
 .italic {
-	font-style:italic;
+    font-style:italic;
 }
 .line-through {
     text-decoration: line-through;
@@ -221,7 +221,7 @@ td.entry + td.entry {
    font-variant: small-caps;
 }
 .underline {
-	text-decoration: underline;
+    text-decoration: underline;
 }
 
 .inscription {
@@ -243,10 +243,10 @@ td.entry + td.entry {
 }
 
 .transchange {
-	font-style:italic;
+    font-style:italic;
 }
 .transchange > .added {
-	background-color:inherit;
+    background-color:inherit;
 }
 .transchange > .amplified {
 }
@@ -260,61 +260,61 @@ td.entry + td.entry {
 }
 
 .morphSegmentation {
-	border-right: 2px solid gray;
+    border-right: 2px solid gray;
 }
 
 #infodisplay {
-	margin:0;
-	padding:0;
+    margin:0;
+    padding:0;
 }
 
 #infodisplay .footnoteinfo h3, #infodisplay .strongsinfo h3, #infodisplay .morphinfo h3, #infodisplay .translationinfo h3, #infodisplay .crossrefinfo h3, #infodisplay .moduleinfo h3 {
-	padding:4px 4px 2px 0;
-	color:darkGray;
-	font-weight:bold;
-	border-bottom:1px solid gray;
-	text-align: right;
+    padding:4px 4px 2px 0;
+    color:darkGray;
+    font-weight:bold;
+    border-bottom:1px solid gray;
+    text-align: right;
 }
 
 #infodisplay > p, #infodisplay * > p,
 #infodisplay > .para, #infodisplay * > .para
 { /* We only format the first p child in a special way */
-	text-align:justify !important;
-	color:black;
-	margin:0px;
-	padding:0px;
+    text-align:justify !important;
+    color:black;
+    margin:0px;
+    padding:0px;
 }
 
 /*Required for cross references*/
 #infodisplay .entry {
-	padding:2px;
-	text-align:justify !important;
-	margin-bottom:10px;
-	margin-left:15px;
+    padding:2px;
+    text-align:justify !important;
+    margin-bottom:10px;
+    margin-left:15px;
 }
 #infodisplay .entry[dir=rtl] {
-	text-align: right !important;
+    text-align: right !important;
 }
 #infodisplay .entry .entry { /*No smaller font size for nested entries*/
-	margin:0px;
+    margin:0px;
 }
 #infodisplay .entry .entry[dir=rtl] { /*No smaller font size for nested entries*/
-	text-align: right !important;
+    text-align: right !important;
 }
 #infodisplay .entryname {
-	padding:2px;
-	margin:0px;
-	text-align:left !important;
-	font-weight:bold;
+    padding:2px;
+    margin:0px;
+    text-align:left !important;
+    font-weight:bold;
 }
 
 #infodisplay .rangeheading {
-	color:black;
-	font-weight:bold;
-	margin-left:-10px;
+    color:black;
+    font-weight:bold;
+    margin-left:-10px;
 }
 
 #printer .rangeheading {
-	border-bottom:1px solid black;
-	color:black;
+    border-bottom:1px solid black;
+    color:black;
 }
diff --git a/src/display-templates/Christmastide.css b/src/display-templates/Christmastide.css
index e12385b..bc65e76 100644
--- a/src/display-templates/Christmastide.css
+++ b/src/display-templates/Christmastide.css
@@ -2,100 +2,100 @@
  * Theme by tabthorpe@FreeBSD.org *
  */
 body {
-	background-color: #FDF5E6; /* OldeLaceWhite */
-	color: #006400; /* # DarkGreen */
+    background-color: #FDF5E6; /* OldeLaceWhite */
+    color: #006400; /* # DarkGreen */
 }
 
 #content {
-	margin: 5px;
+    margin: 5px;
 }
 
 #content table {
-	margin:0;
-	padding:0;
-	border-spacing:10px;
-	border-collapse: collapse;
-	vertical-align: top;
+    margin:0;
+    padding:0;
+    border-spacing:10px;
+    border-collapse: collapse;
+    vertical-align: top;
 }
 
 #content table th {
-	padding: 0 0 2px 0;
-	text-align: center;
-	font-weight: bold;
-	font-size: 115%;
+    padding: 0 0 2px 0;
+    text-align: center;
+    font-weight: bold;
+    font-size: 115%;
 }
 
 a {
-	text-decoration:none;
-	font-weight:normal;
-	color: #4A766E; /* # DarkGreenCopper */
-	padding:2px;
+    text-decoration:none;
+    font-weight:normal;
+    color: #4A766E; /* # DarkGreenCopper */
+    padding:2px;
 }
 
 td.entry, div.entry {
-	padding: 5px;
-	vertical-align: top;
+    padding: 5px;
+    vertical-align: top;
 }
 
 div.entry {
-	padding: 5px;
+    padding: 5px;
 }
 
 td.currententry, div.currententry {
-	padding: 5px;
-	vertical-align: top;
-	font-weight:bold;
+    padding: 5px;
+    vertical-align: top;
+    font-weight:bold;
 }
 
 td.entry + td.entry {
-	margin-left: 5px;
+    margin-left: 5px;
 }
 
 div.currententry {
-	font-weight:bold;
-	padding: 5px;
+    font-weight:bold;
+    padding: 5px;
 }
 
 .footnote {
-	color: #2E8B57; /* #SeaGreen */
+    color: #2E8B57; /* #SeaGreen */
 }
 
 .strongnumber {
-	vertical-align: top;
-	font-size: 60%;
-	color: #20B2AA; /* #LightSeaGreen */
+    vertical-align: top;
+    font-size: 60%;
+    color: #20B2AA; /* #LightSeaGreen */
 }
 
 .morphcode {
-	vertical-align: top;
-	font-size: 60%;
-	color: #20B2AA; /* #LightSeaGreen */
+    vertical-align: top;
+    font-size: 60%;
+    color: #20B2AA; /* #LightSeaGreen */
 }
 
 .lemma {
 }
 
 .sectiontitle {
-	font-weight: bold;
-	font-size: 120%;
+    font-weight: bold;
+    font-size: 120%;
 }
 
 .entry + .sectiontitle {
-	margin-top:35px;
-	padding-top:35px;
+    margin-top:35px;
+    padding-top:35px;
 }
 
 .booktitle {
-	font-weight: bold;
-	font-size: 140%;
+    font-weight: bold;
+    font-size: 140%;
 }
 
 .foreign {
 }
 
 .jesuswords {
-	color: red;
-	font-size: 0.9em;
+    color: red;
+    font-size: 0.9em;
 }
 
 .name > .divine {
@@ -109,25 +109,25 @@ div.currententry {
 }
 
 .sup {
-	vertical-align: super;
+    vertical-align: super;
 }
 
 .sub {
-	vertical-align: sub;
+    vertical-align: sub;
 }
 
 .right {
-	text-align: right;
+    text-align: right;
 }
 
 .center {
-	text-align: center;
+    text-align: center;
 }
 
 .bold {
-	font-weight: bold;
+    font-weight: bold;
 }
 
 .italic {
-	font-style: italic;
+    font-style: italic;
 }
diff --git a/src/display-templates/Crazy.css b/src/display-templates/Crazy.css
index 94e9646..e404fc3 100644
--- a/src/display-templates/Crazy.css
+++ b/src/display-templates/Crazy.css
@@ -2,36 +2,36 @@
  * Theme by BibleTime - www.bibletime.info *
  */
 body {
-	background-color: white;
-	color: black;
-	margin:0px;
-	padding:0;
-	padding:1em;
+    background-color: white;
+    color: black;
+    margin:0px;
+    padding:0;
+    padding:1em;
 }
 
 /* content wraps all of the displayed elements */
 #content {
-	margin:0px;
-	padding:0px;
-	font-size:12pt;
-	text-align:justify;
+    margin:0px;
+    padding:0px;
+    font-size:12pt;
+    text-align:justify;
 }
 
 /* The table contains the Bible verses, each verse on an own row, each Bible module in an own column */
 #content > table {
-	margin:0;
-	padding:3px;
-	border-spacing:0;
-	vertical-align:top;
-	text-align:justify;
+    margin:0;
+    padding:3px;
+    border-spacing:0;
+    vertical-align:top;
+    text-align:justify;
 }
 /* The heading contains the name of the module and may contain additional information like the display keys */
 #content > table th {
-	text-shadow:black 1px 1px 3px;
-	font-size:1.3em;
-	background-color:#F0F0F0;
-	padding:8px;
-	border-bottom:1px solid black;
+    text-shadow:black 1px 1px 3px;
+    font-size:1.3em;
+    background-color:#F0F0F0;
+    padding:8px;
+    border-bottom:1px solid black;
 }
 
 #content tr:nth-child(odd) { background-color: white; }
@@ -50,14 +50,14 @@ a:hover { }
  If more than one module (Bibles) was chosen, the entry class applies to "td" elements, one column for a verse
  */
 .entry {
-	padding:0.3em;
+    padding:0.3em;
 }
 table .entry:nth-child(odd) {
-	border-left:10px solid #DEE6F6;
+    border-left:10px solid #DEE6F6;
 }
 
 table .entry:nth-child(even) {
-	border-left:10px solid #E6EEFF;
+    border-left:10px solid #E6EEFF;
 }
 
 #printer .entry { text-indent:15px; }
@@ -68,24 +68,24 @@ table .entry:nth-child(even) {
 /* Special formatting for the block element entries */
 div.entry, td.entry { }
 td.entry, td.currententry {
-	vertical-align:top;
+    vertical-align:top;
 }
 
 /* Currententry is chosen when the entry should be highlighted as the current entry chosen by the user
  currententry may apply to span, div, td (just like .entry)
  */
 .currententry {
-	padding:0.3em;
-	line-height:1.6em;
-	background-color:#D3E5FF;
-	/*border: thin solid black;*/
+    padding:0.3em;
+    line-height:1.6em;
+    background-color:#D3E5FF;
+    /*border: thin solid black;*/
 
 }
 
 table .currententry:nth-child(1) {
-	margin-left:0;
-	border-left:10px solid #99B4FF;
-	/*border-left:10px solid #F5FF6A;*/
+    margin-left:0;
+    border-left:10px solid #99B4FF;
+    /*border-left:10px solid #F5FF6A;*/
 }
 /* .currententry[dir=rtl] { */
 /* } */
@@ -94,24 +94,24 @@ span.currententry { }
 
 /* You may use this to format the space between two columns */
 td.entry + td.entry {
-	margin:0;
+    margin:0;
 }
 
 /* Several additional settings for displaying Bible modules*/
 #bible div.entry {
-	border-left:10px solid white;
+    border-left:10px solid white;
 }
 #bible div.entry[dir=rtl] {
-	border-left:none;
-	border-right:10px solid white;
-	text-align:right;
+    border-left:none;
+    border-right:10px solid white;
+    text-align:right;
 }
 #bible div.currententry {
-	border-left:10px solid #99B4FF;
+    border-left:10px solid #99B4FF;
 }
 #bible div.currententry[dir=rtl] {
-	border-left:none;
-	border-right:10px solid #99B4FF;
+    border-left:none;
+    border-right:10px solid #99B4FF;
 }
 #bible div.currententry, #bible td.currententry { }
 #bible td.currententry { }
@@ -170,12 +170,12 @@ so something like .alternative:before { content:"'"attr(alternative); } is possi
 
 /* A title within the text. This is the formatting which applies to a title of a section, as you can find them in Bibles */
 .sectiontitle {
-	 padding:0.3em;
-	 /*text-shadow:gray 0px 0px 3px;*/
-	 font-size:1.3em;
-	 font-weight:bold;
-	 text-transform:uppercase;
-	 padding-bottom:2px;
+     padding:0.3em;
+     /*text-shadow:gray 0px 0px 3px;*/
+     font-size:1.3em;
+     font-weight:bold;
+     text-transform:uppercase;
+     padding-bottom:2px;
 }
 #printer .sectiontitle { }
 /* You may want to format elements before section titles in a special way. */
@@ -258,7 +258,7 @@ so something like .alternative:before { content:"'"attr(alternative); } is possi
 /* Morph segmentation is a special feature for hebrew to markup the word divisions in the text */
 /* .morphSegmentation { border-left:1px solid red; } */
 .morphSegmentation + .morphSegmentation {
-	border-right: 1px red solid;
+    border-right: 1px red solid;
 }
 
 /* The formatting of all things displayed in the information window */
@@ -271,13 +271,13 @@ so something like .alternative:before { content:"'"attr(alternative); } is possi
 #infodisplay .translationinfo h3,
 #infodisplay .crossrefinfo h3,
 #infodisplay .moduleinfo h3 {
-	font-size:12pt;
-	font-weight:bold;
-	text-transform:uppercase;
-	text-align:right;
-	color:gray;
-	border-bottom:1px solid black;
-	padding:4px;
+    font-size:12pt;
+    font-weight:bold;
+    text-transform:uppercase;
+    text-align:right;
+    color:gray;
+    border-bottom:1px solid black;
+    padding:4px;
 }
 
 #infodisplay > p, #infodisplay * > p { /* We only format the first p child in a special way */
@@ -289,10 +289,10 @@ so something like .alternative:before { content:"'"attr(alternative); } is possi
 #infodisplay .entry .entry { /* No smaller font size for nested entries */
 }
 #infodisplay .entryname {
-	font-weight:bold;
+    font-weight:bold;
 }
 #infodisplay .rangeheading {
-	font-weight:bold;
+    font-weight:bold;
 }
 
 #printer .rangeheading {}
diff --git a/src/display-templates/Green.css b/src/display-templates/Green.css
index cd9e68b..4be46b9 100644
--- a/src/display-templates/Green.css
+++ b/src/display-templates/Green.css
@@ -2,173 +2,173 @@
  * Theme by BibleTime - www.bibletime.info *
  */
 body {
-	background-color: white;
-	color: black;
+    background-color: white;
+    color: black;
 }
 #content {
-	margin:10px;
+    margin:10px;
 }
 
 #content > table {
-	margin: 0;
-	padding: 0;
-	border-spacing:10px;
-	vertical-align:top;
+    margin: 0;
+    padding: 0;
+    border-spacing:10px;
+    vertical-align:top;
 }
 
 #content > table th {
-	padding: 0 0 2px 0;
-	text-align: center;
-	font-weight: bold;
-	font-size: 110%;
-	border-bottom: 1px solid #6B6B6B;
+    padding: 0 0 2px 0;
+    text-align: center;
+    font-weight: bold;
+    font-size: 110%;
+    border-bottom: 1px solid #6B6B6B;
 }
 
 a {
-	text-decoration:none;
-	font-weight:normal;
-	color: #3B11AE;
-	padding:0 2px;
+    text-decoration:none;
+    font-weight:normal;
+    color: #3B11AE;
+    padding:0 2px;
 }
 a:hover {
-	color: #AE1518;
-	padding:0 2px;
+    color: #AE1518;
+    padding:0 2px;
 }
 
 
 /* Settings which apply to all entries in all modules */
 .entry {
-	padding: 3px;
- 	vertical-align: middle;
-	text-align: justify;
+    padding: 3px;
+     vertical-align: middle;
+    text-align: justify;
 }
 #printer .entry {
-	font-size:90%;
-	text-align:left;
+    font-size:90%;
+    text-align:left;
 }
 .entry[dir=rtl] {
-	text-align:right !important;
+    text-align:right !important;
 }
 #printer .entry[dir=rtl] {
-	text-align:right !important;
+    text-align:right !important;
 }
 td.entry, td.currententry {
-	vertical-align:top;
+    vertical-align:top;
 }
 
 /* Keep the values the same as in .entry (take the border into account!) */
 .currententry {
-	padding:3px;
-	text-align:justify;
+    padding:3px;
+    text-align:justify;
 }
 .currententry[dir=rtl] {
-	text-align:right !important;
+    text-align:right !important;
 }
 div.currententry {
 }
 span.currententry {
-	background-color:#D4FFCB;
+    background-color:#D4FFCB;
 }
 
 
 /*Space between the columns of modules displayed side by side*/
 td.entry + td.entry {
-	margin-left: 5px;
+    margin-left: 5px;
 }
 
 /* Several additional settings for display of modules*/
 #bible div.currententry, #bible td.currententry {
-	border:1px solid black;
-	padding:2px;
-	background-color:#F6FFF7;
+    border:1px solid black;
+    padding:2px;
+    background-color:#F6FFF7;
 }
 #bible span.currententry {
-	background-color:#C8FFB6;
+    background-color:#C8FFB6;
 }
 
 /*Same for books!*/
 #book div.currententry, #book td.currententry {
-	border:1px solid black;
-	background-color:#F6FFF7;
+    border:1px solid black;
+    background-color:#F6FFF7;
 }
 #book span.currententry {
-	background-color:#C8FFB6;
+    background-color:#C8FFB6;
 }
 
 
 .entryname {
-	font-size:80%;
-	padding:0 2px 0 0;
-	vertical-align:super;
+    font-size:80%;
+    padding:0 2px 0 0;
+    vertical-align:super;
 }
 .entry[dir=rtl] .entryname, .currententry[dir=rtl] .entryname {
-	padding: 0 0 0 2px;
-	font-size: 80%;
-	vertical-align:super;
+    padding: 0 0 0 2px;
+    font-size: 80%;
+    vertical-align:super;
 }
 .entryname a, #printer .entryname  {
-	vertical-align: middle
+    vertical-align: middle
 }
 
 #printer .entry  .entry, #printer .entry .sectiontitle , #printer .entry .booktitle {
-	padding-top: 0.05em;
-	margin-left: 10px;
+    padding-top: 0.05em;
+    margin-left: 10px;
 }
 
 .footnote {
-	vertical-align:super;
-	color: blue;
-	font-size: 70%;
+    vertical-align:super;
+    color: blue;
+    font-size: 70%;
 }
 .footnote:before { content:"("; }
 .footnote:after { content:")"; }
 
 .crossreference {
-	font-size: 80%;
-	/*vertical-align:middle;*/
-	color: blue;
+    font-size: 80%;
+    /*vertical-align:middle;*/
+    color: blue;
 }
 
 .crossreference a {
-	font-size: 80%;
-	/*vertical-align:middle;*/
-	color: blue;
+    font-size: 80%;
+    /*vertical-align:middle;*/
+    color: blue;
 }
 
 .crossreference a:hover {
-	font-size: 80%;
-	/*vertical-align:middle;*/
-	color: blue;
+    font-size: 80%;
+    /*vertical-align:middle;*/
+    color: blue;
 }
 
 
 
 .sectiontitle {
-	font-weight: bold;
-	font-size: 110%;
+    font-weight: bold;
+    font-size: 110%;
 }
 #printer .sectiontitle {
-	font-weight: bold;
-	font-size: 100%;
+    font-weight: bold;
+    font-size: 100%;
 }
 * + .sectiontitle {
-	margin-top:15px;
+    margin-top:15px;
 }
 
 .booktitle {
-	font-weight: bold;
-	font-size: 120%;
-	font-variant: small-caps;
+    font-weight: bold;
+    font-size: 120%;
+    font-variant: small-caps;
 }
 #printer .booktitle {
-	font-weight: bold;
-	font-size: 120%;
-	font-variant: small-caps;
+    font-weight: bold;
+    font-size: 120%;
+    font-variant: small-caps;
 }
 .foreign {
 }
 .jesuswords {
-	color:#9C2323;
+    color:#9C2323;
 }
 
 .quotation {
@@ -176,25 +176,25 @@ td.entry + td.entry {
 .poetry {
 }
 .sup {
-	vertical-align: super;
+    vertical-align: super;
 }
 .sub {
-	vertical-align: sub;
+    vertical-align: sub;
 }
 .right {
-	text-align: right;
+    text-align: right;
 }
 .center {
-	text-align: center;
+    text-align: center;
 }
 
 .bold {
-	font-weight:bold;
+    font-weight:bold;
 }
 .illuminated {
 }
 .italic {
-	font-style:italic;
+    font-style:italic;
 }
 .line-through {
     text-decoration: line-through;
@@ -205,7 +205,7 @@ td.entry + td.entry {
    font-variant: small-caps;
 }
 .underline {
-	text-decoration: underline;
+    text-decoration: underline;
 }
 
 .inscription {
@@ -227,10 +227,10 @@ td.entry + td.entry {
 }
 
 .transchange {
-	font-style:italic;
+    font-style:italic;
 }
 .transchange > .added {
-	background-color:inherit;
+    background-color:inherit;
 }
 .transchange > .amplified {
 }
@@ -244,57 +244,57 @@ td.entry + td.entry {
 }
 
 .morphSegmentation {
-	border: 1px solid gray;
-	margin-top: 1px; /* Don`t let the boxes touch here, between the lines */
-	margin-left: -1px; /* But here, for better reading of the text,
-											this will only occur within a word consisting of several segments.*/
-	margin-right: 0px;
+    border: 1px solid gray;
+    margin-top: 1px; /* Don`t let the boxes touch here, between the lines */
+    margin-left: -1px; /* But here, for better reading of the text,
+                                            this will only occur within a word consisting of several segments.*/
+    margin-right: 0px;
 }
 
 #infodisplay {
-	margin:0;
-	padding:0;
+    margin:0;
+    padding:0;
 }
 
 #infodisplay .footnoteinfo h3, #infodisplay .strongsinfo h3, #infodisplay .morphinfo h3, #infodisplay .translationinfo h3, #infodisplay .crossrefinfo h3, #infodisplay .moduleinfo h3 {
-	padding:4px 4px 2px 0;
-	color:darkGray;
-	font-weight:bold;
-	border-bottom:1px solid gray;
-	text-align:left !important;
+    padding:4px 4px 2px 0;
+    color:darkGray;
+    font-weight:bold;
+    border-bottom:1px solid gray;
+    text-align:left !important;
 }
 
 #infodisplay > p, #infodisplay  * > p { /* We only format the first p child in a special way */
-	text-align:justify;
-	color:black;
-	margin:0px;
-	padding:0px;
+    text-align:justify;
+    color:black;
+    margin:0px;
+    padding:0px;
 }
 
 /*Required for cross references*/
 #infodisplay .entry {
-	padding:2px;
-	text-align:justify;
-	margin-bottom:10px;
-	margin-left:15px;
+    padding:2px;
+    text-align:justify;
+    margin-bottom:10px;
+    margin-left:15px;
 }
 #infodisplay .entry .entry { /*No smaller font size for nested entries*/
-	margin:0px;
+    margin:0px;
 }
 #infodisplay .entryname {
-	padding:2px;
-	margin:0px;
-	text-align:left;
-	font-weight:bold;
+    padding:2px;
+    margin:0px;
+    text-align:left;
+    font-weight:bold;
 }
 
 #infodisplay .rangeheading {
-	color:black;
-	font-weight:bold;
-	margin-left:-10px;
+    color:black;
+    font-weight:bold;
+    margin-left:-10px;
 }
 
 #printer .rangeheading {
-	border-bottom:1px solid black;
-	color:black;
+    border-bottom:1px solid black;
+    color:black;
 }
diff --git a/src/display-templates/HighContrast.css b/src/display-templates/HighContrast.css
index 3652b74..0dd1053 100644
--- a/src/display-templates/HighContrast.css
+++ b/src/display-templates/HighContrast.css
@@ -2,70 +2,70 @@
  * Theme by BibleTime - www.bibletime.info
  */
 * {
-	/* To work around a KDE 3.2 bug / problem */
-	/* background-color:white; #this seems to break*/
+    /* To work around a KDE 3.2 bug / problem */
+    /* background-color:white; #this seems to break*/
 }
 
 body {
-	background-color: white;
-	color: black;
+    background-color: white;
+    color: black;
 }
 #content {
-	margin: 10px;
+    margin: 10px;
 }
 #content > table {
-	margin: 0;
-	padding: 0;
-	border-spacing:10px;
-	vertical-align:top;
+    margin: 0;
+    padding: 0;
+    border-spacing:10px;
+    vertical-align:top;
 }
 #content > table th {
-	padding: 0 0 2px 0;
-	text-align: center;
-	/*font-weight: bold;*/
-	font-size: 110%;
-	border-bottom: 1px solid #6B6B6B;
+    padding: 0 0 2px 0;
+    text-align: center;
+    /*font-weight: bold;*/
+    font-size: 110%;
+    border-bottom: 1px solid #6B6B6B;
 }
 
 a {
-	text-decoration:none;
-	font-weight:normal;
-	/*color: #F98100;*/
-	padding:1px;
+    text-decoration:none;
+    font-weight:normal;
+    /*color: #F98100;*/
+    padding:1px;
 }
 a:hover {
-	color: #FF0000;
-	padding:1px;
-	text-decoration:underline;
+    color: #FF0000;
+    padding:1px;
+    text-decoration:underline;
 }
 
 /* Settings which apply to all entries in all modules */
 .entry {
-	padding: 2px;
-	/*vertical-align: top;*/
-	text-align: justify;
+    padding: 2px;
+    /*vertical-align: top;*/
+    text-align: justify;
 }
 #printer .entry {
-	font-size: 90%;
-	text-align: left;
+    font-size: 90%;
+    text-align: left;
 }
 .entry[dir=rtl],#printer .entry[dir=rtl]  {
-	text-align: right;
+    text-align: right;
 }
 div.entry, td.entry, td.currententry {
-	vertical-align:top;
+    vertical-align:top;
 }
 
 /* Keep the values the same as in .entry (take the border into account!) */
 .currententry {
-	padding: 2px;
-	text-align: justify;
-	/*color:white;*/
-	/*The background colour of selected text as of kde 3.5.2*/
-	background-color: #A5A5FF;
+    padding: 2px;
+    text-align: justify;
+    /*color:white;*/
+    /*The background colour of selected text as of kde 3.5.2*/
+    background-color: #A5A5FF;
 }
 .currententry[dir=rtl] {
-	text-align: right;
+    text-align: right;
 }
 div.currententry {
 }
@@ -76,113 +76,113 @@ span.currententry {
 
 /*Space between the columns of modules displayed side by side*/
 td.entry + td.entry {
-	margin-left: 5px;
+    margin-left: 5px;
 }
 
 /* Several additional settings for display of modules*/
 #bible div.currententry, #bible td.currententry {
-	/*border: 1px solid black;*/
-	padding: 4px;
+    /*border: 1px solid black;*/
+    padding: 4px;
 }
 #bible span.currententry {
 }
 
 /*Same for books!*/
 #book div.currententry, #book td.currententry {
-	border: 1px solid black;
+    border: 1px solid black;
 }
 #book span.currententry {
 }
 
 .entryname {
- 	font-size:70%;
-	padding:0 1px 0 0;
-	vertical-align:top;
-	/*color: #F98100;*/
-	color: black;
-	/*font-style: italic;*/
+     font-size:70%;
+    padding:0 1px 0 0;
+    vertical-align:top;
+    /*color: #F98100;*/
+    color: black;
+    /*font-style: italic;*/
 }
 .entry[dir=rtl] .entryname, .currententry[dir=rtl] .entryname {
-	padding:0 0 0 1px;
-	font-size:60%;
-	/*vertical-align:top; */
+    padding:0 0 0 1px;
+    font-size:60%;
+    /*vertical-align:top; */
 }
 .entryname a, #printer .entryname  {
-	vertical-align: top;
-	font-size: 100%;
-	font-weight: bold;
-	color: black;
+    vertical-align: top;
+    font-size: 100%;
+    font-weight: bold;
+    color: black;
 }
 
 #printer .entry  .entry, #printer .entry .sectiontitle , #printer .entry .booktitle {
-	padding-top:0.05em;
-	margin-left:10px;
+    padding-top:0.05em;
+    margin-left:10px;
 }
 
 .footnote {
-	vertical-align:super;
-	font-weight:bold;
-	/*color: #00B7FF;*/ /*This one is kind of blinding on white*/
-	/*color: #F98100;*/
-	font-size:80%;
-	color: black;
+    vertical-align:super;
+    font-weight:bold;
+    /*color: #00B7FF;*/ /*This one is kind of blinding on white*/
+    /*color: #F98100;*/
+    font-size:80%;
+    color: black;
 }
 
 
 .footnote:before {
-	content: "(";
+    content: "(";
 }
 
 .footnote:after {
-	content: ")";
+    content: ")";
 }
 
 .crossreference {
-	font-size: 80%;
-	/*vertical-align:middle;*/
-	/*color: blue;*/
-	/*color: #F98100;*/
+    font-size: 80%;
+    /*vertical-align:middle;*/
+    /*color: blue;*/
+    /*color: #F98100;*/
 }
 
 .crossreference:before {
-	content: "[";
+    content: "[";
 }
 
 .crosreference:after {
-	content: "]";
+    content: "]";
 }
 
 .sectiontitle {
-	font-weight: bold;
-	font-size: 110%;
+    font-weight: bold;
+    font-size: 110%;
 }
 #printer .sectiontitle {
-	font-weight: bold;
-	font-size: 100%;
+    font-weight: bold;
+    font-size: 100%;
 }
 * + .sectiontitle {
-	margin-top:15px;
+    margin-top:15px;
 }
 
 .booktitle {
-	font-weight: bold;
-	font-size: 120%;
-	font-variant: small-caps;
+    font-weight: bold;
+    font-size: 120%;
+    font-variant: small-caps;
 }
 #printer .booktitle {
-	font-weight: bold;
-	font-size: 120%;
-	font-variant: small-caps;
+    font-weight: bold;
+    font-size: 120%;
+    font-variant: small-caps;
 }
 .foreign {
 }
 .jesuswords {
-	/*color:red;*/
-	/*color: #7500AC;*/
-	/*color: #F98100;*/
-	font-style:italic;
-	/*font-weight: bold;*/
-	font-size:0.9em;
+    /*color:red;*/
+    /*color: #7500AC;*/
+    /*color: #F98100;*/
+    font-style:italic;
+    /*font-weight: bold;*/
+    font-size:0.9em;
 }
 
 .quotation {
@@ -190,25 +190,25 @@ td.entry + td.entry {
 .poetry {
 }
 .sup {
-	vertical-align: super;
+    vertical-align: super;
 }
 .sub {
-	vertical-align: sub;
+    vertical-align: sub;
 }
 .right {
-	text-align: right;
+    text-align: right;
 }
 .center {
-	text-align: center;
+    text-align: center;
 }
 
 .bold {
-	font-weight:bold;
+    font-weight:bold;
 }
 .illuminated {
 }
 .italic {
-	font-style:italic;
+    font-style:italic;
 }
 .line-through {
     text-decoration: line-through;
@@ -219,7 +219,7 @@ td.entry + td.entry {
    font-variant: small-caps;
 }
 .underline {
-	text-decoration: underline;
+    text-decoration: underline;
 }
 
 .inscription {
@@ -241,10 +241,10 @@ td.entry + td.entry {
 }
 
 .transchange {
-	font-style:italic;
+    font-style:italic;
 }
 .transchange > .added {
-	background-color:inherit;
+    background-color:inherit;
 }
 .transchange > .amplified {
 }
@@ -258,55 +258,55 @@ td.entry + td.entry {
 }
 
 .morphSegmentation {
-	border: 1px solid grey;
-	margin-top: 1px; /* Don`t let the boxes touch here, between the lines */
-	margin-left: -1px; /* But here, for better reading of the text,
-											this will only occur within a word consisting of several segments.*/
-	margin-right: 0px;
+    border: 1px solid grey;
+    margin-top: 1px; /* Don`t let the boxes touch here, between the lines */
+    margin-left: -1px; /* But here, for better reading of the text,
+                                            this will only occur within a word consisting of several segments.*/
+    margin-right: 0px;
 }
 
 #infodisplay {
-	margin:0;
-	padding:0;
+    margin:0;
+    padding:0;
 }
 
 #infodisplay .footnoteinfo h3, #infodisplay .strongsinfo h3, #infodisplay .morphinfo h3, #infodisplay .translationinfo h3, #infodisplay .crossrefinfo h3, #infodisplay .moduleinfo h3 {
-	padding: 2px 0 0 0;
-	color: black;
-	font-weight: bold;
-	border-bottom: 1px solid black;
-	margin: 0 0 3px 0;
+    padding: 2px 0 0 0;
+    color: black;
+    font-weight: bold;
+    border-bottom: 1px solid black;
+    margin: 0 0 3px 0;
 }
 
 #infodisplay > p { /* We only format the first p child in a special way */
-	color: black;
-	margin: 0px;
-	padding: 0px;
+    color: black;
+    margin: 0px;
+    padding: 0px;
 }
 
 /*Required for cross references*/
 #infodisplay .entry {
-	padding: 2px;
-	text-align: justify;
-	margin: 0 0 10px 10px;
+    padding: 2px;
+    text-align: justify;
+    margin: 0 0 10px 10px;
 }
 #infodisplay .entry .entry { /*No smaller font size for nested entries*/
-	margin: 0px;
+    margin: 0px;
 }
 #infodisplay .entryname {
-	padding: 2px;
-	margin: 0px;
-	text-align: left;
-	font-weight: bold;
+    padding: 2px;
+    margin: 0px;
+    text-align: left;
+    font-weight: bold;
 }
 
 #infodisplay .rangeheading {
-	color: black;
-	font-weight: bold;
-	margin-left: -5px;
+    color: black;
+    font-weight: bold;
+    margin-left: -5px;
 }
 
 #printer .rangeheading {
-	border-bottom: 1px solid black;
-	color: black;
+    border-bottom: 1px solid black;
+    color: black;
 }
diff --git a/src/display-templates/Simple.css b/src/display-templates/Simple.css
index ed2e976..32ec57f 100644
--- a/src/display-templates/Simple.css
+++ b/src/display-templates/Simple.css
@@ -2,90 +2,90 @@
  * Theme by BibleTime
  */
 body {
-	background-color: white;
-	color: black;
+    background-color: white;
+    color: black;
 }
 #content {
-	margin: 5px;
+    margin: 5px;
 }
 #content table {
-	margin:0;
-	padding:0;
-	border-spacing:10px;
-	border-collapse: collapse;
-	vertical-align: top;
+    margin:0;
+    padding:0;
+    border-spacing:10px;
+    border-collapse: collapse;
+    vertical-align: top;
 }
 #content table th {
-	padding: 0 0 2px 0;
-	text-align: center;
-	font-weight: bold;
-	font-size: 115%;
+    padding: 0 0 2px 0;
+    text-align: center;
+    font-weight: bold;
+    font-size: 115%;
 }
 
 a {
-	text-decoration:none;
-	font-weight:normal;
-	color: blue;
-	padding:2px;
+    text-decoration:none;
+    font-weight:normal;
+    color: blue;
+    padding:2px;
 }
 
 td.entry, div.entry {
-	padding: 5px;
-	vertical-align: top;
+    padding: 5px;
+    vertical-align: top;
 }
 div.entry {
-	padding: 5px;
+    padding: 5px;
 }
 
 td.currententry, div.currententry {
-	padding: 5px;
-	vertical-align: top;
-	font-weight:bold;
+    padding: 5px;
+    vertical-align: top;
+    font-weight:bold;
 }
 td.entry + td.entry {
-	margin-left: 5px;
+    margin-left: 5px;
 }
 div.currententry {
-	font-weight:bold;
-	/*vertical-align: middle;*/
-	padding: 5px;
+    font-weight:bold;
+    /*vertical-align: middle;*/
+    padding: 5px;
 }
 
 .footnote {
-	color: gray;
+    color: gray;
 }
 
 .strongnumber {
-	vertical-align: top;
-	font-size: 60%;
-	color: blue;
+    vertical-align: top;
+    font-size: 60%;
+    color: blue;
 }
 .morphcode {
-	vertical-align: top;
-	font-size: 60%;
-	color: blue;
+    vertical-align: top;
+    font-size: 60%;
+    color: blue;
 }
 .lemma {
 }
 
 .sectiontitle {
-	font-weight: bold;
-	font-size: 120%;
+    font-weight: bold;
+    font-size: 120%;
 }
 .entry + .sectiontitle {
-	margin-top:35px;
-	padding-top:35px;
+    margin-top:35px;
+    padding-top:35px;
 }
 
 .booktitle {
-	font-weight: bold;
-	font-size: 140%;
+    font-weight: bold;
+    font-size: 140%;
 }
 .foreign {
 }
 .jesuswords {
-	color: red;
-	font-size: 0.9em;
+    color: red;
+    font-size: 0.9em;
 }
 
 .name > .divine {
@@ -97,22 +97,22 @@ div.currententry {
 .poetry {
 }
 .sup {
-	vertical-align: super;
+    vertical-align: super;
 }
 .sub {
-	vertical-align: sub;
+    vertical-align: sub;
 }
 .right {
-	text-align: right;
+    text-align: right;
 }
 .center {
-	text-align: center;
+    text-align: center;
 }
 /*TODO: Think of something better here since this will get confusing*/
-/*	on verses but, is needed for things inthe Mag/Info window*/
+/*    on verses but, is needed for things inthe Mag/Info window*/
 .bold {
-	font-weight: bold;
+    font-weight: bold;
 }
 .italic {
-	font-style: italic;
+    font-style: italic;
 }
diff --git a/src/frontend/bookmarks/btbookmarkfolder.cpp b/src/frontend/bookmarks/btbookmarkfolder.cpp
index af027a9..3088e99 100644
--- a/src/frontend/bookmarks/btbookmarkfolder.cpp
+++ b/src/frontend/bookmarks/btbookmarkfolder.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -10,11 +10,12 @@
 #include "frontend/bookmarks/btbookmarkfolder.h"
 
 #include <QFileDialog>
+#include "bibletimeapp.h"
 #include "frontend/bookmarks/btbookmarkitembase.h"
 #include "frontend/bookmarks/btbookmarkitem.h"
 #include "frontend/bookmarks/btbookmarkloader.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
+#include "util/geticon.h"
 
 
 BtBookmarkFolder::BtBookmarkFolder(const QString &name, QTreeWidgetItem *parent)
@@ -77,12 +78,9 @@ void BtBookmarkFolder::rename() {
 }
 
 void BtBookmarkFolder::update() {
-    namespace DU = util::directory;
-
-    if (isExpanded() && childCount())
-        setIcon(0, DU::getIcon(CResMgr::mainIndex::openedFolder::icon));
-    else
-        setIcon(0, DU::getIcon(CResMgr::mainIndex::closedFolder::icon));
+    setIcon(0, util::getIcon(isExpanded() && childCount()
+                             ? CResMgr::mainIndex::openedFolder::icon
+                             : CResMgr::mainIndex::closedFolder::icon));
 }
 
 bool BtBookmarkFolder::hasDescendant(QTreeWidgetItem* item) const {
diff --git a/src/frontend/bookmarks/btbookmarkfolder.h b/src/frontend/bookmarks/btbookmarkfolder.h
index 20388df..4f7c80c 100644
--- a/src/frontend/bookmarks/btbookmarkfolder.h
+++ b/src/frontend/bookmarks/btbookmarkfolder.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/bookmarks/btbookmarkitem.cpp b/src/frontend/bookmarks/btbookmarkitem.cpp
index 639d33e..952be22 100644
--- a/src/frontend/bookmarks/btbookmarkitem.cpp
+++ b/src/frontend/bookmarks/btbookmarkitem.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -10,14 +10,16 @@
 #include "frontend/bookmarks/btbookmarkitem.h"
 
 #include <QSharedPointer>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
+#include "backend/managers/cswordbackend.h"
 #include "backend/drivers/cswordmoduleinfo.h"
 #include "backend/keys/cswordversekey.h"
+#include "bibletimeapp.h"
 #include "btglobal.h"
 #include "frontend/bookmarks/btbookmarkfolder.h"
 #include "frontend/bookmarks/bteditbookmarkdialog.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
+#include "util/geticon.h"
 
 
 BtBookmarkItem::BtBookmarkItem(const CSwordModuleInfo *module,
@@ -81,7 +83,7 @@ QString BtBookmarkItem::toolTip() const {
         return QString::null;
     }
 
-    FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults();
+    FilterOptions filterOptions = btConfig().getFilterOptions();
     filterOptions.footnotes = false;
     filterOptions.scriptureReferences = false;
     CSwordBackend::instance()->setFilterOptions(filterOptions);
@@ -91,7 +93,7 @@ QString BtBookmarkItem::toolTip() const {
     k->setKey(key());
 
     // const CLanguageMgr::Language* lang = module()->language();
-    // CBTConfig::FontSettingsPair fontPair = CBTConfig::get(lang);
+    // BtConfig::FontSettingsPair fontPair = getBtConfig().getFontForLanguage(lang);
 
     Q_ASSERT(k.data());
     QString header = QString::fromLatin1("%1 (%2)")
@@ -134,9 +136,7 @@ void BtBookmarkItem::rename() {
 }
 
 void BtBookmarkItem::update() {
-    namespace DU = util::directory;
-
-    setIcon(0, DU::getIcon(CResMgr::mainIndex::bookmark::icon));
+    setIcon(0, util::getIcon(CResMgr::mainIndex::bookmark::icon));
 
     if (m_title.isEmpty()) {
       m_title = QString::fromLatin1("%1 (%2)").arg(key()).arg(module() ? module()->name() : QObject::tr("unknown"));
diff --git a/src/frontend/bookmarks/btbookmarkitem.h b/src/frontend/bookmarks/btbookmarkitem.h
index 89fd412..932d4e0 100644
--- a/src/frontend/bookmarks/btbookmarkitem.h
+++ b/src/frontend/bookmarks/btbookmarkitem.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/bookmarks/btbookmarkitembase.h b/src/frontend/bookmarks/btbookmarkitembase.h
index 2ae1430..630d018 100644
--- a/src/frontend/bookmarks/btbookmarkitembase.h
+++ b/src/frontend/bookmarks/btbookmarkitembase.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/bookmarks/btbookmarkloader.cpp b/src/frontend/bookmarks/btbookmarkloader.cpp
index daebfe1..63e0797 100644
--- a/src/frontend/bookmarks/btbookmarkloader.cpp
+++ b/src/frontend/bookmarks/btbookmarkloader.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/bookmarks/btbookmarkloader.h b/src/frontend/bookmarks/btbookmarkloader.h
index 8b819ce..25b56b8 100644
--- a/src/frontend/bookmarks/btbookmarkloader.h
+++ b/src/frontend/bookmarks/btbookmarkloader.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/bookmarks/bteditbookmarkdialog.cpp b/src/frontend/bookmarks/bteditbookmarkdialog.cpp
index 614498f..1291f56 100644
--- a/src/frontend/bookmarks/bteditbookmarkdialog.cpp
+++ b/src/frontend/bookmarks/bteditbookmarkdialog.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,9 +16,10 @@
 #include <QLineEdit>
 #include <QTextEdit>
 #include <QWidget>
+#include "bibletimeapp.h"
 #include "util/cresmgr.h"
-#include "util/dialogutil.h"
-#include "util/directory.h"
+#include "frontend/messagedialog.h"
+#include "util/geticon.h"
 
 
 BtEditBookmarkDialog::BtEditBookmarkDialog(const QString &key,
@@ -28,12 +29,10 @@ BtEditBookmarkDialog::BtEditBookmarkDialog(const QString &key,
                                            Qt::WindowFlags wflags)
     : QDialog(parent, wflags)
 {
-    namespace DU = util::directory;
-
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
 
     resize(400, 300);
-    setWindowIcon(DU::getIcon(CResMgr::mainIndex::bookmark::icon));
+    setWindowIcon(util::getIcon(CResMgr::mainIndex::bookmark::icon));
 
     m_layout = new QFormLayout;
 
@@ -57,7 +56,7 @@ BtEditBookmarkDialog::BtEditBookmarkDialog(const QString &key,
                                        | QDialogButtonBox::Ok,
                                        Qt::Horizontal,
                                        this);
-    util::prepareDialogBox(m_buttonBox);
+    message::prepareDialogBox(m_buttonBox);
     mainLayout->addWidget(m_buttonBox);
 
     QObject::connect(m_buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
diff --git a/src/frontend/bookmarks/bteditbookmarkdialog.h b/src/frontend/bookmarks/bteditbookmarkdialog.h
index c3455e2..674ccdf 100644
--- a/src/frontend/bookmarks/bteditbookmarkdialog.h
+++ b/src/frontend/bookmarks/bteditbookmarkdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/bookmarks/cbookmarkindex.cpp b/src/frontend/bookmarks/cbookmarkindex.cpp
index 15f272c..1b697d0 100644
--- a/src/frontend/bookmarks/cbookmarkindex.cpp
+++ b/src/frontend/bookmarks/cbookmarkindex.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -28,9 +28,10 @@
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 #include <QToolTip>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/drivers/cswordmoduleinfo.h"
 #include "backend/managers/referencemanager.h"
+#include "bibletimeapp.h"
 #include "frontend/cdragdrop.h"
 #include "frontend/cinfodisplay.h"
 #include "frontend/cprinter.h"
@@ -38,11 +39,12 @@
 #include "frontend/bookmarks/btbookmarkitem.h"
 #include "frontend/bookmarks/btbookmarkfolder.h"
 #include "frontend/bookmarks/btbookmarkloader.h"
+#include "frontend/messagedialog.h"
 #include "frontend/searchdialog/csearchdialog.h"
 #include "util/cresmgr.h"
 #include "util/tool.h"
 #include "util/directory.h"
-#include "util/dialogutil.h"
+#include "util/geticon.h"
 #include "bibletime.h"
 
 
@@ -52,7 +54,7 @@ CBookmarkIndex::CBookmarkIndex(QWidget *parent)
         m_previousEventItem(0) {
     setMouseTracking(true);
     m_magTimer.setSingleShot(true);
-    m_magTimer.setInterval(CBTConfig::get(CBTConfig::magDelay));
+    m_magTimer.setInterval(btConfig().value<int>("GUI/magDelay", 400));
     setContextMenuPolicy(Qt::CustomContextMenu);
     initView();
     initConnections();
@@ -126,12 +128,11 @@ void CBookmarkIndex::initView() {
 * than to modify all QAction constructors.
 */
 QAction* CBookmarkIndex::newQAction(const QString& text, const QString& pix, const int /*shortcut*/, const QObject* receiver, const char* slot, QObject* parent) {
-    namespace DU = util::directory;
     QAction *action;
     if (pix.isEmpty()) {
         action = new QAction(text, parent);
     } else {
-        action = new QAction(DU::getIcon(pix), text, parent);
+        action = new QAction(util::getIcon(pix), text, parent);
     }
     QObject::connect(action, SIGNAL(triggered()), receiver, slot);
     return action;
@@ -681,7 +682,7 @@ void CBookmarkIndex::printBookmarks() {
         return;
     }
     QSharedPointer<Printing::CPrinter> printer(
-        new Printing::CPrinter( this, CBTConfig::getDisplayOptionDefaults(), CBTConfig::getFilterOptionDefaults() )
+        new Printing::CPrinter( this, btConfig().getDisplayOptions(), btConfig().getFilterOptions() )
     );
     printer->printKeyTree(tree);
 }
@@ -699,7 +700,7 @@ void CBookmarkIndex::deleteEntries(bool confirm) {
             }
         }
 
-        if (util::showQuestion(this, tr("Delete Items"),
+        if (message::showQuestion(this, tr("Delete Items"),
                                tr("Do you really want to delete the selected items and child-items?"),
                                QMessageBox::Yes | QMessageBox::No, QMessageBox::No )
                 != QMessageBox::Yes) {
diff --git a/src/frontend/bookmarks/cbookmarkindex.h b/src/frontend/bookmarks/cbookmarkindex.h
index 2875a5d..df4a1c6 100644
--- a/src/frontend/bookmarks/cbookmarkindex.h
+++ b/src/frontend/bookmarks/cbookmarkindex.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/bookshelfmanager/btconfigdialog.cpp b/src/frontend/bookshelfmanager/btconfigdialog.cpp
index 3b82560..e5d0fd1 100644
--- a/src/frontend/bookshelfmanager/btconfigdialog.cpp
+++ b/src/frontend/bookshelfmanager/btconfigdialog.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/bookshelfmanager/btconfigdialog.h b/src/frontend/bookshelfmanager/btconfigdialog.h
index e90c3ed..2525bd8 100644
--- a/src/frontend/bookshelfmanager/btconfigdialog.h
+++ b/src/frontend/bookshelfmanager/btconfigdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/bookshelfmanager/btinstallmgr.cpp b/src/frontend/bookshelfmanager/btinstallmgr.cpp
deleted file mode 100644
index 652ff04..0000000
--- a/src/frontend/bookshelfmanager/btinstallmgr.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#include "frontend/bookshelfmanager/btinstallmgr.h"
-
-#include "backend/managers/cswordbackend.h"
-#include "backend/btinstallbackend.h"
-#include <QList>
-#include <QObject>
-#include <QString>
-#include <QStringList>
-
-// Sword includes:
-#include <installmgr.h>
-#include <ftptrans.h>
-
-
-using namespace sword;
-
-BtInstallMgr::BtInstallMgr()
-        : InstallMgr(BtInstallBackend::configPath().toLatin1(), this),
-        m_totalBytes(1), m_completedBytes(0), m_firstCallOfPreStatus(true)
-{ //use this class also as status reporter
-    this->setFTPPassive(true);
-}
-
-BtInstallMgr::~BtInstallMgr() {
-    //doesn't really help because it only sets a flag
-    terminate(); //make sure to close the connection
-}
-
-bool BtInstallMgr::isUserDisclaimerConfirmed() const {
-    // \todo Check from config if it's been confirmed with "don't show this anymore" checked.
-    // Create a dialog with the message, checkbox and Continue/Cancel, Cancel as default.
-    return true;
-}
-
-void BtInstallMgr::statusUpdate(double dltotal, double dlnow) {
-    if (dlnow > dltotal)
-        dlnow = dltotal;
-
-    int totalPercent = (int)((float)(dlnow + m_completedBytes) / (float)(m_totalBytes) * 100.0);
-
-    if (totalPercent > 100) {
-        totalPercent = 100;
-    }
-    else if (totalPercent < 0) {
-        totalPercent = 0;
-    }
-
-    int filePercent  = (int)((float)(dlnow) / (float)(dltotal + 1) * 100.0);
-    if (filePercent > 100) {
-        filePercent = 100;
-    }
-    else if (filePercent < 0) {
-        filePercent = 0;
-    }
-    //qApp->processEvents();
-    emit percentCompleted(totalPercent, filePercent);
-}
-
-
-void BtInstallMgr::preStatus(long totalBytes, long completedBytes, const char* message) {
-    if (m_firstCallOfPreStatus) {
-        m_firstCallOfPreStatus = false;
-        emit downloadStarted();
-    }
-    m_completedBytes = completedBytes;
-    m_totalBytes = (totalBytes > 0) ? totalBytes : 1; //avoid division by zero
-}
diff --git a/src/frontend/bookshelfmanager/btinstallmgr.h b/src/frontend/bookshelfmanager/btinstallmgr.h
deleted file mode 100644
index 7d39440..0000000
--- a/src/frontend/bookshelfmanager/btinstallmgr.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#ifndef NEWBTINSTALLMGR_H
-#define NEWBTINSTALLMGR_H
-
-#include <QObject>
-
-#include <QList>
-#include <QString>
-#include <QStringList>
-
-// Sword includes:
-#include <installmgr.h>
-#include <ftptrans.h>
-
-
-/**
-* Our own reimplementation to provide installation and status bar updates.
-*/
-class BtInstallMgr : public QObject, public sword::InstallMgr, public sword::StatusReporter {
-        Q_OBJECT
-    public:
-        BtInstallMgr();
-        ~BtInstallMgr();
-
-        /** Re-implemented from sword::InstallMgr. */
-        bool isUserDisclaimerConfirmed() const;
-
-    signals:
-        /** Download status. Percent of total and file.*/
-        void percentCompleted(const int total, const int file);
-        void downloadStarted();
-
-    protected:
-        /**
-          Reimplementation of sword::StatusReporter::statusUpdate().
-        */
-        void statusUpdate(double dltotal, double dlnow);
-
-        /**
-        * Reimplementation of sword::StatusReporter::preStatus().
-        * \warning This method is not always called before statusUpdate().
-        * Called before starting to download each file of the module package.
-        * The sword message is not i18n'ed, it's in the form "Downloading (1 of 6): nt.bzs".
-        * This function is not utilized in the UI ATM.
-        */
-        void preStatus(long totalBytes, long completedBytes, const char *message);
-
-    private:
-        long m_totalBytes;
-        long m_completedBytes;
-        bool m_firstCallOfPreStatus;
-};
-
-#endif
diff --git a/src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp b/src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp
index 42febaa..8eebde6 100644
--- a/src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp
+++ b/src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp
@@ -2,20 +2,24 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
 
 #include "frontend/bookshelfmanager/btmodulemanagerdialog.h"
 
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/managers/cswordbackend.h"
 #include "frontend/bookshelfmanager/indexpage/btindexpage.h"
 #include "frontend/bookshelfmanager/installpage/btinstallpage.h"
 #include "frontend/bookshelfmanager/removepage/btremovepage.h"
 
 
+namespace {
+const QString GeometryKey = "GUI/BookshelfManager/ModuleManagerDialog/geometry";
+} // anonymous namespace
+
 static BtModuleManagerDialog *m_staticModuleManagerDialog = 0;
 
 BtModuleManagerDialog* BtModuleManagerDialog::getInstance(QWidget *parent,
@@ -59,13 +63,9 @@ BtModuleManagerDialog::~BtModuleManagerDialog() {
 }
 
 void BtModuleManagerDialog::loadDialogSettings() {
-    resize(CBTConfig::get(CBTConfig::bookshelfWidth), CBTConfig::get(CBTConfig::bookshelfHeight));
-    move(CBTConfig::get(CBTConfig::bookshelfPosX), CBTConfig::get(CBTConfig::bookshelfPosY));
+    restoreGeometry(btConfig().value<QByteArray>(GeometryKey, QByteArray()));
 }
 
 void BtModuleManagerDialog::saveDialogSettings() const {
-    CBTConfig::set(CBTConfig::bookshelfWidth, size().width());
-    CBTConfig::set(CBTConfig::bookshelfHeight, size().height());
-    CBTConfig::set(CBTConfig::bookshelfPosX, x());
-    CBTConfig::set(CBTConfig::bookshelfPosY, y());
+    btConfig().setValue(GeometryKey, saveGeometry());
 }
diff --git a/src/frontend/bookshelfmanager/btmodulemanagerdialog.h b/src/frontend/bookshelfmanager/btmodulemanagerdialog.h
index 01ef594..4d94026 100644
--- a/src/frontend/bookshelfmanager/btmodulemanagerdialog.h
+++ b/src/frontend/bookshelfmanager/btmodulemanagerdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp b/src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp
index f40d8c3..646efab 100644
--- a/src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp
+++ b/src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -25,10 +25,13 @@
 #include <QProgressDialog>
 #include <QApplication>
 #include "backend/btinstallbackend.h"
-#include "util/dialogutil.h"
+#include "frontend/messagedialog.h"
 
 const QString PROTO_FILE( QObject::tr("Local") ); //Local path
-const QString PROTO_FTP( QObject::tr("Remote") ); //Remote path
+const QString PROTO_FTP( QObject::tr("Remote FTP") ); //Remote path
+const QString PROTO_SFTP( QObject::tr("Remote SFTP") );
+const QString PROTO_HTTP( QObject::tr("Remote HTTP") );
+const QString PROTO_HTTPS( QObject::tr("Remote HTTPS") );
 
 CSwordSetupInstallSourcesDialog::CSwordSetupInstallSourcesDialog(/*QWidget *parent*/)
         : QDialog(),
@@ -39,7 +42,7 @@ CSwordSetupInstallSourcesDialog::CSwordSetupInstallSourcesDialog(/*QWidget *pare
     mainLayout->setMargin( 10 );
     mainLayout->setSpacing( 5 );
 
-    QHBoxLayout *captionLayout = new QHBoxLayout( this );
+    QHBoxLayout *captionLayout = new QHBoxLayout;
     mainLayout->addLayout(captionLayout);
     QLabel *label = new QLabel( tr("Caption"), this );
     captionLayout->addWidget( label );
@@ -50,7 +53,7 @@ CSwordSetupInstallSourcesDialog::CSwordSetupInstallSourcesDialog(/*QWidget *pare
 
     mainLayout->addSpacing( 10 );
 
-    QGridLayout* layout = new QGridLayout( this );
+    QGridLayout* layout = new QGridLayout;
     layout->setSpacing(3);
     layout->setMargin(3);
     mainLayout->addLayout(layout);
@@ -68,6 +71,9 @@ CSwordSetupInstallSourcesDialog::CSwordSetupInstallSourcesDialog(/*QWidget *pare
     m_protocolCombo = new QComboBox( this );
     layout->addWidget(m_protocolCombo, 1, 0);
     m_protocolCombo->addItem( PROTO_FTP  );
+    m_protocolCombo->addItem( PROTO_SFTP );
+    m_protocolCombo->addItem( PROTO_HTTP );
+    m_protocolCombo->addItem( PROTO_HTTPS);
     m_protocolCombo->addItem( PROTO_FILE );
 
     m_serverEdit = new QLineEdit( this );
@@ -81,7 +87,7 @@ CSwordSetupInstallSourcesDialog::CSwordSetupInstallSourcesDialog(/*QWidget *pare
     mainLayout->addSpacing( 10 );
 
     QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Save, Qt::Horizontal, this);
-    util::prepareDialogBox(buttonBox);
+    message::prepareDialogBox(buttonBox);
     QPushButton* getListButton = new QPushButton(tr("Get list..."), this);
     getListButton->setToolTip(tr("Download a list of sources from CrossWire server and add sources"));
     buttonBox->addButton(getListButton, QDialogButtonBox::ActionRole);
@@ -95,7 +101,7 @@ CSwordSetupInstallSourcesDialog::CSwordSetupInstallSourcesDialog(/*QWidget *pare
 void CSwordSetupInstallSourcesDialog::slotOk() {
     //run a few tests to validate the input first
     if ( m_captionEdit->text().trimmed().isEmpty() ) { //no caption
-        util::showInformation( this, tr( "Error" ), tr("Please provide a caption."));
+        message::showInformation( this, tr( "Error" ), tr("Please provide a caption."));
         return;
     }
 
@@ -103,25 +109,25 @@ void CSwordSetupInstallSourcesDialog::slotOk() {
     //sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source( &iMgr, m_captionEdit->text() );
     sword::InstallSource is = BtInstallBackend::source(m_captionEdit->text());
     if ( (QString)is.caption.c_str() == m_captionEdit->text() ) { //source already exists
-        util::showInformation( this, tr( "Error" ),
+        message::showInformation( this, tr( "Error" ),
                                tr("A source with this caption already exists. Please provide a different caption."));
         return;
     }
 
-    if ( m_protocolCombo->currentText() == PROTO_FTP &&
+    if ( this->isRemote(m_protocolCombo->currentText()) &&
             m_serverEdit->text().trimmed().isEmpty() ) { //no server name
-        util::showInformation( this, tr( "Error" ), tr("Please provide a server name."));
+        message::showInformation( this, tr( "Error" ), tr("Please provide a server name."));
         return;
     }
 
     if ( m_protocolCombo->currentText() == PROTO_FILE) {
         const QFileInfo fi( m_pathEdit->text() );
         if (!fi.exists() || !fi.isReadable()) { //no valid and readable path
-            util::showInformation( this, tr( "Error" ), tr("Please provide a valid, readable path."));
+            message::showInformation( this, tr( "Error" ), tr("Please provide a valid, readable path."));
             return;
         }
         else if ( m_pathEdit->text().isEmpty() ) {
-            util::showInformation( this, tr( "Error" ), tr("Please provide a path."));
+            message::showInformation( this, tr( "Error" ), tr("Please provide a path."));
 
         }
     }
@@ -130,7 +136,7 @@ void CSwordSetupInstallSourcesDialog::slotOk() {
 }
 
 void CSwordSetupInstallSourcesDialog::slotProtocolChanged() {
-    if (m_protocolCombo->currentText() == PROTO_FTP) { //REMOTE
+    if (this->isRemote(m_protocolCombo->currentText())) { //REMOTE
         m_serverLabel->setEnabled(true);
         m_serverEdit->setEnabled(true);
     }
@@ -152,7 +158,7 @@ void CSwordSetupInstallSourcesDialog::slotProtocolChanged() {
 
 void CSwordSetupInstallSourcesDialog::slotGetListClicked() {
     QString message(tr("List of sources will be downloaded from a remote server. Sources will be added to the current list. New source will replace an old one if it has the same label. You can later remove the sources you don't want to keep.\n\nDo you want to continue?"));
-    QMessageBox::StandardButton answer = util::showQuestion(this, tr("Get source list from remote server?"), message, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+    QMessageBox::StandardButton answer = message::showQuestion(this, tr("Get source list from remote server?"), message, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
     if (answer == QMessageBox::No) {
         return;
     }
@@ -206,9 +212,20 @@ void CSwordSetupInstallSourcesDialog::slotRefreshCanceled() {
 
 sword::InstallSource CSwordSetupInstallSourcesDialog::getSource() {
     sword::InstallSource newSource(""); //empty, invalid Source
-    if (m_protocolCombo->currentText() == PROTO_FTP) {
-        newSource.type = "FTP";
-        newSource.source = m_serverEdit->text().toUtf8();
+    if (this->isRemote(m_protocolCombo->currentText())) {
+        if (m_protocolCombo->currentText() == PROTO_FTP) {
+            newSource.type = "FTP";
+            }
+            else if (m_protocolCombo->currentText() == PROTO_SFTP) {
+                newSource.type = "SFTP";
+            }
+            else if (m_protocolCombo->currentText() == PROTO_HTTP) {
+                newSource.type = "HTTP";
+            }
+            else if (m_protocolCombo->currentText() == PROTO_HTTPS) {
+                newSource.type = "HTTPS";
+            }
+            newSource.source = m_serverEdit->text().toUtf8();
         //a message to the user would be nice, but we're in message freeze right now (1.5.1)
         if (m_serverEdit->text().right(1) == "/") { //remove a trailing slash
             newSource.source  = m_serverEdit->text().mid(0, m_serverEdit->text().length() - 1).toUtf8();
@@ -225,4 +242,7 @@ sword::InstallSource CSwordSetupInstallSourcesDialog::getSource() {
     return newSource;
 }
 
-
+bool CSwordSetupInstallSourcesDialog::isRemote(const QString& sourceType) {
+    return sourceType == PROTO_FTP || sourceType == PROTO_SFTP ||
+        sourceType == PROTO_HTTP || sourceType == PROTO_HTTPS;
+}
diff --git a/src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.h b/src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.h
index e69e9a9..20bf461 100644
--- a/src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.h
+++ b/src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -12,7 +14,7 @@
 
 #include <QDialog>
 
-#include "frontend/bookshelfmanager/btinstallmgr.h"
+#include "backend/btinstallmgr.h"
 
 // Sword includes:
 #include <installmgr.h>
@@ -41,6 +43,7 @@ class CSwordSetupInstallSourcesDialog : public QDialog  {
         void slotRefreshProgress(const int, const int current);
 
     private:
+        bool isRemote(const QString&);
         QLabel    *m_serverLabel;
         QLineEdit *m_captionEdit, *m_serverEdit, *m_pathEdit;
         QComboBox *m_protocolCombo;
diff --git a/src/frontend/bookshelfmanager/indexpage/btindexpage.cpp b/src/frontend/bookshelfmanager/indexpage/btindexpage.cpp
index 960f5c8..b117f80 100644
--- a/src/frontend/bookshelfmanager/indexpage/btindexpage.cpp
+++ b/src/frontend/bookshelfmanager/indexpage/btindexpage.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,21 +16,20 @@
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 #include <QVBoxLayout>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/drivers/cswordmoduleinfo.h"
 #include "backend/managers/cswordbackend.h"
+#include "bibletimeapp.h"
 #include "frontend/bookshelfmanager/btmodulemanagerdialog.h"
 #include "frontend/btmoduleindexdialog.h"
-#include "util/directory.h"
 #include "util/cresmgr.h"
+#include "util/geticon.h"
 #include "util/tool.h"
 
 
 BtIndexPage::BtIndexPage(BtModuleManagerDialog *parent)
-        : BtConfigDialog::Page(util::directory::getIcon(CResMgr::bookshelfmgr::indexpage::icon), parent)
+        : BtConfigDialog::Page(util::getIcon(CResMgr::bookshelfmgr::indexpage::icon), parent)
 {
-    namespace DU = util::directory;
-
     QVBoxLayout *vboxLayout = new QVBoxLayout(this);
     QHBoxLayout *hboxLayout;
 
@@ -60,11 +59,11 @@ BtIndexPage::BtIndexPage(BtModuleManagerDialog *parent)
     //m_moduleList->setTextAlignment(1, Qt::AlignRight); see doc...
     m_moduleList->setSortingEnabled(false);
 
-    m_autoDeleteOrphanedIndicesBox->setChecked( CBTConfig::get( CBTConfig::autoDeleteOrphanedIndices ) );
+    m_autoDeleteOrphanedIndicesBox->setChecked( btConfig().value<bool>("settings/behaviour/autoDeleteOrphanedIndices", true) );
 
     // icons for our buttons
-    m_createButton->setIcon(DU::getIcon(CResMgr::bookshelfmgr::indexpage::create_icon));
-    m_deleteButton->setIcon(DU::getIcon(CResMgr::bookshelfmgr::indexpage::delete_icon));
+    m_createButton->setIcon(util::getIcon(CResMgr::bookshelfmgr::indexpage::create_icon));
+    m_deleteButton->setIcon(util::getIcon(CResMgr::bookshelfmgr::indexpage::delete_icon));
 
     // connect our signals/slots
     connect(m_createButton, SIGNAL(clicked()),
@@ -78,7 +77,7 @@ BtIndexPage::BtIndexPage(BtModuleManagerDialog *parent)
 }
 
 BtIndexPage::~BtIndexPage() {
-    CBTConfig::set( CBTConfig::autoDeleteOrphanedIndices, m_autoDeleteOrphanedIndicesBox->isChecked() );
+    btConfig().setValue("settings/behaviour/autoDeleteOrphanedIndices", m_autoDeleteOrphanedIndicesBox->isChecked() );
 }
 
 /** Populates the module list with installed modules and orphaned indices */
diff --git a/src/frontend/bookshelfmanager/indexpage/btindexpage.h b/src/frontend/bookshelfmanager/indexpage/btindexpage.h
index 303c6ab..100de17 100644
--- a/src/frontend/bookshelfmanager/indexpage/btindexpage.h
+++ b/src/frontend/bookshelfmanager/indexpage/btindexpage.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp b/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp
index 01ca55b..a689c05 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.h b/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.h
index 070df6f..49f1978 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.h
+++ b/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp b/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp
index 880ea6a..6f0fc9b 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -32,10 +32,6 @@ BtInstallModuleChooserDialogModel::BtInstallModuleChooserDialogModel(
             Qt::DirectConnection);
 }
 
-BtInstallModuleChooserDialogModel::~BtInstallModuleChooserDialogModel() {
-    // Intentionally empty
-}
-
 QVariant BtInstallModuleChooserDialogModel::data(const QModelIndex &i, int role) const {
     switch (role) {
         case Qt::BackgroundRole:
@@ -111,14 +107,11 @@ void BtInstallModuleChooserDialogModel::parentDataChanged(const QModelIndex &top
     m_dataChangedFired = false;
 }
 
-bool BtInstallModuleChooserDialogModel::isMulti(CSwordModuleInfo *m1) const {
-    if (m1 != 0 && checkedModules().contains(m1)) {
-        Q_FOREACH(CSwordModuleInfo *m2, m_modules.keys()) {
-            if (m1 != m2 && checkedModules().contains(m2) && m1->name() == m2->name()) {
+bool BtInstallModuleChooserDialogModel::isMulti(CSwordModuleInfo * m1) const {
+    if (m1 != 0 && checkedModules().contains(m1))
+        Q_FOREACH (CSwordModuleInfo * m2, modules())
+            if (m1 != m2 && checkedModules().contains(m2) && m1->name() == m2->name())
                 return true;
-            }
-        }
-    }
     return false;
 }
 
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.h b/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.h
index 6120fa8..406b89c 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.h
+++ b/src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -22,7 +22,6 @@ class BtInstallModuleChooserDialogModel: public BtBookshelfTreeModel {
     Q_OBJECT
     public:
         BtInstallModuleChooserDialogModel(const Grouping &grouping, QObject *parent = 0);
-        ~BtInstallModuleChooserDialogModel();
 
         QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
         int columnCount(const QModelIndex &parent = QModelIndex()) const;
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallpage.cpp b/src/frontend/bookshelfmanager/installpage/btinstallpage.cpp
index 9c7955a..5f8bfb8 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallpage.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btinstallpage.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,12 +16,12 @@
 #include <QHeaderView>
 #include <QLabel>
 #include <QPushButton>
-#include <QSettings>
 #include <QSharedPointer>
 #include <QStackedLayout>
 #include <QToolButton>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/btinstallbackend.h"
+#include "bibletimeapp.h"
 #include "frontend/bookshelfmanager/btmodulemanagerdialog.h"
 #include "frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.h"
 #include "frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.h"
@@ -29,9 +29,10 @@
 #include "frontend/bookshelfmanager/installpage/btinstallpathdialog.h"
 #include "frontend/bookshelfmanager/installpage/btinstallprogressdialog.h"
 #include "frontend/btbookshelfview.h"
+#include "frontend/messagedialog.h"
 #include "util/cresmgr.h"
-#include "util/dialogutil.h"
 #include "util/directory.h"
+#include "util/geticon.h"
 #include "util/tool.h"
 
 
@@ -39,6 +40,7 @@ namespace {
 const QString groupingOrderKey ("GUI/BookshelfManager/InstallPage/grouping");
 const QString headerStateKey   ("GUI/BookshelfManager/InstallPage/headerState");
 const QString selectedModuleKey("GUI/BookshelfManager/InstallPage/selectedModule");
+const QString installPathKey   ("GUI/BookshelfManager/InstallPage/installPathIndex");
 } // anonymous namespace
 
 
@@ -47,13 +49,13 @@ const QString selectedModuleKey("GUI/BookshelfManager/InstallPage/selectedModule
 // *********************************************************
 
 BtInstallPage::BtInstallPage(BtModuleManagerDialog *parent)
-        : BtConfigDialog::Page(util::directory::getIcon(CResMgr::bookshelfmgr::installpage::icon), parent)
+        : BtConfigDialog::Page(util::getIcon(CResMgr::bookshelfmgr::installpage::icon), parent)
         , m_groupingOrder(groupingOrderKey)
         , m_modulesSelected(0)
         , m_modulesSelectedSources(0)
 {
     // Read settings:
-    m_headerState = CBTConfig::getConfig()->value(headerStateKey).toByteArray();
+    m_headerState = btConfig().value<QByteArray>(headerStateKey, QByteArray());
 
     // Initialize widgets:
     initView();
@@ -71,8 +73,6 @@ QString BtInstallPage::selectedInstallPath() {
 }
 
 void BtInstallPage::initView() {
-    namespace DU = util::directory;
-
     // Warning label:
     m_warningLabel = new QLabel(this);
 
@@ -85,10 +85,10 @@ void BtInstallPage::initView() {
     initSourcesCombo();
 
     m_sourceAddButton = new QPushButton(this);
-    m_sourceAddButton ->setIcon(DU::getIcon(CResMgr::bookshelfmgr::installpage::add_icon));
+    m_sourceAddButton->setIcon(util::getIcon(CResMgr::bookshelfmgr::installpage::add_icon));
 
     m_sourceDeleteButton = new QPushButton(this);
-    m_sourceDeleteButton->setIcon(DU::getIcon(CResMgr::bookshelfmgr::installpage::delete_icon));
+    m_sourceDeleteButton->setIcon(util::getIcon(CResMgr::bookshelfmgr::installpage::delete_icon));
 
     QHBoxLayout *sourceChooserLayout = new QHBoxLayout();
     sourceChooserLayout->setContentsMargins(0, 8, 0, 0);
@@ -119,10 +119,10 @@ void BtInstallPage::initView() {
     initPathCombo();
 
     m_configurePathButton = new QToolButton(this);
-    m_configurePathButton->setIcon(DU::getIcon(CResMgr::bookshelfmgr::installpage::path_icon));
+    m_configurePathButton->setIcon(util::getIcon(CResMgr::bookshelfmgr::installpage::path_icon));
 
     m_installButton = new QPushButton(this);
-    m_installButton->setIcon(DU::getIcon(CResMgr::bookshelfmgr::installpage::install_icon));
+    m_installButton->setIcon(util::getIcon(CResMgr::bookshelfmgr::installpage::install_icon));
     m_installButton->setEnabled(false);
 
     QHBoxLayout *pathLayout = new QHBoxLayout();
@@ -175,7 +175,7 @@ void BtInstallPage::initPathCombo() {
     }
 
     // choose the current value from config but check whether we have so many items
-    int configValue = CBTConfig::get(CBTConfig::installPathIndex);
+    int configValue = btConfig().value<int>(installPathKey, 0);
     int index = configValue > (m_pathCombo->count() - 1) ? m_pathCombo->count() - 1 : configValue;
     m_pathCombo->setCurrentIndex(index);
 }
@@ -202,7 +202,7 @@ void BtInstallPage::initSourcesCombo() {
     }
 
     // Read selected module from config:
-    QString selected = CBTConfig::getConfig()->value(selectedModuleKey).toString();
+    const QString selected = btConfig().value<QString>(selectedModuleKey, QString());
 
     // Populate combo box
     bool selectionOk = false;
@@ -219,7 +219,7 @@ void BtInstallPage::initSourcesCombo() {
     // Set selection, if it wasn't properly configured:
     if (!selectionOk) {
         m_sourceComboBox->setCurrentIndex(0);
-        CBTConfig::getConfig()->setValue(selectedModuleKey, sourceList.at(0));
+        btConfig().setValue(selectedModuleKey, sourceList.at(0));
     }
 }
 
@@ -268,7 +268,7 @@ void BtInstallPage::retranslateUi() {
 
     m_sourceGroupBox->setTitle(tr("Select installation &source:"));
     m_sourceAddButton->setText(tr("&Add..."));
-    m_sourceAddButton ->setToolTip(tr("Add new source"));
+    m_sourceAddButton->setToolTip(tr("Add new source"));
     m_sourceDeleteButton->setText(tr("&Delete..."));
     m_sourceDeleteButton->setToolTip(tr("Delete this source"));
 
@@ -293,7 +293,7 @@ void BtInstallPage::slotHeaderChanged() {
     Q_ASSERT(qobject_cast<IPWW*>(m_worksLayout->currentWidget()) != 0);
     IPWW *w = static_cast<IPWW*>(m_worksLayout->currentWidget());
     m_headerState = w->treeView()->header()->saveState();
-    CBTConfig::getConfig()->setValue(headerStateKey, m_headerState);
+    btConfig().setValue(headerStateKey, m_headerState);
 }
 
 void BtInstallPage::slotInstall() {
@@ -310,7 +310,7 @@ void BtInstallPage::slotInstall() {
         canWrite = false;
     }
     if (!canWrite) {
-        const int result = util::showWarning(this, tr("Warning"), tr("The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed."), QMessageBox::Ignore | QMessageBox::Cancel, QMessageBox::Cancel);
+        const int result = message::showWarning(this, tr("Warning"), tr("The destination directory is not writable or does not exist. Installation will fail unless this has first been fixed."), QMessageBox::Ignore | QMessageBox::Cancel, QMessageBox::Cancel);
         if (result != QMessageBox::Ignore) {
             return;
         }
@@ -327,22 +327,17 @@ void BtInstallPage::slotInstall() {
     }
 
     if (dlg->exec() == QDialog::Accepted) {
-        QSet<const CSwordModuleInfo*> cm;
-        Q_FOREACH(const CSwordModuleInfo *m, dlg->checkedModules()) {
-            cm.insert(m);
-        }
-
-        if (cm.empty())
+        QList<CSwordModuleInfo *> modules(dlg->checkedModules().toList());
+        if (modules.empty())
             return;
 
         /// \todo first remove all modules which will be updated from the module list
         // but what modules? all with the same real name? (there may be _n modules...)
 
         // progressDialog is WA_DeleteOnClose
-        BtInstallProgressDialog *progressDialog = new BtInstallProgressDialog(cm, selectedInstallPath(), this);
-
+        typedef BtInstallProgressDialog BIPD;
+        BIPD * const progressDialog = new BIPD(modules, selectedInstallPath(), this);
         m_installButton->setEnabled(false);
-
         // the progress dialog is now modal, it can be made modeless later.
         progressDialog->exec();
 
@@ -351,7 +346,7 @@ void BtInstallPage::slotInstall() {
 }
 
 void BtInstallPage::slotPathChanged(const QString& /*pathText*/) {
-    CBTConfig::set(CBTConfig::installPathIndex, m_pathCombo->currentIndex( ) );
+    btConfig().setValue(installPathKey, m_pathCombo->currentIndex());
 }
 
 void BtInstallPage::slotEditPaths() {
@@ -390,26 +385,35 @@ void BtInstallPage::slotSourceAdd() {
 void BtInstallPage::slotSourceDelete() {
     typedef BtInstallPageWorksWidget IPWW;
 
-    int ret = util::showWarning(this, tr("Delete Source?"),
+    int ret = message::showWarning(this, tr("Delete Source?"),
                                 tr("Do you really want to delete this source?"),
                                 QMessageBox::Yes | QMessageBox::No);
 
     if (ret == QMessageBox::Yes) {
+        qApp->setOverrideCursor(Qt::WaitCursor);
+        window()->setEnabled(false);
         Q_ASSERT(qobject_cast<IPWW*>(m_worksLayout->currentWidget()));
         IPWW *w = static_cast<IPWW*>(m_worksLayout->currentWidget());
+        m_sourceMap.remove(QString(w->installSource().caption));
         w->deleteSource();
         initSourcesCombo();
         slotSourceIndexChanged(m_sourceComboBox->currentIndex());
         delete w;
+        window()->setEnabled(true);
+        qApp->restoreOverrideCursor();
     }
 }
 
 void BtInstallPage::slotSourceIndexChanged(int index) {
-    if (index < 0) index = 0;
+    if (index < 0) {
+        if(!m_sourceComboBox->count())
+            return;
+        index = 0;
+    }
 
     /// \todo use pointers instead of text
     QString moduleName = m_sourceComboBox->itemText(index);
-    CBTConfig::getConfig()->setValue(selectedModuleKey, moduleName);
+    btConfig().setValue(selectedModuleKey, moduleName);
     activateSource(BtInstallBackend::source(moduleName));
 }
 
@@ -431,9 +435,10 @@ void BtInstallPage::slotSelectedModulesChanged() {
 void BtInstallPage::slotSwordSetupChanged() {
     QString moduleName = m_sourceComboBox->currentText();
 
-    initSourcesCombo();
+    // clean m_sourceMap before initSourcesCombo() make too much work
     qDeleteAll(m_sourceMap.values());
     m_sourceMap.clear();
+    initSourcesCombo();
     m_sourceComboBox->setCurrentIndex(m_sourceComboBox->findText(moduleName));
     initPathCombo();
     m_modulesSelected = 0;
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallpage.h b/src/frontend/bookshelfmanager/installpage/btinstallpage.h
index 0cb6724..fe791cf 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallpage.h
+++ b/src/frontend/bookshelfmanager/installpage/btinstallpage.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp b/src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp
index 9aa6743..06e97f8 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -27,10 +27,6 @@ BtInstallPageModel::BtInstallPageModel(const Grouping &grouping, QObject *parent
     setCheckable(true);
 }
 
-BtInstallPageModel::~BtInstallPageModel() {
-    // Intentionally empty
-}
-
 QVariant BtInstallPageModel::data(const QModelIndex &i, int role) const {
     switch (role) {
         case Qt::DisplayRole:
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallpagemodel.h b/src/frontend/bookshelfmanager/installpage/btinstallpagemodel.h
index 8a02409..009aa15 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallpagemodel.h
+++ b/src/frontend/bookshelfmanager/installpage/btinstallpagemodel.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -22,7 +22,6 @@ class BtInstallPageModel: public BtBookshelfTreeModel {
     Q_OBJECT
     public:
         BtInstallPageModel(const Grouping &grouping, QObject *parent = 0);
-        ~BtInstallPageModel();
 
         QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
         int columnCount(const QModelIndex &parent = QModelIndex()) const;
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp b/src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp
index 0bb8829..629a69c 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,12 +16,13 @@
 #include <QToolButton>
 #include "backend/btinstallbackend.h"
 #include "backend/managers/cswordbackend.h"
+#include "bibletimeapp.h"
 #include "frontend/bookshelfmanager/installpage/btinstallpage.h"
 #include "frontend/bookshelfmanager/installpage/btinstallpagemodel.h"
 #include "frontend/bookshelfmanager/installpage/btrefreshprogressdialog.h"
 #include "frontend/btbookshelfview.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
+#include "util/geticon.h"
 
 
 namespace {
@@ -55,7 +56,6 @@ BtInstallPageWorksWidget::BtInstallPageWorksWidget(
             , m_backend(0)
             , m_myModel(0)
 {
-    namespace DU = util::directory;
 
     setTreeModel(new BtInstallPageModel(g, this));
 
@@ -65,15 +65,20 @@ BtInstallPageWorksWidget::BtInstallPageWorksWidget(
 
     m_sourceRefreshButton = new QToolButton(this);
     m_sourceRefreshButton->setAutoRaise(true);
-    m_sourceRefreshButton ->setToolTip(tr("Refresh the list of works from this source"));
-    m_sourceRefreshButton ->setIcon(DU::getIcon(CResMgr::bookshelfmgr::installpage::refresh_icon));
+    m_sourceRefreshButton->setToolTip(tr("Refresh the list of works from this source"));
+    m_sourceRefreshButton->setIcon(util::getIcon(CResMgr::bookshelfmgr::installpage::refresh_icon));
     setRightCornerWidget(m_sourceRefreshButton);
 
     connect(m_sourceRefreshButton, SIGNAL(clicked()),
             this,                  SLOT(slotSourceRefresh()));
 
-    // Delayed init, part 1 - disable parent:
-    parent->setEnabled(false);
+    m_backend = BtInstallBackend::backend(m_source);
+    Q_ASSERT(m_backend != 0);
+    m_myModel = new BtBookshelfModel(this);
+    Q_FOREACH(CSwordModuleInfo *module, m_backend->moduleList()) {
+        if (filter(module)) m_myModel->addModule(module);
+    }
+    setSourceModel(m_myModel);
 }
 
 BtInstallPageWorksWidget::~BtInstallPageWorksWidget() {
@@ -83,7 +88,6 @@ BtInstallPageWorksWidget::~BtInstallPageWorksWidget() {
 void BtInstallPageWorksWidget::deleteSource() {
     qDebug() << "Deleting source" << m_source.caption;
 
-    setEnabled(false);
     m_myModel->clear();
     BtInstallBackend::deleteSource(QString(m_source.caption));
 }
@@ -103,28 +107,6 @@ void BtInstallPageWorksWidget::updateTree() {
     }
 }
 
-void BtInstallPageWorksWidget::paintEvent(QPaintEvent *e) {
-    // Delayed init, part 2 - queue init when painted:
-    if (m_myModel == 0) {
-        QTimer::singleShot(0, this, SLOT(slotDelayedInit()));
-    }
-    BtBookshelfWidget::paintEvent(e);
-}
-
-void BtInstallPageWorksWidget::slotDelayedInit() {
-    // Delayed init, part 3 - initialize + reenable parent
-    qApp->setOverrideCursor(Qt::WaitCursor);
-    m_backend = BtInstallBackend::backend(m_source);
-    Q_ASSERT(m_backend != 0);
-    m_myModel = new BtBookshelfModel(this);
-    Q_FOREACH(CSwordModuleInfo *module, m_backend->moduleList()) {
-        if (filter(module)) m_myModel->addModule(module);
-    }
-    setSourceModel(m_myModel);
-    m_parent->setEnabled(true);
-    qApp->restoreOverrideCursor();
-}
-
 void BtInstallPageWorksWidget::slotSourceRefresh() {
     qDebug() << "Refreshing source" << m_source.caption;
 
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.h b/src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.h
index 1a9bd8f..d02e99e 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.h
+++ b/src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -39,12 +41,8 @@ class BtInstallPageWorksWidget: public BtBookshelfWidget {
 
         void updateTree();
 
-        /** Reimplemented from QWidget. */
-        virtual void paintEvent(QPaintEvent *e);
-
     private slots:
 
-        void slotDelayedInit();
         void slotSourceRefresh();
 
     private: /* Fields: */
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp b/src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp
index b4deb51..109bbd9 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -21,9 +21,11 @@
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 #include "backend/btinstallbackend.h"
-#include "util/dialogutil.h"
+#include "bibletimeapp.h"
+#include "frontend/messagedialog.h"
 #include "util/directory.h"
 #include "util/cresmgr.h"
+#include "util/geticon.h"
 #include "util/tool.h"
 
 
@@ -77,19 +79,19 @@ BtInstallPathDialog::BtInstallPathDialog() {
 
     m_addButton = new QPushButton(tr("&Add..."), this);
     m_addButton->setToolTip(tr("Add new folder"));
-    m_addButton->setIcon(DU::getIcon(CResMgr::bookshelfmgr::paths::add_icon));
+    m_addButton->setIcon(util::getIcon(CResMgr::bookshelfmgr::paths::add_icon));
     connect(m_addButton, SIGNAL(clicked()), this, SLOT(slotAddClicked()));
     buttonLayout->addWidget(m_addButton);
 
     m_editButton = new QPushButton(tr("&Edit..."), this);
     m_editButton->setToolTip(tr("Edit the selected folder"));
-    m_editButton->setIcon(DU::getIcon(CResMgr::bookshelfmgr::paths::edit_icon));
+    m_editButton->setIcon(util::getIcon(CResMgr::bookshelfmgr::paths::edit_icon));
     connect(m_editButton, SIGNAL(clicked()), this, SLOT(slotEditClicked()));
     buttonLayout->addWidget(m_editButton);
 
     m_removeButton = new QPushButton(tr("&Remove"), this);
     m_removeButton->setToolTip(tr("Remove the selected folder"));
-    m_removeButton->setIcon(DU::getIcon(CResMgr::bookshelfmgr::paths::remove_icon));
+    m_removeButton->setIcon(util::getIcon(CResMgr::bookshelfmgr::paths::remove_icon));
     connect(m_removeButton, SIGNAL(clicked()), this, SLOT(slotRemoveClicked()));
     buttonLayout->addWidget(m_removeButton);
 
@@ -102,7 +104,7 @@ BtInstallPathDialog::BtInstallPathDialog() {
     QDialogButtonBox* buttonBox = new QDialogButtonBox(this);
     buttonBox->setOrientation(Qt::Horizontal);
     buttonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::NoButton | QDialogButtonBox::Ok);
-    util::prepareDialogBox(buttonBox);
+    message::prepareDialogBox(buttonBox);
     mainLayout->addWidget(buttonBox);
     connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
     connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
@@ -177,7 +179,7 @@ void BtInstallPathDialog::slotEditClicked() {
         if (dir.isReadable()) {
             const QFileInfo fi( dir.canonicalPath() );
             if (!fi.exists() || !fi.isWritable()) {
-                const int result = util::showWarning(this, tr("Use Folder?"), tr("This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+                const int result = message::showWarning(this, tr("Use Folder?"), tr("This folder is not writable, so works can not be installed here using BibleTime. Do you want to use this folder instead of the previous value?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
                 if (result != QMessageBox::Yes) return;
             }
             //i->setText(0, dir.absolutePath()); // absolute, not canonical
@@ -197,7 +199,7 @@ void BtInstallPathDialog::slotAddClicked() {
     if (dir.isReadable()) {
         const QFileInfo fi( dir.canonicalPath() );
         if (!fi.exists() || !fi.isWritable()) {
-            const int result = util::showWarning(this, tr("Use Folder?"), tr("This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+            const int result = message::showWarning(this, tr("Use Folder?"), tr("This folder is not writable, so works can not be installed here using BibleTime. Do you still want to add it to the list of bookshelf folders?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
             if (result != QMessageBox::Yes) {
                 return;
             }
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallpathdialog.h b/src/frontend/bookshelfmanager/installpage/btinstallpathdialog.h
index 9adf6bc..de4c69a 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallpathdialog.h
+++ b/src/frontend/bookshelfmanager/installpage/btinstallpathdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp b/src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp
index cc862fa..53fd274 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -21,21 +21,24 @@
 #include <QTreeWidgetItem>
 #include <QVBoxLayout>
 #include "backend/managers/cswordbackend.h"
-#include "frontend/bookshelfmanager/installpage/btinstallthread.h"
+#include "backend/btinstallthread.h"
 
 
-BtInstallProgressDialog::BtInstallProgressDialog(
-        const QSet<const CSwordModuleInfo*> &modules,
-        const QString &destination, QWidget *parent, Qt::WindowFlags flags)
+BtInstallProgressDialog::BtInstallProgressDialog(const QList<CSwordModuleInfo *> & modules,
+                                                 const QString & destination,
+                                                 QWidget * parent,
+                                                 Qt::WindowFlags flags)
         : QDialog(parent, flags)
+        , m_nextInstallIndex(0)
 {
     // we want this dialog to be deleted when user closes it or the downloads are completed
     setAttribute(Qt::WA_DeleteOnClose, true);
+
     setWindowTitle(tr("Install Progress"));
-    //create the dialog which shows the status and lets the user stop installation
+
     m_statusWidget = new QTreeWidget();
     m_statusWidget->setRootIsDecorated(false);
-    m_statusWidget->setHeaderLabels(QStringList(tr("Work")) << tr("Progress") << QString::null);
+    m_statusWidget->setHeaderLabels(QStringList(tr("Work")) << tr("Progress"));
     m_statusWidget->header()->setStretchLastSection(false);
 #if QT_VERSION < 0x050000
     m_statusWidget->header()->setResizeMode(1, QHeaderView::Stretch);
@@ -44,190 +47,117 @@ BtInstallProgressDialog::BtInstallProgressDialog(
     m_statusWidget->header()->setSectionResizeMode(1, QHeaderView::Stretch);
     m_statusWidget->header()->setSectionsMovable(false);
 #endif
-    //m_statusWidget->setColumnWidth(1, util::tool::mWidth(m_statusWidget, 2));
-
-    Q_FOREACH(const CSwordModuleInfo *module, modules) {
-        const QString sourceName(module->property("installSourceName").toString());
-        // create a thread for this module
-        BtInstallThread* thread = new BtInstallThread(module->name(), sourceName, destination);
-        m_waitingThreads.insert(sourceName, thread);
-        m_threadsByModule.insert(module->name(), thread);
-        // progress widget/item
-        QPushButton* stopButton = new QPushButton(tr("Stop"), m_statusWidget);
-        stopButton->setFixedSize(stopButton->sizeHint());
-
-        // the item
-        QTreeWidgetItem* progressItem = new QTreeWidgetItem(m_statusWidget);
-        m_statusWidget->setColumnWidth(2, stopButton->sizeHint().width());
-        progressItem->setSizeHint(2, stopButton->sizeHint());
+
+    Q_FOREACH(const CSwordModuleInfo * module, modules) {
+        QTreeWidgetItem * progressItem = new QTreeWidgetItem(m_statusWidget);
         progressItem->setText(0, module->name());
-        progressItem->setFlags(Qt::ItemIsEnabled);
-        m_statusWidget->setItemWidget(progressItem, 2, stopButton);
+        progressItem->setIcon(0, module->moduleIcon());
         progressItem->setText(1, tr("Waiting for turn..."));
-
-        //connect the signals between the dialog, items and threads
-        QObject::connect(stopButton, SIGNAL(clicked()), thread, SLOT(slotStopInstall()), Qt::QueuedConnection);
-        QObject::connect(thread, SIGNAL(installStopped(QString, QString)), this, SLOT(slotOneItemStopped(QString, QString)), Qt::QueuedConnection);
-        //is this needed or is statusUpdated enough?
-        QObject::connect(thread, SIGNAL(installCompleted(QString, QString, int)), this, SLOT(slotOneItemCompleted(QString, QString, int)), Qt::QueuedConnection);
-        QObject::connect(thread, SIGNAL(statusUpdated(QString, int)), this, SLOT(slotStatusUpdated(QString, int)), Qt::QueuedConnection);
-        QObject::connect(thread, SIGNAL(downloadStarted(QString)), this, SLOT(slotDownloadStarted(QString)), Qt::QueuedConnection);
-
-        QObject::connect(thread, SIGNAL(preparingInstall(QString, QString)), this, SLOT(slotInstallStarted(QString, QString)), Qt::QueuedConnection);
+        progressItem->setFlags(Qt::ItemIsEnabled);
     }
 
     m_statusWidget->setMinimumWidth(m_statusWidget->size().width());
-    QPushButton* stopAllButton = new QPushButton(tr("Stop All"), this);
+    m_stopAllButton = new QPushButton(tr("Stop All"), this);
 
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    QVBoxLayout * layout = new QVBoxLayout(this);
     layout->addWidget(m_statusWidget);
-    layout->addWidget(stopAllButton);
-
-    connect(stopAllButton, SIGNAL(clicked()), SLOT(slotStopInstall()) );
-
-    qApp->processEvents();
-
-    startThreads();
-
+    layout->addWidget(m_stopAllButton);
+
+    connect(m_stopAllButton, SIGNAL(clicked()),
+            this,            SLOT(slotStopInstall()));
+
+    m_thread = new BtInstallThread(modules, destination, this);
+    // Connect the signals between the dialog, items and threads
+    connect(m_thread, SIGNAL(preparingInstall(int)),
+            this,     SLOT(slotInstallStarted(int)),
+            Qt::QueuedConnection);
+    connect(m_thread, SIGNAL(downloadStarted(int)),
+            this,     SLOT(slotDownloadStarted(int)),
+            Qt::QueuedConnection);
+    connect(m_thread, SIGNAL(statusUpdated(int, int)),
+            this,     SLOT(slotStatusUpdated(int, int)),
+            Qt::QueuedConnection);
+    connect(m_thread, SIGNAL(installCompleted(int, bool)),
+            this,     SLOT(slotOneItemCompleted(int, bool)),
+            Qt::QueuedConnection);
+    connect(m_thread, SIGNAL(finished()),
+            this,     SLOT(slotThreadFinished()),
+            Qt::QueuedConnection);
+    #if QT_VERSION < 0x050000
+    connect(m_thread, SIGNAL(terminated()),
+            this,     SLOT(slotThreadFinished()),
+            Qt::QueuedConnection);
+    #endif
+    m_thread->start();
 }
 
-void BtInstallProgressDialog::startThreads() {
-    // remove all the updated modules from the backend module list at once
-    //foreach (QString mName, m_threadsByModule.keys()) {
-    //}
-    //QList<CSwordModuleInfo*> CSwordBackend::instance()()->takeModulesFromList(m_threadsByModule.keys());
-    //loop through the multimap of the waiting threads, start at most 3 threads for each source
-    QMultiMap<QString, BtInstallThread*>::iterator threadIterator = m_waitingThreads.end();
-// concurrency is disabled for now
-//     while (threadIterator != m_waitingThreads.end()) {
-//         QString sourceName = threadIterator.key();
-//         if (m_runningThreads.values(sourceName).count() < 3) {
-//             BtInstallThread* t = threadIterator.value();
-//             m_runningThreads.insert(sourceName, t);
-//             threadIterator = m_waitingThreads.erase(threadIterator);
-//             t->start();
-//         }
-//         else ++threadIterator;
-//     }
-    //non-concurrent
-    if (threadIterator != m_waitingThreads.begin()) {
-        // go to the last item which is actually the first in the visible list
-        // because the iterator is reversed compared to insert order
-        threadIterator--;
-        QString sourceName = threadIterator.key();
-        BtInstallThread* t = threadIterator.value();
-        m_runningThreads.insert(sourceName, t);
-        threadIterator = m_waitingThreads.erase(threadIterator);
-        t->start();
-    }
+BtInstallProgressDialog::~BtInstallProgressDialog() {
+    m_thread->wait();
+    delete m_thread;
 }
 
-void BtInstallProgressDialog::slotOneItemCompleted(QString module, QString source, int status) {
-    QString message;
-    //status comes from the sword installer.
-    /// \todo Additionally we should check that there are files really installed.
-    if (status != 0) {
-        message = tr("Failed");
-    }
-    else {
-        message = tr("Completed");
+void BtInstallProgressDialog::slotStopInstall() {
+    m_stopAllButton->setDisabled(true);
+    m_thread->stopInstall();
+    for (int i = m_nextInstallIndex; i < m_statusWidget->topLevelItemCount(); i++) {
+        QTreeWidgetItem * const item = m_statusWidget->topLevelItem(i);
+        item->setText(1, QString::null);
+        item->setDisabled(true);
     }
-    oneItemStoppedOrCompleted(module, source, message);
-}
-
-void BtInstallProgressDialog::slotOneItemStopped(QString module, QString source) {
-    oneItemStoppedOrCompleted(module, source, tr("Cancelled"));
 }
 
-void BtInstallProgressDialog::oneItemStoppedOrCompleted(QString module, QString source, QString statusMessage) {
-    qDebug() << "\n**********************************\nBtInstallProgressDialog::oneItemStoppedOrCompleted" << module << statusMessage << "\n******************************************";
-    // update the list item
-    m_statusWidget->setItemWidget(getItem(module), 1, 0);
-    getItem(module)->setText(1, statusMessage);
-    m_statusWidget->itemWidget(getItem(module), 2)->setEnabled(false);
-    getItem(module)->setDisabled(true);
-
-    qDebug() << "remove from threads maps" << source << m_threadsByModule.value(module);
-    m_runningThreads.remove(source, m_threadsByModule.value(module));
-    m_waitingThreads.remove(source, m_threadsByModule.value(module));
-
-//concurrency is disabled for now
-//     //start a waiting thread if there are any
-//     QList<BtInstallThread*> threadsForSource = m_waitingThreads.values(source);
-//     if (!threadsForSource.isEmpty()) {
-//         BtInstallThread* thread = threadsForSource.at(0);
-//         m_waitingThreads.remove(source, thread);
-//         m_runningThreads.insert(source, thread);
-//         thread->start();
-//     }
-
-    //non-concurrent
-    QMultiMap<QString, BtInstallThread*>::iterator threadIterator = m_waitingThreads.end();
-    if (m_runningThreads.isEmpty() && threadIterator != m_waitingThreads.begin()) {
-        threadIterator--; // the last item
-        QString sourceName = threadIterator.key();
-        BtInstallThread* t = threadIterator.value();
-        m_runningThreads.insert(sourceName, t);
-        threadIterator = m_waitingThreads.erase(threadIterator);
-        t->start();
-    }
-
-    if (threadsDone()) {
-        qDebug() << "close the dialog";
-        close();
-    }
+void BtInstallProgressDialog::slotInstallStarted(int moduleIndex) {
+    Q_ASSERT(moduleIndex == m_nextInstallIndex);
+    m_nextInstallIndex++;
+    QTreeWidgetItem * const item = m_statusWidget->topLevelItem(moduleIndex);
+    item->setText(1, tr("Preparing install..."));
+    m_statusWidget->scrollToItem(item);
 }
 
-void BtInstallProgressDialog::slotStopInstall() {
-    qDebug() << "BtInstallProgressDialog::slotStopInstall";
-
-    // Clear the waiting threads map, stop all running threads.
-
-    m_waitingThreads.clear();
-    if (m_runningThreads.count() > 0) {
-        foreach(BtInstallThread* thread, m_runningThreads) {
-            thread->slotStopInstall();
-        }
-    }
-    else {
-        close();
-    }
+void BtInstallProgressDialog::slotDownloadStarted(int moduleIndex) {
+    QTreeWidgetItem * const item = m_statusWidget->topLevelItem(moduleIndex);
+    item->setText(1, QString::null);
+    getOrCreateProgressBar(item)->setValue(0);
 }
 
-void BtInstallProgressDialog::slotStatusUpdated(QString module, int status) {
+void BtInstallProgressDialog::slotStatusUpdated(int moduleIndex, int status) {
     // find the progress bar for this module and update the value
-    QWidget* itemWidget = m_statusWidget->itemWidget(getItem(module) , 1);
-    QProgressBar* bar = dynamic_cast<QProgressBar*>(itemWidget);
-    if (bar) bar->setValue(status);
-}
-
-void BtInstallProgressDialog::slotInstallStarted(QString module, QString) {
-    getItem(module)->setText(1, tr("Preparing install..."));
+    getOrCreateProgressBar(moduleIndex)->setValue(status);
 }
 
-void BtInstallProgressDialog::slotDownloadStarted(QString module) {
-    getItem(module)->setText(1, QString::null);
-    //m_statusWidget->itemWidget(getItem(module), 1)->setVisible(true);
-
-    QProgressBar* bar = new QProgressBar(m_statusWidget);
-    bar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-    bar->setValue(0);
-    m_statusWidget->setItemWidget(getItem(module), 1, bar);
+void BtInstallProgressDialog::slotOneItemCompleted(int moduleIndex, bool successful) {
+QTreeWidgetItem * const item = m_statusWidget->topLevelItem(moduleIndex);
+    // update the list item
+    m_statusWidget->setItemWidget(item, 1, NULL);
+    item->setText(1, successful ? tr("Completed") : tr("Failed"));
+    item->setDisabled(true);
 }
 
-QTreeWidgetItem* BtInstallProgressDialog::getItem(QString moduleName) {
-    return m_statusWidget->findItems(moduleName, Qt::MatchExactly).at(0);
+void BtInstallProgressDialog::slotThreadFinished() {
+    close();
 }
 
-void BtInstallProgressDialog::closeEvent(QCloseEvent* event) {
+void BtInstallProgressDialog::closeEvent(QCloseEvent * event) {
     if (event->spontaneous()) {
         event->ignore();
+        slotStopInstall();
         return;
     }
     // other parts of the UI/engine must be updated
     CSwordBackend::instance()->reloadModules(CSwordBackend::AddedModules);
 }
 
-bool BtInstallProgressDialog::threadsDone() {
-    return (m_waitingThreads.isEmpty() && m_runningThreads.isEmpty());
+QProgressBar * BtInstallProgressDialog::getOrCreateProgressBar(int moduleIndex) {
+    return getOrCreateProgressBar(m_statusWidget->topLevelItem(moduleIndex));
+}
+
+QProgressBar * BtInstallProgressDialog::getOrCreateProgressBar(QTreeWidgetItem * item) {
+    QWidget * const itemWidget = m_statusWidget->itemWidget(item, 1);
+    QProgressBar * progressBar = dynamic_cast<QProgressBar *>(itemWidget);
+    if (!progressBar) {
+        progressBar = new QProgressBar(m_statusWidget);
+        progressBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+        m_statusWidget->setItemWidget(item, 1, progressBar);
+    }
+    return progressBar;
 }
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.h b/src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.h
index a72b280..e6add1c 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.h
+++ b/src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -12,56 +14,56 @@
 
 #include <QDialog>
 
-#include <QMultiMap>
 #include <QString>
 
 
 class BtInstallThread;
 class CSwordModuleInfo;
+class QProgressBar;
 class QTreeWidget;
 class QTreeWidgetItem;
 
-class BtInstallProgressDialog : public QDialog {
-        Q_OBJECT
-    public:
-        BtInstallProgressDialog(const QSet<const CSwordModuleInfo*> &modules,
-                                const QString &destination, QWidget *parent = 0,
-                                Qt::WindowFlags flags = 0);
-
-    public slots:
-        void slotOneItemCompleted(QString module, QString source, int status);
-        void slotOneItemStopped(QString module, QString source);
-        void slotStopInstall();
-        void slotStatusUpdated(QString module, int status);
-        void slotDownloadStarted(QString module);
-        void slotInstallStarted(QString module, QString);
-
-    protected:
-        /**
-        * Handles closing by the window close button, Cancel (Stop) All button, or completing
-        * the downloads.
-        */
-        virtual void closeEvent(QCloseEvent* event);
-
-//signals:
-//    void swordSetupChanged();
-
-    private:
-
-        /// \todo using maps is tedious and error prone. Find better solution for handling the modules
-        // and their states.
-        QMultiMap<QString, BtInstallThread*> m_waitingThreads;
-        QMultiMap<QString, BtInstallThread*> m_runningThreads;
-        QMap<QString, BtInstallThread*> m_threadsByModule;
-        //QList<BtInstallThread*> m_doneThreads;
-
-        QTreeWidget* m_statusWidget;
-
-    private:
-        QTreeWidgetItem* getItem(QString moduleName);
-        bool threadsDone();
-        void startThreads();
-        void oneItemStoppedOrCompleted(QString module, QString source, QString message);
+class BtInstallProgressDialog: public QDialog {
+
+    Q_OBJECT
+
+public: /* Methods: */
+
+    BtInstallProgressDialog(const QList<CSwordModuleInfo *> & modules,
+                            const QString & destination,
+                            QWidget * parent = 0,
+                            Qt::WindowFlags flags = 0);
+    ~BtInstallProgressDialog();
+
+public slots:
+
+    void slotStopInstall();
+    void slotInstallStarted(int moduleIndex);
+    void slotDownloadStarted(int moduleIndex);
+    void slotStatusUpdated(int moduleIndex, int status);
+    void slotOneItemCompleted(int moduleIndex, bool status);
+    void slotThreadFinished();
+
+protected: /* Methods: */
+
+    /**
+      Handles closing by the window close button, Cancel (Stop) All button, or
+      completing the downloads.
+    */
+    virtual void closeEvent(QCloseEvent * event);
+
+private: /* Methods: */
+
+    QProgressBar * getOrCreateProgressBar(int moduleIndex);
+    QProgressBar * getOrCreateProgressBar(QTreeWidgetItem * item);
+
+private: /* Fields: */
+
+    QTreeWidget * m_statusWidget;
+    QPushButton * m_stopAllButton;
+    BtInstallThread * m_thread;
+    int m_nextInstallIndex;
+
 };
 
 #endif
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallthread.cpp b/src/frontend/bookshelfmanager/installpage/btinstallthread.cpp
deleted file mode 100644
index 3b25f02..0000000
--- a/src/frontend/bookshelfmanager/installpage/btinstallthread.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#include "frontend/bookshelfmanager/installpage/btinstallthread.h"
-
-#include <QApplication>
-#include <QDebug>
-#include <QDir>
-#include <QString>
-#include <QThread>
-#include "backend/managers/cswordbackend.h"
-#include "frontend/bookshelfmanager/btinstallmgr.h"
-#include "backend/btinstallbackend.h"
-
-// Sword includes:
-#include <filemgr.h>
-
-
-BtInstallThread::BtInstallThread(const QString &moduleName, const QString &sourceName,
-                                 const QString &destinationName, QObject *parent)
-        : QThread(parent),
-        done(false),
-        m_module(moduleName),
-        m_destination(destinationName),
-        m_source(sourceName),
-        m_cancelled(false) {
-    m_iMgr = new BtInstallMgr();
-}
-
-
-BtInstallThread::~BtInstallThread() {
-    delete m_iMgr;
-}
-
-void BtInstallThread::run() {
-    qDebug() << "****************************************\nBtInstallThread::run, mod:" << m_module << "\n************************************";
-
-
-    emit preparingInstall(m_module, m_source);
-    //This is 0 before set here - remember when using the value when cancelling
-    // the installation before this has been run
-    m_installSource = QSharedPointer<sword::InstallSource>(new sword::InstallSource(BtInstallBackend::source(m_source)));
-    m_backendForSource = QSharedPointer<CSwordBackend>(BtInstallBackend::backend(*m_installSource));
-
-    //make sure target/mods.d and target/modules exist
-    /// \todo move this to some common precondition
-    QDir dir(m_destination);
-    if (!dir.exists()) {
-        dir.mkdir(m_destination);
-        qDebug() << "made directory" << m_destination;
-    }
-    if (!dir.exists("modules")) {
-        dir.mkdir("modules");
-        qDebug() << "made directory" << m_destination << "/modules";
-    }
-    if (!dir.exists("mods.d")) {
-        dir.mkdir("mods.d");
-        qDebug() << "made directory" << m_destination << "/mods.d";
-    }
-
-    QObject::connect(m_iMgr, SIGNAL(percentCompleted(int, int)), this, SLOT(slotManagerStatusUpdated(int, int)), Qt::QueuedConnection);
-    QObject::connect(m_iMgr, SIGNAL(downloadStarted()), this, SLOT(slotDownloadStarted()), Qt::QueuedConnection);
-
-    //check whether it's an update. If yes, remove existing module first
-    /// \todo silently removing without undo if the user cancels the update is WRONG!!!
-    removeModule();
-
-    // manager for the destination path
-    sword::SWMgr lMgr( m_destination.toLatin1() );
-
-    if (BtInstallBackend::isRemote(*m_installSource)) {
-        int status = m_iMgr->installModule(&lMgr, 0, m_module.toLatin1(), m_installSource.data());
-        if (status != 0) {
-            qWarning() << "Error with install: " << status << "module:" << m_module;
-        }
-        else {
-            done = true;
-            emit installCompleted(m_module, m_source, status);
-        }
-    }
-    else { //local source
-        emit statusUpdated(m_module, 0);
-        int status = m_iMgr->installModule(&lMgr, m_installSource->directory.c_str(), m_module.toLatin1());
-        if (status > 0) {
-            qWarning() << "Error with install: " << status << "module:" << m_module;
-        }
-        else if (status == -1) {
-            // it was terminated, do nothing
-        }
-        else {
-            emit statusUpdated(m_module, 100);
-            done = true;
-            emit installCompleted(m_module, m_source, status);
-        }
-    }
-}
-
-void BtInstallThread::slotStopInstall() {
-    qDebug() << "*************************************\nBtInstallThread::slotStopInstall" << m_module << "\n********************************";
-    if (!done) {
-        done = true;
-        qDebug() << "*********************************\nBtInstallThread::slotStopInstall, installing" << m_module << "was cancelled\n**************************************";
-        m_iMgr->terminate();
-        //this->terminate(); // It's dangerous to forcibly stop, but we will clean up the files
-        //qApp->processEvents();
-        // wait to terminate for some secs. We rather let the execution go on and cleaning up to fail than the app to freeze
-        int notRun = this->wait(25000);
-        if (notRun) {
-            this->terminate();
-            this->wait(10000);
-            qDebug() << "installthread (" << m_module << ") terminated, delete m_iMgr";
-            delete m_iMgr; // this makes sure the ftp library will be cleaned up in the destroyer
-            m_iMgr = 0;
-        }
-        // cleanup: remove the module, remove the temp files
-        // if installation has already started
-        if (m_installSource.data() != 0) {
-            // remove the installed module, just to be sure because mgr may
-            // have been terminated when copying files
-            removeModule();
-            removeTempFiles();
-            qDebug() << "BtInstallThread::slotStopInstall will emit installStopped...";
-        }
-        emit installStopped(m_module, m_source);
-    }
-}
-
-void BtInstallThread::slotManagerStatusUpdated(int totalProgress, int /*fileProgress*/) {
-    emit statusUpdated(m_module, totalProgress);
-}
-
-void BtInstallThread::slotDownloadStarted() {
-    emit downloadStarted(m_module);
-}
-
-void BtInstallThread::removeModule() {
-    CSwordModuleInfo* m;
-    m = CSwordBackend::instance()->findModuleByName(m_module);
-    if (!m) {
-        m = BtInstallBackend::backend(BtInstallBackend::source(m_destination.toLatin1()))->findModuleByName(m_module);
-    }
-    if (m) { //module found?
-        qDebug() << "BtInstallThread::removeModule, module" << m_module << "found";
-        QString prefixPath = m->config(CSwordModuleInfo::AbsoluteDataPath) + "/";
-        QString dataPath = m->config(CSwordModuleInfo::DataPath);
-        if (dataPath.left(2) == "./") {
-            dataPath = dataPath.mid(2);
-        }
-
-        if (prefixPath.contains(dataPath)) {
-            prefixPath.remove( prefixPath.indexOf(dataPath), dataPath.length() );
-        }
-        else {
-            prefixPath = QString::fromLatin1(CSwordBackend::instance()->prefixPath);
-        }
-
-        sword::SWMgr mgr(prefixPath.toLatin1());
-        BtInstallMgr iMgr;
-        iMgr.removeModule(&mgr, m->name().toLatin1());
-    }
-    else {
-        qDebug() << "BtInstallThread::removeModule, module" << m_module << "not found";
-    }
-}
-
-void BtInstallThread::removeTempFiles() {
-    // (take the remote conf file for this module, take DataPath,
-    // take the absolute path of the InstallMgr)
-
-    //sword::InstallSource is = BtInstallBackend::source(m_source);
-    if (BtInstallBackend::isRemote(*m_installSource)) {
-        // get the path for the module temp files
-        CSwordModuleInfo* mInfo = m_backendForSource->findModuleByName(m_module);
-        QString dataPath = mInfo->config(CSwordModuleInfo::AbsoluteDataPath);
-        qDebug() << "Delete path:" << dataPath;
-        // it's easier to use sword than qt
-        sword::FileMgr::removeDir(dataPath.toLatin1().data());
-    }
-}
diff --git a/src/frontend/bookshelfmanager/installpage/btinstallthread.h b/src/frontend/bookshelfmanager/installpage/btinstallthread.h
deleted file mode 100644
index 8bb660d..0000000
--- a/src/frontend/bookshelfmanager/installpage/btinstallthread.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#ifndef BTINSTALLTHREAD_H
-#define BTINSTALLTHREAD_H
-
-#include <QThread>
-
-#include <QSharedPointer>
-#include "frontend/bookshelfmanager/btinstallmgr.h"
-
-
-class BtInstallProgressDialog;
-class CSwordBackend;
-
-/**
-* Thread for installing a module.
-*
-* See the Qt thread documents. We have to be careful with signals and slots,
-* with other things.
-
-The main thread creates and owns the BtInstallThread object.
-When the install thread (the run() method) has been started
-the install thread object receives status update signals
-from the installmgr object. This works because these signals are sent
-from the running install thread but received in the thread object which
-lives in the main thread (note the difference between a thread object and a
-running thread). The slot of the thread object is executed in the main thread
-event loop, not in the install thread.
-
-The running thread sends update signals to the progress dialog.
-(This works because the signals are queued, i.e. the dialog is running
-in the main app event loop which queues the signals. ???)
-
-When the user cancels installing the main thread sends signal to a slot
-in the thread object. The slot is then run in the main thread, not
-in the install thread (note again the difference between a thread object and a
-running thread). That slot terminates the running install thread immediately.
-That is not the cleanest way to do it, but the Sword library has no good
-support for threads. Terminating a Sword InstallMgr takes time and leads to
-slow response. Therefore we stop installing by force and clean up the
-temporary files manually.
-
-* Terminating a thread forcibly is "dangerous and discouraged" but we have to do it,
-* I couldn't get cancelling work reliably otherwise. The Sword library is bad for threads.
-* We use ftp connection and file resources; the connection can be ignored but the files
-* have to be cleaned up after termination.
-*/
-class BtInstallThread : public QThread {
-        Q_OBJECT
-    public:
-        BtInstallThread(const QString &moduleName, const QString &sourceName,
-                        const QString &destinationName, QObject *parent = 0);
-
-        ~BtInstallThread();
-
-    public slots:
-        void slotStopInstall();
-        void slotManagerStatusUpdated(int totalProgress, int fileProgress);
-        void slotDownloadStarted();
-
-    public: // data member
-        bool done;
-
-    protected:
-        virtual void run();
-        void removeModule();
-        void removeTempFiles();
-
-        QString m_module;
-        QString m_destination;
-        QString m_source;
-        bool m_cancelled;
-        BtInstallMgr* m_iMgr;
-        //BtInstallMgr m_iMgr;
-        QSharedPointer<sword::InstallSource> m_installSource;
-        /// \todo it would be best to get the backend from the bookshelf manager install page
-        // where it has already been created. Could fasten the progress dialog startup.
-        QSharedPointer<CSwordBackend> m_backendForSource;
-
-    signals:
-        /** Emitted when the install progress status is updated. */
-        void statusUpdated(QString module, int progressPercent);
-        /** Emitted when installing has been stopped/cancelled. */
-        void installStopped(QString module, QString source);
-        /** Emitted when installing is complete. */
-        void installCompleted(QString module, QString source, int errorStatus);
-        /** Emitted when the first file download has been started. */
-        void downloadStarted(QString module);
-        void preparingInstall(QString module, QString source);
-};
-
-#endif
diff --git a/src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp b/src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp
index 949c82e..856f58b 100644
--- a/src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp
@@ -2,7 +2,7 @@
 
 #include <QApplication>
 #include "backend/btinstallbackend.h"
-#include "util/dialogutil.h"
+#include "frontend/messagedialog.h"
 
 
 BtRefreshProgressDialog::BtRefreshProgressDialog(sword::InstallSource &source,
@@ -44,7 +44,7 @@ bool BtRefreshProgressDialog::runAndDelete() {
         setValue(100);
         qApp->processEvents();
     } else {
-        util::showWarning(this, tr("Warning"),
+        message::showWarning(this, tr("Warning"),
                           tr("Failed to refresh source %1")
                               .arg(QString(m_source.caption)));
     }
diff --git a/src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.h b/src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.h
index dfabcf6..03f82c9 100644
--- a/src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.h
+++ b/src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -12,7 +14,7 @@
 
 #include <QProgressDialog>
 
-#include "frontend/bookshelfmanager/btinstallmgr.h"
+#include "backend/btinstallmgr.h"
 
 
 class BtRefreshProgressDialog: public QProgressDialog {
diff --git a/src/frontend/bookshelfmanager/removepage/btremovepage.cpp b/src/frontend/bookshelfmanager/removepage/btremovepage.cpp
index 8b9dd3c..57879ea 100644
--- a/src/frontend/bookshelfmanager/removepage/btremovepage.cpp
+++ b/src/frontend/bookshelfmanager/removepage/btremovepage.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -17,18 +17,19 @@
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QHeaderView>
-#include <QMessageBox>
 #include <QPushButton>
 #include <QToolButton>
 #include <QVBoxLayout>
 #include "backend/bookshelfmodel/btbookshelffiltermodel.h"
 #include "backend/managers/cswordbackend.h"
+#include "bibletimeapp.h"
 #include "frontend/bookshelfmanager/btmodulemanagerdialog.h"
 #include "frontend/btbookshelfview.h"
 #include "frontend/btbookshelfwidget.h"
+#include "frontend/messagedialog.h"
 #include "util/cresmgr.h"
-#include "util/dialogutil.h"
 #include "util/directory.h"
+#include "util/geticon.h"
 
 // Sword includes:
 #include <swmgr.h>
@@ -40,10 +41,8 @@ const QString groupingOrderKey("GUI/BookshelfManager/RemovePage/grouping");
 }
 
 BtRemovePage::BtRemovePage(BtModuleManagerDialog *parent)
-        : BtConfigDialog::Page(util::directory::getIcon(CResMgr::bookshelfmgr::removepage::icon), parent)
+        : BtConfigDialog::Page(util::getIcon(CResMgr::bookshelfmgr::removepage::icon), parent)
 {
-    namespace DU = util::directory;
-
     m_worksGroupBox = new QGroupBox(this);
     m_worksGroupBox->setFlat(true);
     QVBoxLayout *wLayout = new QVBoxLayout;
@@ -77,7 +76,7 @@ BtRemovePage::BtRemovePage(BtModuleManagerDialog *parent)
     uLayout->addStretch(1);
 
     m_removeButton = new QPushButton(this);
-    m_removeButton->setIcon(DU::getIcon(CResMgr::bookshelfmgr::removepage::remove_icon));
+    m_removeButton->setIcon(util::getIcon(CResMgr::bookshelfmgr::removepage::remove_icon));
     m_removeButton->setEnabled(false);
     uLayout->addWidget(m_removeButton, 0, Qt::AlignRight);
 
@@ -131,13 +130,13 @@ void BtRemovePage::slotRemoveModules() {
     /// \bug <nobr> is not working, Qt bug
     const QString moduleString("<nobr><img src=\"%1\" width=\"%2\" height=\"%3\"/>&nbsp;%4</nobr>");
     const QString iconDir = util::directory::getIconDir().canonicalPath() + '/';
-    Q_FOREACH(const CSwordModuleInfo *m,
+    Q_FOREACH(const CSwordModuleInfo * m,
               m_bookshelfWidget->treeModel()->checkedModules())
     {
-        const QIcon icon = CSwordModuleInfo::moduleIcon(m);
+        const QIcon icon = CSwordModuleInfo::moduleIcon(*m);
         const QSize iconSize = icon.actualSize(QSize(textHeight, textHeight));
         prettyModuleNames.append(moduleString
-                                 .arg(iconDir + CSwordModuleInfo::moduleIconFilename(m))
+                                 .arg(iconDir + CSwordModuleInfo::moduleIconFilename(*m))
                                  .arg(iconSize.width())
                                  .arg(iconSize.height())
                                  .arg(m->name()));
@@ -149,7 +148,7 @@ void BtRemovePage::slotRemoveModules() {
                             .append("<br/><br/>")
                             .append(tr("Do you really want to remove them from your system?"));
 
-    if ((util::showQuestion(this, tr("Remove Works?"), message, QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes)) {  //Yes was pressed.
+    if ((message::showQuestion(this, tr("Remove Works?"), message, QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes)) {  //Yes was pressed.
 
         // Update the module list before really removing. Remember deleting the pointers later.
         QList<CSwordModuleInfo*> toBeDeleted = CSwordBackend::instance()->takeModulesFromList(moduleNames);
@@ -180,7 +179,7 @@ void BtRemovePage::slotRemoveModules() {
                 mgr = mgrDict[ prefixPath ];
             }
             qDebug() << "Removing the module" << mInfo->name() << "...";
-            installMgr.removeModule(mgr, mInfo->module()->Name());
+            installMgr.removeModule(mgr, mInfo->module()->getName());
         }
         //delete the removed moduleinfo pointers
         qDeleteAll(toBeDeleted);
diff --git a/src/frontend/bookshelfmanager/removepage/btremovepage.h b/src/frontend/bookshelfmanager/removepage/btremovepage.h
index 02ff88e..a9600d8 100644
--- a/src/frontend/bookshelfmanager/removepage/btremovepage.h
+++ b/src/frontend/bookshelfmanager/removepage/btremovepage.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
diff --git a/src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp b/src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp
index a0955b2..9fce7ab 100644
--- a/src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp
+++ b/src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
diff --git a/src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.h b/src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.h
index 14e0a67..50da32b 100644
--- a/src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.h
+++ b/src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
diff --git a/src/frontend/btaboutdialog.cpp b/src/frontend/btaboutdialog.cpp
index 1bfe708..fd0a3c9 100644
--- a/src/frontend/btaboutdialog.cpp
+++ b/src/frontend/btaboutdialog.cpp
@@ -2,13 +2,14 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
 
 #include "frontend/btaboutdialog.h"
 
+#include "frontend/messagedialog.h"
 #include <QApplication>
 #include <QDesktopServices>
 #include <QDialogButtonBox>
@@ -18,7 +19,6 @@
 #include <QTextStream>
 #include <QVBoxLayout>
 #include <QWebView>
-#include "util/dialogutil.h"
 #include "util/directory.h"
 
 // Sword includes:
@@ -88,11 +88,8 @@ BtAboutDialog::BtAboutDialog(QWidget *parent, Qt::WindowFlags wflags)
     retranslateUi();
 }
 
-BtAboutDialog::~BtAboutDialog() {
-    // Intentionally empty
-}
-
 void BtAboutDialog::resizeEvent(QResizeEvent* event) {
+    Q_UNUSED(event);
     QString version = "BibleTime " BT_VERSION;
     QFontMetrics fm(m_versionLabel->font());
     int w = width()  - m_iconLabel->width() - 80;
@@ -117,7 +114,7 @@ void BtAboutDialog::retranslateUi() {
     retranslateQtTab();
     retranslateLicenceTab();
 
-    util::prepareDialogBox(m_buttonBox);
+    message::prepareDialogBox(m_buttonBox);
 }
 
 void BtAboutDialog::retranslateBtTab() {
@@ -130,7 +127,7 @@ void BtAboutDialog::retranslateBtTab() {
                   "our team, please send an email to %1.")
                .arg(MAKE_LINK_STATIC("mailto:info@bibletime.info", "info@bibletime.info"));
     content += "</p><p>";
-    content += tr("(c)1999-2011, The BibleTime Team");
+    content += tr("(c)1999-2014, The BibleTime Team");
     content += "</p><p>" MAKE_LINK_STATIC("http://www.bibletime.info", "www.bibletime.info")
                "</p>";
     m_bibletimeTab->setHtml(MAKE_HTML(m_bibletimeTab, content));
@@ -168,6 +165,7 @@ void BtAboutDialog::retranslateContributorsTab() {
         MAKE_CONTR(content, "Eeli Kaikkonnen", developer)
         MAKE_CONTR(content, "Chris Kujawa", developer)
         MAKE_CONTR(content, "Mark Lybarger", developer)
+        MAKE_CONTR(content, "Konstantin Maslyuk", developer)
         MAKE_CONTR(content, "Luke Mauldin", developer)
         MAKE_CONTR(content, "James Ots", designer)
         MAKE_CONTR(content, "Andrus Raag", artist)
@@ -177,6 +175,7 @@ void BtAboutDialog::retranslateContributorsTab() {
         MAKE_CONTR2(content, "Wolfgang Stradner", tr("tester"), tr("usability expert"))
         MAKE_CONTR(content, "Kang Sun", developer)
         MAKE_CONTR(content, "Thorsten Uhlmann", developer)
+        MAKE_CONTR(content, "John Turpish", developer)
         MAKE_CONTR(content, "David White", developer)
         MAKE_CONTR(content, "Mark Zealey", developer)
         MAKE_CONTR(content, "Patrick Sebastian Zimmermann", developer)
@@ -210,6 +209,7 @@ void BtAboutDialog::retranslateContributorsTab() {
                    "<li>Vlad Savitsky</li>"
                    "<li>Henrik Sonesson</li>"
                    "<li>Johan van der Lingen</li>"
+                   "<li>Damian Wrzalski</li>"
                    "<li>Konstantin Maslyuk</li>"
                    "<li>Jean Van Schaftingen</li>"
                    "<li>Roland Teschner</li>"
diff --git a/src/frontend/btaboutdialog.h b/src/frontend/btaboutdialog.h
index 2ad6607..132074a 100644
--- a/src/frontend/btaboutdialog.h
+++ b/src/frontend/btaboutdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -22,7 +24,6 @@ class BtAboutDialog: public QDialog {
         Q_OBJECT
     public:
         BtAboutDialog(QWidget *parent = 0, Qt::WindowFlags wflags = Qt::Dialog);
-        ~BtAboutDialog();
 
     protected:
         virtual void resizeEvent(QResizeEvent* event);
diff --git a/src/frontend/btaboutmoduledialog.cpp b/src/frontend/btaboutmoduledialog.cpp
index ab15fb9..b8603b5 100644
--- a/src/frontend/btaboutmoduledialog.cpp
+++ b/src/frontend/btaboutmoduledialog.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -14,7 +14,7 @@
 #include <QWidget>
 #include "backend/drivers/cswordmoduleinfo.h"
 #include "frontend/btaboutmoduledialog.h"
-#include "util/dialogutil.h"
+#include "frontend/messagedialog.h"
 
 
 BTAboutModuleDialog::BTAboutModuleDialog(const CSwordModuleInfo *moduleInfo,
@@ -44,5 +44,5 @@ BTAboutModuleDialog::BTAboutModuleDialog(const CSwordModuleInfo *moduleInfo,
 void BTAboutModuleDialog::retranslateUi() {
     setWindowTitle(tr("Information About %1").arg(m_moduleInfo->name()));
     m_textEdit->setHtml(m_moduleInfo->aboutText());
-    util::prepareDialogBox(m_buttons);
+    message::prepareDialogBox(m_buttons);
 }
diff --git a/src/frontend/btaboutmoduledialog.h b/src/frontend/btaboutmoduledialog.h
index fda51ea..05f78d1 100644
--- a/src/frontend/btaboutmoduledialog.h
+++ b/src/frontend/btaboutmoduledialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/btbookshelfdockwidget.cpp b/src/frontend/btbookshelfdockwidget.cpp
index 2d85930..46ee023 100644
--- a/src/frontend/btbookshelfdockwidget.cpp
+++ b/src/frontend/btbookshelfdockwidget.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -16,16 +16,17 @@
 #include <QActionGroup>
 #include <QLabel>
 #include <QMenu>
-#include <QMessageBox>
 #include <QPushButton>
 #include <QStackedWidget>
 #include <QVBoxLayout>
 #include "backend/managers/cswordbackend.h"
 #include "bibletime.h"
+#include "bibletimeapp.h"
 #include "frontend/btbookshelfview.h"
 #include "frontend/btbookshelfwidget.h"
+#include "frontend/messagedialog.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
+#include "util/geticon.h"
 
 
 namespace {
@@ -102,7 +103,6 @@ BtBookshelfDockWidget::BtBookshelfDockWidget(QWidget *parent, Qt::WindowFlags f)
 }
 
 void BtBookshelfDockWidget::initMenus() {
-    namespace DU = util::directory;
     namespace RM = CResMgr::mainIndex;
 
     m_itemContextMenu = new QMenu(this);
@@ -115,30 +115,30 @@ void BtBookshelfDockWidget::initMenus() {
     m_itemContextMenu->addAction(m_itemOpenAction);
 
     m_itemSearchAction = new QAction(this);
-    m_itemSearchAction->setIcon(DU::getIcon(RM::search::icon));
+    m_itemSearchAction->setIcon(util::getIcon(RM::search::icon));
     m_itemActionGroup->addAction(m_itemSearchAction);
     m_itemContextMenu->addAction(m_itemSearchAction);
 
     m_itemEditMenu = new QMenu(this);
-    m_itemEditMenu->setIcon(DU::getIcon(RM::editModuleMenu::icon));
+    m_itemEditMenu->setIcon(util::getIcon(RM::editModuleMenu::icon));
     m_itemContextMenu->addMenu(m_itemEditMenu);
     m_itemEditPlainAction = new QAction(this);
-    m_itemEditPlainAction->setIcon(DU::getIcon(RM::editModulePlain::icon));
+    m_itemEditPlainAction->setIcon(util::getIcon(RM::editModulePlain::icon));
     m_itemActionGroup->addAction(m_itemEditPlainAction);
     m_itemEditMenu->addAction(m_itemEditPlainAction);
 
     m_itemEditHtmlAction = new QAction(this);
-    m_itemEditHtmlAction->setIcon(DU::getIcon(RM::editModuleHTML::icon));
+    m_itemEditHtmlAction->setIcon(util::getIcon(RM::editModuleHTML::icon));
     m_itemActionGroup->addAction(m_itemEditHtmlAction);
     m_itemEditMenu->addAction(m_itemEditHtmlAction);
 
     m_itemUnlockAction = new QAction(this);
-    m_itemUnlockAction->setIcon(DU::getIcon(RM::unlockModule::icon));
+    m_itemUnlockAction->setIcon(util::getIcon(RM::unlockModule::icon));
     m_itemActionGroup->addAction(m_itemUnlockAction);
     m_itemContextMenu->addAction(m_itemUnlockAction);
 
     m_itemAboutAction = new QAction(this);
-    m_itemAboutAction->setIcon(DU::getIcon(RM::aboutModule::icon));
+    m_itemAboutAction->setIcon(util::getIcon(RM::aboutModule::icon));
     m_itemActionGroup->addAction(m_itemAboutAction);
     m_itemContextMenu->addAction(m_itemAboutAction);
 
@@ -170,7 +170,7 @@ void BtBookshelfDockWidget::slotModuleActivated(CSwordModuleInfo *module) {
                 warning message. Actually the whole case when the user tries to open a locked
                 module needs to be rethought and refactored.
         */
-        QMessageBox::warning(this, tr("Warning: Module locked!"),
+        message::showWarning(this, tr("Warning: Module locked!"),
                              tr("You are trying to access an encrypted module. Please "
                                 "provide an unlock key in the following dialog to open the "
                                 "module."));
diff --git a/src/frontend/btbookshelfdockwidget.h b/src/frontend/btbookshelfdockwidget.h
index 87508f4..fe415d7 100644
--- a/src/frontend/btbookshelfdockwidget.h
+++ b/src/frontend/btbookshelfdockwidget.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
diff --git a/src/frontend/btbookshelfgroupingmenu.cpp b/src/frontend/btbookshelfgroupingmenu.cpp
index de2bcf6..c456f80 100644
--- a/src/frontend/btbookshelfgroupingmenu.cpp
+++ b/src/frontend/btbookshelfgroupingmenu.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -12,8 +12,10 @@
 
 #include "frontend/btbookshelfgroupingmenu.h"
 
+#include "bibletimeapp.h"
 #include "util/cresmgr.h"
 #include "util/directory.h"
+#include "util/geticon.h"
 
 
 namespace {
@@ -48,12 +50,11 @@ inline const BtBookshelfTreeModel::Grouping &getActionRef(const QAction *a) {
 
 
 void BtBookshelfGroupingMenu::initMenu(bool showNoGrouping) {
-    namespace DU = util::directory;
     namespace RM = CResMgr::mainIndex;
 
     if (!groupsInitialized) initializeGroups();
 
-    setIcon(DU::getIcon(RM::grouping::icon));
+    setIcon(util::getIcon(RM::grouping::icon));
 
     m_groupingActionGroup = new QActionGroup(this);
     m_groupingActionGroup->setExclusive(true);
diff --git a/src/frontend/btbookshelfgroupingmenu.h b/src/frontend/btbookshelfgroupingmenu.h
index 83605a7..f49c3c0 100644
--- a/src/frontend/btbookshelfgroupingmenu.h
+++ b/src/frontend/btbookshelfgroupingmenu.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
diff --git a/src/frontend/btbookshelfview.cpp b/src/frontend/btbookshelfview.cpp
index cb0dcd9..1a04eff 100644
--- a/src/frontend/btbookshelfview.cpp
+++ b/src/frontend/btbookshelfview.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -37,13 +37,10 @@ BtBookshelfView::BtBookshelfView(QWidget *parent)
             this, SLOT(slotItemHovered(QModelIndex)));
 }
 
-BtBookshelfView::~BtBookshelfView() {
-    // Intentionally empty
-}
-
-CSwordModuleInfo *BtBookshelfView::getModule(const QModelIndex &index) const {
-    return (CSwordModuleInfo *) model()
-           ->data(index, BtBookshelfModel::ModulePointerRole).value<void*>();
+CSwordModuleInfo * BtBookshelfView::getModule(const QModelIndex & index) const {
+    void * const module = model()->data(index,
+                                        BtBookshelfModel::ModulePointerRole).value<void *>();
+    return static_cast<CSwordModuleInfo *>(module);
 }
 
 void BtBookshelfView::keyPressEvent(QKeyEvent *event) {
diff --git a/src/frontend/btbookshelfview.h b/src/frontend/btbookshelfview.h
index 940c084..f957785 100644
--- a/src/frontend/btbookshelfview.h
+++ b/src/frontend/btbookshelfview.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -22,7 +22,6 @@ class BtBookshelfView: public QTreeView {
         Q_OBJECT
     public:
         BtBookshelfView(QWidget *parent = 0);
-        virtual ~BtBookshelfView();
 
         CSwordModuleInfo *getModule(const QModelIndex &index) const;
 
diff --git a/src/frontend/btbookshelfwidget.cpp b/src/frontend/btbookshelfwidget.cpp
index c4b0d54..2ce812e 100644
--- a/src/frontend/btbookshelfwidget.cpp
+++ b/src/frontend/btbookshelfwidget.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -24,6 +24,7 @@
 #include <QToolButton>
 #include <QVBoxLayout>
 #include "backend/bookshelfmodel/btbookshelffiltermodel.h"
+#include "bibletimeapp.h"
 #include "frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.h"
 #include "frontend/bookshelfmanager/removepage/btremovepagetreemodel.h"
 #include "frontend/btbookshelfdockwidget.h"
@@ -31,6 +32,7 @@
 #include "frontend/btbookshelfview.h"
 #include "util/cresmgr.h"
 #include "util/directory.h"
+#include "util/geticon.h"
 
 
 BtBookshelfWidget::BtBookshelfWidget(QWidget *parent, Qt::WindowFlags flags)
@@ -61,10 +63,6 @@ BtBookshelfWidget::BtBookshelfWidget(QWidget *parent, Qt::WindowFlags flags)
             this,       SLOT(slotShowItemContextMenu(CSwordModuleInfo*, QPoint)));
 }
 
-BtBookshelfWidget::~BtBookshelfWidget() {
-    // Intentionally empty
-}
-
 void BtBookshelfWidget::setSourceModel(QAbstractItemModel *model) {
     Q_ASSERT(model != 0);
     m_sourceModel = model;
@@ -96,11 +94,10 @@ void BtBookshelfWidget::setRightCornerWidget(QWidget *w) {
 }
 
 void BtBookshelfWidget::initActions() {
-    namespace DU = util::directory;
     namespace RM = CResMgr::mainIndex;
 
     m_showHideAction = new QAction(this);
-    m_showHideAction->setIcon(DU::getIcon("layer-visible-on.svg"));
+    m_showHideAction->setIcon(util::getIcon("layer-visible-on.svg"));
     m_showHideAction->setCheckable(true);
     connect(m_showHideAction, SIGNAL(toggled(bool)),
             m_postFilterModel, SLOT(setShowHidden(bool)));
diff --git a/src/frontend/btbookshelfwidget.h b/src/frontend/btbookshelfwidget.h
index 3f1e605..7811b5c 100644
--- a/src/frontend/btbookshelfwidget.h
+++ b/src/frontend/btbookshelfwidget.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -35,7 +35,6 @@ class BtBookshelfWidget: public QWidget {
     Q_OBJECT
     public:
         explicit BtBookshelfWidget(QWidget *parent = 0, Qt::WindowFlags flags = 0);
-        ~BtBookshelfWidget();
 
         void setSourceModel(QAbstractItemModel *model);
 
diff --git a/src/frontend/btcentralwidget.cpp b/src/frontend/btcentralwidget.cpp
new file mode 100644
index 0000000..04615c3
--- /dev/null
+++ b/src/frontend/btcentralwidget.cpp
@@ -0,0 +1,51 @@
+/*********
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#include "frontend/btcentralwidget.h"
+
+#include "frontend/cmdiarea.h"
+#include "frontend/displaywindow/btactioncollection.h"
+#include "frontend/displaywindow/cdisplaywindow.h"
+#include <QAction>
+#include <QKeyEvent>
+#include <QKeySequence>
+
+
+    BtCentralWidget::BtCentralWidget(CMDIArea* mdiArea, BtFindWidget* findWidget, QWidget* parent)
+        : QWidget(parent), m_mdiArea(mdiArea), m_findWidget(findWidget) {
+    }
+
+void BtCentralWidget::keyPressEvent(QKeyEvent *e) {
+
+//    const QString text = e->text();
+//    if (text.isEmpty()) {
+        QWidget::keyPressEvent(e);
+//        return;
+//    }
+//    CDisplayWindow* activeDisplayWindow = m_mdiArea->getActiveDisplayWindow();
+//    if (activeDisplayWindow != 0) {
+
+//        BtActionCollection* actionCollection =  activeDisplayWindow->actionCollection();
+//        QAction* findAction = actionCollection->action("findText");
+//        QKeySequence keySequence = findAction->shortcut();
+//        QString key = keySequence.toString();
+//        if (key == text)
+//            return;
+//    }
+
+//    if (text.startsWith(QLatin1Char('/'))) {
+//        if (!m_findWidget->isVisible()) {
+//            m_findWidget->showAndClear();
+//        } else {
+//            m_findWidget->show();
+//        }
+//    } else {
+//        QWidget::keyPressEvent(e);
+//    }
+}
diff --git a/src/frontend/btcentralwidget.h b/src/frontend/btcentralwidget.h
new file mode 100644
index 0000000..3ef9002
--- /dev/null
+++ b/src/frontend/btcentralwidget.h
@@ -0,0 +1,33 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#ifndef BTCENTRALWIDGET_H
+#define BTCENTRALWIDGET_H
+
+#include <QWidget>
+class QKeyEvent;
+class CMDIArea;
+class BtFindWidget;
+
+class BtCentralWidget: public QWidget {
+
+public:
+    BtCentralWidget(CMDIArea* mdiArea, BtFindWidget* findWidget, QWidget* parent=0);
+
+protected:
+    void keyPressEvent(QKeyEvent *e);
+
+private:
+    CMDIArea* m_mdiArea;
+    BtFindWidget* m_findWidget;
+};
+
+#endif
diff --git a/src/frontend/btmenuview.cpp b/src/frontend/btmenuview.cpp
index 71998b7..919602b 100644
--- a/src/frontend/btmenuview.cpp
+++ b/src/frontend/btmenuview.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
diff --git a/src/frontend/btmenuview.h b/src/frontend/btmenuview.h
index 98ec729..39b56f6 100644
--- a/src/frontend/btmenuview.h
+++ b/src/frontend/btmenuview.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
diff --git a/src/frontend/btmodulechooserdialog.cpp b/src/frontend/btmodulechooserdialog.cpp
index e8f3dd0..e6ed79f 100644
--- a/src/frontend/btmodulechooserdialog.cpp
+++ b/src/frontend/btmodulechooserdialog.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -19,7 +19,7 @@
 #include "frontend/btaboutmoduledialog.h"
 #include "frontend/btbookshelfview.h"
 #include "frontend/btbookshelfwidget.h"
-#include "util/dialogutil.h"
+#include "frontend/messagedialog.h"
 #include "util/tool.h"
 
 
@@ -49,12 +49,8 @@ BtModuleChooserDialog::BtModuleChooserDialog(QWidget *parent, Qt::WindowFlags fl
     retranslateUi();
 }
 
-BtModuleChooserDialog::~BtModuleChooserDialog() {
-    // Intentionally empty
-}
-
 void BtModuleChooserDialog::retranslateUi() {
-    util::prepareDialogBox(m_buttonBox);
+    message::prepareDialogBox(m_buttonBox);
 }
 
 void BtModuleChooserDialog::slotModuleAbout(CSwordModuleInfo *module) {
diff --git a/src/frontend/btmodulechooserdialog.h b/src/frontend/btmodulechooserdialog.h
index 706088c..685ac48 100644
--- a/src/frontend/btmodulechooserdialog.h
+++ b/src/frontend/btmodulechooserdialog.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -24,8 +24,6 @@ class QLabel;
 
 class BtModuleChooserDialog : public QDialog {
     Q_OBJECT
-    public:
-        virtual ~BtModuleChooserDialog();
 
     protected:
         explicit BtModuleChooserDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
diff --git a/src/frontend/btmoduleindexdialog.cpp b/src/frontend/btmoduleindexdialog.cpp
index 2dac498..2714ea7 100644
--- a/src/frontend/btmoduleindexdialog.cpp
+++ b/src/frontend/btmoduleindexdialog.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/btmoduleindexdialog.h b/src/frontend/btmoduleindexdialog.h
index 29a13c4..8b794f9 100644
--- a/src/frontend/btmoduleindexdialog.h
+++ b/src/frontend/btmoduleindexdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/btopenworkaction.cpp b/src/frontend/btopenworkaction.cpp
index 50d0d5f..a398412 100644
--- a/src/frontend/btopenworkaction.cpp
+++ b/src/frontend/btopenworkaction.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -14,8 +14,9 @@
 
 #include "backend/bookshelfmodel/btbookshelffiltermodel.h"
 #include "backend/managers/cswordbackend.h"
+#include "bibletimeapp.h"
 #include "frontend/btbookshelfgroupingmenu.h"
-#include "util/directory.h"
+#include "util/geticon.h"
 
 
 BtOpenWorkActionMenu::BtOpenWorkActionMenu(const QString &groupingConfigKey,
@@ -33,10 +34,6 @@ BtOpenWorkActionMenu::BtOpenWorkActionMenu(const QString &groupingConfigKey,
             this, SLOT(slotIndexTriggered(QModelIndex)));
 }
 
-BtOpenWorkActionMenu::~BtOpenWorkActionMenu() {
-    // Intentionally empty
-}
-
 void BtOpenWorkActionMenu::setSourceModel(QAbstractItemModel *model) {
     m_treeModel->setSourceModel(model);
 }
@@ -81,7 +78,7 @@ BtOpenWorkAction::BtOpenWorkAction(const QString &groupingConfigKey,
     m_menu->setSourceModel(CSwordBackend::instance()->model());
 
     setMenu(m_menu);
-    setIcon(util::directory::getIcon("folder-open.svg"));
+    setIcon(util::getIcon("folder-open.svg"));
     retranslateUi();
     slotModelChanged();
 
diff --git a/src/frontend/btopenworkaction.h b/src/frontend/btopenworkaction.h
index 6b28908..1ca8379 100644
--- a/src/frontend/btopenworkaction.h
+++ b/src/frontend/btopenworkaction.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -29,7 +29,6 @@ class BtOpenWorkActionMenu: public BtMenuView {
     public:
         BtOpenWorkActionMenu(const QString &groupingConfigKey,
                              QWidget *parent = 0);
-        ~BtOpenWorkActionMenu();
 
         void setSourceModel(QAbstractItemModel *model);
         inline QAbstractItemModel *sourceModel() const { return m_treeModel->sourceModel(); }
diff --git a/src/frontend/cdragdrop.h b/src/frontend/cdragdrop.h
index 8fa270f..869d2fb 100644
--- a/src/frontend/cdragdrop.h
+++ b/src/frontend/cdragdrop.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/cexportmanager.cpp b/src/frontend/cexportmanager.cpp
index 640eae7..e7546ba 100644
--- a/src/frontend/cexportmanager.cpp
+++ b/src/frontend/cexportmanager.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -76,7 +76,7 @@ bool CExportManager::saveKey(CSwordKey* key, const Format format, const bool add
 
     CSwordVerseKey *vk = dynamic_cast<CSwordVerseKey*>(key);
     if (vk && vk->isBoundSet()) {
-        text = render->renderKeyRange( QString::fromUtf8(vk->LowerBound()), QString::fromUtf8(vk->UpperBound()), modules );
+        text = render->renderKeyRange( QString::fromUtf8(vk->getLowerBound()), QString::fromUtf8(vk->getUpperBound()), modules );
     }
     else { //no range supported
         text = render->renderSingleKey(key->key(), modules);
@@ -90,14 +90,12 @@ bool CExportManager::saveKey(CSwordKey* key, const Format format, const bool add
     return true;
 }
 
-bool CExportManager::saveKeyList(const sword::ListKey &l,
+bool CExportManager::saveKeyList(const sword::ListKey & l,
                                  const CSwordModuleInfo *module,
                                  Format format,
                                  bool addText)
 {
-    /// \warning This is a workaround for Sword constness
-    sword::ListKey list = l;
-    if (!list.Count())
+    if (!l.getCount())
         return false;
 
     const QString filename = getSaveFileName(format);
@@ -107,12 +105,13 @@ bool CExportManager::saveKeyList(const sword::ListKey &l,
 
     CTextRendering::KeyTree tree; /// \todo Verify that items in tree are properly freed.
 
-    setProgressRange(list.Count());
+    setProgressRange(l.getCount());
     CTextRendering::KeyTreeItem::Settings itemSettings;
     itemSettings.highlight = false;
 
+    sword::ListKey list(l);
     list.setPosition(sword::TOP);
-    while (!list.Error() && !progressWasCancelled()) {
+    while (!list.popError() && !progressWasCancelled()) {
         tree.append( new CTextRendering::KeyTreeItem(QString::fromLocal8Bit((const char*)list) , module, itemSettings) );
         incProgress();
 
@@ -180,8 +179,8 @@ bool CExportManager::copyKey(CSwordKey* key, const Format format, const bool add
     CSwordVerseKey * vk = dynamic_cast<CSwordVerseKey*>(key);
     if (vk && vk->isBoundSet()) {
         text = render->renderKeyRange(
-                   QString::fromUtf8(vk->LowerBound()),
-                   QString::fromUtf8(vk->UpperBound()),
+                   QString::fromUtf8(vk->getLowerBound()),
+                   QString::fromUtf8(vk->getUpperBound()),
                    modules
                );
     }
@@ -201,7 +200,7 @@ bool CExportManager::copyKeyList(const sword::ListKey &l,
                                  bool addText)
 {
     sword::ListKey list = l;
-    if (!list.Count())
+    if (!list.getCount())
         return false;
 
     CTextRendering::KeyTree tree; /// \todo Verify that items in tree are properly freed.
@@ -209,7 +208,7 @@ bool CExportManager::copyKeyList(const sword::ListKey &l,
     itemSettings.highlight = false;
 
     list.setPosition(sword::TOP);
-    while (!list.Error() && !progressWasCancelled()) {
+    while (!list.popError() && !progressWasCancelled()) {
         tree.append( new CTextRendering::KeyTreeItem(QString::fromLocal8Bit((const char*)list) , module, itemSettings) );
 
         list.increment();
@@ -254,18 +253,16 @@ bool CExportManager::copyKeyList(const QList<CSwordKey*> &list,
     return true;
 }
 
-bool CExportManager::printKeyList(const sword::ListKey &l,
+bool CExportManager::printKeyList(const sword::ListKey & list,
                                   const CSwordModuleInfo *module,
                                   const DisplayOptions &displayOptions,
                                   const FilterOptions &filterOptions)
 {
-    /// \warning This is a workaround for Sword constness
-    sword::ListKey list = l;
     CPrinter::KeyTreeItem::Settings settings;
     CPrinter::KeyTree tree; /// \todo Verify that items in tree are properly freed.
 
-    setProgressRange(list.Count());
-    for (int i=0; i< list.Count(); i++) {
+    setProgressRange(list.getCount());
+    for (int i=0; i< list.getCount(); i++) {
         const sword::SWKey* swKey = list.getElement(i);
         const sword::VerseKey* vKey = dynamic_cast<const sword::VerseKey*>(swKey);
         if (vKey != 0) {
@@ -370,13 +367,13 @@ bool CExportManager::printByHyperlink(const QString &hyperlink,
     if (module) {
         //check if we have a range of entries or a single one
         if ((module->type() == CSwordModuleInfo::Bible) || (module->type() == CSwordModuleInfo::Commentary)) {
-            sword::ListKey verses = sword::VerseKey().ParseVerseList((const char*)keyName.toUtf8(), "Genesis 1:1", true);
+            sword::ListKey verses = sword::VerseKey().parseVerseList((const char*)keyName.toUtf8(), "Genesis 1:1", true);
 
-            for (int i = 0; i < verses.Count(); ++i) {
+            for (int i = 0; i < verses.getCount(); i++) {
                 sword::VerseKey* element = dynamic_cast<sword::VerseKey*>(verses.getElement(i));
                 if (element) {
-                    const QString startKey = QString::fromUtf8(element->LowerBound().getText());
-                    const QString stopKey =  QString::fromUtf8(element->UpperBound().getText());
+                    const QString startKey = QString::fromUtf8(element->getLowerBound().getText());
+                    const QString stopKey =  QString::fromUtf8(element->getUpperBound().getText());
 
                     tree.append( new CPrinter::KeyTreeItem(startKey, stopKey, module, settings) );
                 }
diff --git a/src/frontend/cexportmanager.h b/src/frontend/cexportmanager.h
index 0d882e0..a222ac8 100644
--- a/src/frontend/cexportmanager.h
+++ b/src/frontend/cexportmanager.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -12,7 +14,7 @@
 
 #include <QList>
 #include <QString>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "btglobal.h"
 
 class CSwordKey;
@@ -37,8 +39,8 @@ class CExportManager {
 
         CExportManager(const bool showProgress = true,
                        const QString &progressLabel = QString::null,
-                       const FilterOptions &filterOptions = CBTConfig::getFilterOptionDefaults(),
-                       const DisplayOptions &displayOptions = CBTConfig::getDisplayOptionDefaults());
+                       const FilterOptions &filterOptions = btConfig().getFilterOptions(),
+                       const DisplayOptions &displayOptions = btConfig().getDisplayOptions());
         ~CExportManager();
 
         bool saveKey(CSwordKey* key, const Format format, const bool addText);
diff --git a/src/frontend/cinfodisplay.cpp b/src/frontend/cinfodisplay.cpp
index 8165b8b..202eb48 100644
--- a/src/frontend/cinfodisplay.cpp
+++ b/src/frontend/cinfodisplay.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -20,15 +20,16 @@
 #include <QtAlgorithms>
 #include <QMenu>
 
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/drivers/cswordmoduleinfo.h"
 #include "backend/keys/cswordkey.h"
 #include "backend/keys/cswordversekey.h"
 #include "backend/managers/referencemanager.h"
 #include "backend/managers/cdisplaytemplatemgr.h"
+#include "bibletime.h"
 #include "frontend/crossrefrendering.h"
-#include "frontend/display/cdisplay.h"
-#include "frontend/display/creaddisplay.h"
+#include "frontend/display/bthtmlreaddisplay.h"
+#include "util/htmlescape.h"
 
 // Sword includes:
 #include <listkey.h>
@@ -39,33 +40,36 @@ using namespace sword;
 
 namespace InfoDisplay {
 
-CInfoDisplay::CInfoDisplay(QWidget *parent) : QWidget(parent) {
-    QVBoxLayout* layout = new QVBoxLayout(this);
+CInfoDisplay::CInfoDisplay(BibleTime * parent)
+        : QWidget(parent)
+        , m_mainWindow(parent)
+{
+    QVBoxLayout * const layout = new QVBoxLayout(this);
     layout->setContentsMargins(2, 2, 2, 2); // Leave small border
     setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
 
-    m_htmlPart = CDisplay::createReadInstance(0, this);
-    m_htmlPart->setMouseTracking(false); //we don't want strong/lemma/note mouse infos
+    m_htmlPart = new BtHtmlReadDisplay(0, this);
+    m_htmlPart->setMouseTracking(false); // We don't want strong/lemma/note mouse infos
     m_htmlPart->view()->setAcceptDrops(false);
 
-    QAction* selectAllAction = new QAction(QIcon(), tr("Select all"), this);
+    QAction * const selectAllAction = new QAction(QIcon(), tr("Select all"), this);
     selectAllAction->setShortcut(QKeySequence::SelectAll);
-    QObject::connect(selectAllAction, SIGNAL(triggered()), this, SLOT(selectAll()) );
+    QObject::connect(selectAllAction, SIGNAL(triggered()),
+                     this,            SLOT(selectAll()));
 
-    QAction* copyAction = new QAction(tr("Copy"), this);
-    copyAction->setShortcut( QKeySequence(Qt::CTRL + Qt::Key_C) );
-    QObject::connect(copyAction, SIGNAL(triggered()), m_htmlPart->connectionsProxy(), SLOT(copySelection()) );
+    QAction * const copyAction = new QAction(tr("Copy"), this);
+    copyAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_C));
+    QObject::connect(copyAction,                     SIGNAL(triggered()),
+                     m_htmlPart->connectionsProxy(), SLOT(copySelection()));
 
-    QMenu* menu = new QMenu(this);
+    QMenu * const menu = new QMenu(this);
     menu->addAction(selectAllAction);
     menu->addAction(copyAction);
     m_htmlPart->installPopup(menu);
 
-    connect(
-        m_htmlPart->connectionsProxy(),
-        SIGNAL(referenceClicked(const QString&, const QString&)),
-        SLOT(lookupInfo(const QString&, const QString&))
-    );
+    QObject::connect(m_htmlPart->connectionsProxy(),
+                     SIGNAL(referenceClicked(const QString &, const QString &)),
+                     SLOT(lookupInfo(const QString &, const QString &)));
 
     layout->addWidget(m_htmlPart->view());
 
@@ -80,102 +84,101 @@ void CInfoDisplay::unsetInfo() {
                "moving the mouse.</small>"));
 }
 
-void CInfoDisplay::setInfo(const QString &data, const QString &lang) {
-    CDisplayTemplateMgr *mgr = CDisplayTemplateMgr::instance();
+void CInfoDisplay::setInfo(const QString & renderedData, const QString & lang) {
+    CDisplayTemplateMgr * const mgr = CDisplayTemplateMgr::instance();
     Q_ASSERT(mgr != 0);
 
     CDisplayTemplateMgr::Settings settings;
     settings.pageCSS_ID = "infodisplay";
 
     QString div = "<div class=\"infodisplay\"";
-    if (!lang.isEmpty()) {
-        div.append(" lang=\"");
-        div.append(lang);
-        div.append("\"");
-    }
+    if (!lang.isEmpty())
+        div.append(" lang=\"").append(lang).append("\"");
+
     div.append(">");
 
     QString content(mgr->fillTemplate(CDisplayTemplateMgr::activeTemplateName(),
-                                      div + data + "</div>",
+                                      div + renderedData + "</div>",
                                       settings));
     m_htmlPart->setText(content);
 }
 
-void CInfoDisplay::lookupInfo(const QString &mod_name, const QString &key_text) {
+void CInfoDisplay::lookupInfo(const QString & mod_name,
+                              const QString & key_text)
+{
     qDebug() << "CInfoDisplay::lookup";
     qDebug() <<  mod_name <<  key_text;
-    CSwordModuleInfo* m = CSwordBackend::instance()->findModuleByName(mod_name);
+    CSwordModuleInfo * const m = CSwordBackend::instance()->findModuleByName(mod_name);
     Q_ASSERT(m);
     if (!m)
         return;
-    QSharedPointer<CSwordKey> key( CSwordKey::createInstance(m) );
+    QSharedPointer<CSwordKey> key(CSwordKey::createInstance(m));
     key->setKey(key_text);
 
     setInfo(key->renderedText(), m->language()->abbrev());
 }
 
-void CInfoDisplay::setInfo(const InfoType type, const QString& data) {
+void CInfoDisplay::setInfo(const InfoType type, const QString & data) {
     ListInfoData list;
-    list.append( qMakePair(type, data) );
-
+    list.append(qMakePair(type, data));
     setInfo(list);
 }
 
 
-void CInfoDisplay::setInfo(const ListInfoData& list) {
-    //if the widget is hidden it would be inefficient to render and display the data
-    if (!isVisible()) {
+void CInfoDisplay::setInfo(const ListInfoData & list) {
+    // If the widget is hidden it would be inefficient to render and display the data
+    if (!isVisible())
         return;
-    }
 
     if (list.isEmpty()) {
         m_htmlPart->setText("<html></html>");
         return;
     }
 
-    QString text;
+    QString renderedText;
 
     ListInfoData::const_iterator end = list.end();
     for (ListInfoData::const_iterator it = list.begin(); it != end; ++it) {
-        switch ( (*it).first ) {
+        switch ((*it).first) {
             case Lemma:
-                text.append( decodeStrongs( (*it).second ) );
+                renderedText.append(decodeStrongs((*it).second));
                 continue;
             case Morph:
-                text.append( decodeMorph( (*it).second ) );
+                renderedText.append(decodeMorph((*it).second));
                 continue;
             case CrossReference:
-                text.append( decodeCrossReference( (*it).second ) );
+                renderedText.append(decodeCrossReference((*it).second));
                 continue;
             case Footnote:
-                text.append( decodeFootnote( (*it).second ) );
+                renderedText.append(decodeFootnote((*it).second));
                 continue;
             case WordTranslation:
-                text.append( getWordTranslation( (*it).second ) );
+                renderedText.append(getWordTranslation((*it).second));
                 continue;
             case WordGloss:
-                //text.append( getWordTranslation( (*it).second ) );
+                //text.append(getWordTranslation((*it).second));
                 continue;
             case Abbreviation:
-                text.append( decodeAbbreviation( (*it).second ) );
+                renderedText.append(decodeAbbreviation((*it).second));
                 continue;
             case Text:
-                text.append( (*it).second );
+                renderedText.append((*it).second);
                 continue;
             default:
                 continue;
         };
     }
-
-    setInfo(text);
+    setInfo(renderedText);
 }
 
-void CInfoDisplay::setInfo(CSwordModuleInfo *module) {
+void CInfoDisplay::setInfo(CSwordModuleInfo * const module) {
+    using util::htmlEscape;
+
     if (module) {
         setInfo(tr("<div class=\"moduleinfo\"><h3>%1</h3><p>%2</p><p>Version: %3</p></div>")
-                .arg(module->name())
-                .arg(module->config(CSwordModuleInfo::Description))
-                .arg(module->config(CSwordModuleInfo::ModuleVersion)));
+                .arg(htmlEscape(module->name()))
+                .arg(htmlEscape(module->config(CSwordModuleInfo::Description)))
+                .arg(htmlEscape(module->config(CSwordModuleInfo::ModuleVersion))));
     } else {
         unsetInfo();
     }
@@ -185,28 +188,21 @@ void CInfoDisplay::selectAll() {
     m_htmlPart->selectAll();
 }
 
-const QString CInfoDisplay::decodeAbbreviation( const QString& data ) {
-    //  QStringList strongs = QStringList::split("|", data);
-    QString ret;
-    QString text = data;
-
-    ret.append(
-        QString("<div class=\"abbreviation\"><h3>%1: %2</h3><p>%3</p></div>")
+const QString CInfoDisplay::decodeAbbreviation(const QString & data) {
+    // QStringList strongs = QStringList::split("|", data);
+    return QString("<div class=\"abbreviation\"><h3>%1: %2</h3><p>%3</p></div>")
         .arg(tr("Abbreviation"))
         .arg("text")
-        .arg(text));
-
-    return ret;
+        .arg(data);
 }
 
-const QString CInfoDisplay::decodeCrossReference( const QString& data ) {
+const QString CInfoDisplay::decodeCrossReference(const QString & data) {
     Q_ASSERT(!data.isEmpty());
-    if (data.isEmpty()) {
+    if (data.isEmpty())
         return QString("<div class=\"crossrefinfo\"><h3>%1</h3></div>")
                .arg(tr("Cross references"));
-    }
 
-    //  qWarning("setting crossref %s", data.latin1());
+    // qWarning("setting crossref %s", data.latin1());
 
     DisplayOptions dispOpts;
     dispOpts.lineBreaks  = false;
@@ -223,99 +219,87 @@ const QString CInfoDisplay::decodeCrossReference( const QString& data ) {
     CrossRefRendering renderer(dispOpts, filterOpts);
     CTextRendering::KeyTree tree;
 
-    //  const bool isBible = true;
-    CSwordModuleInfo* module = CBTConfig::get(CBTConfig::standardBible);
+    // const bool isBible = true;
+    const CSwordModuleInfo * module = btConfig().getDefaultSwordModuleByType("standardBible");
+    if (!module)
+        module = m_mainWindow->getCurrentModule();
 
-    //a prefixed module gives the module to look into
+    // a prefixed module gives the module to look into
     QRegExp re("^[^ ]+:");
-    //  re.setMinimal(true);
+    // re.setMinimal(true);
     int pos = re.indexIn(data);
-    if (pos != -1) {
+    if (pos != -1)
         pos += re.matchedLength() - 1;
-    }
 
     if (pos > 0) {
         const QString moduleName = data.left(pos);
-        //     qWarning("found module %s", moduleName.latin1());
+        // qWarning("found module %s", moduleName.latin1());
         module = CSwordBackend::instance()->findModuleByName(moduleName);
-        if (!module) {
-            module = CBTConfig::get(CBTConfig::standardBible);
-        }
-        //   Q_ASSERT(module);
+        if (!module)
+            module = btConfig().getDefaultSwordModuleByType("standardBible");
+        // Q_ASSERT(module);
     }
 
-    //Q_ASSERT(module); //why? the existense of the module is tested later
-    CTextRendering::KeyTreeItem::Settings settings (
+    // Q_ASSERT(module); // why? the existense of the module is tested later
+    CTextRendering::KeyTreeItem::Settings settings(
         false,
         CTextRendering::KeyTreeItem::Settings::CompleteShort
     );
 
     if (module && (module->type() == CSwordModuleInfo::Bible)) {
         VerseKey vk;
-        sword::ListKey refs = vk.ParseVerseList((const char*)data.mid((pos == -1) ? 0 : pos + 1).toUtf8(), "Gen 1:1", true);
+        sword::ListKey refs = vk.parseVerseList((const char*) data.mid((pos == -1) ? 0 : pos + 1).toUtf8(), "Gen 1:1", true);
 
-        for (int i = 0; i < refs.Count(); ++i) {
-            SWKey* key = refs.getElement(i);
+        for (int i = 0; i < refs.getCount(); i++) {
+            SWKey * const key = refs.getElement(i);
             Q_ASSERT(key);
-            VerseKey* vk = dynamic_cast<VerseKey*>(key);
+            VerseKey * const vk = dynamic_cast<VerseKey*>(key);
 
-            CTextRendering::KeyTreeItem* itm = (CTextRendering::KeyTreeItem*)0; //explicit conversion for MS VS
-            if (vk && vk->isBoundSet()) { //render a range of keys
-                itm = new CTextRendering::KeyTreeItem(
-                    QString::fromUtf8(vk->LowerBound().getText()),
-                    QString::fromUtf8(vk->UpperBound().getText()),
+            if (vk && vk->isBoundSet()) { // render a range of keys
+                tree.append(new CTextRendering::KeyTreeItem(
+                    QString::fromUtf8(vk->getLowerBound().getText()),
+                    QString::fromUtf8(vk->getUpperBound().getText()),
                     module,
                     settings
-                );
-            }
-            else {
-                itm = new CTextRendering::KeyTreeItem(
+                ));
+            } else {
+                tree.append(new CTextRendering::KeyTreeItem(
                     QString::fromUtf8(key->getText()),
                     QString::fromUtf8(key->getText()),
                     module,
                     settings
-                );
+                ));
             }
-
-            Q_ASSERT(itm);
-
-            tree.append( itm );
         }
-    }
-    else if (module) {
-        CTextRendering::KeyTreeItem* itm = new CTextRendering::KeyTreeItem(
-            data.mid((pos == -1) ? 0 : pos + 1),
-            module,
-            settings
-        );
-        tree.append( itm );
+    } else if (module) {
+        tree.append(new CTextRendering::KeyTreeItem(data.mid((pos == -1)
+                                                             ? 0
+                                                             : pos + 1),
+                                                    module,
+                                                    settings));
     }
 
-    //  qWarning("rendered the tree: %s", renderer.renderKeyTree(tree).latin1());
-    //spanns containing rtl text need dir=rtl on their parent tag to be aligned properly
+    // qWarning("rendered the tree: %s", renderer.renderKeyTree(tree).latin1());
+    // spanns containing rtl text need dir=rtl on their parent tag to be aligned properly
     QString lang = "en";  // default english
-    if (module) {
+    if (module)
         lang = module->language()->abbrev();
-    }
-
-    const QString RenderedText = renderer.renderKeyTree(tree);
 
     return QString("<div class=\"crossrefinfo\" lang=\"%1\"><h3>%2</h3><div class=\"para\" dir=\"%3\">%4</div></div>")
            .arg(lang)
            .arg(tr("Cross references"))
            .arg(module ? ((module->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl") : "")
-                   .arg(RenderedText);
+           .arg(renderer.renderKeyTree(tree));
 }
 
 /*!
-    \fn CInfoDisplay::decodeFootnote( const QString& data )
+    \fn CInfoDisplay::decodeFootnote(const QString & data)
     */
-const QString CInfoDisplay::decodeFootnote( const QString& data ) {
+const QString CInfoDisplay::decodeFootnote(const QString & data) {
     QStringList list = data.split("/");
     Q_ASSERT(list.count() >= 3);
-    if (!list.count()) {
+    if (!list.count())
         return QString::null;
-    }
 
     FilterOptions filterOpts;
     filterOpts.headings    = false;
@@ -336,25 +320,23 @@ const QString CInfoDisplay::decodeFootnote( const QString& data ) {
     list.pop_front();
     const QString keyname = list.join("/");
 
-    CSwordModuleInfo* module = CSwordBackend::instance()->findModuleByName(modulename);
-    if (!module) {
+    CSwordModuleInfo * const module = CSwordBackend::instance()->findModuleByName(modulename);
+    if (!module)
         return QString::null;
-    }
 
-    QSharedPointer<CSwordKey> key( CSwordKey::createInstance(module) );
+    QSharedPointer<CSwordKey> key(CSwordKey::createInstance(module));
     key->setKey(keyname);
-    key->renderedText(CSwordKey::ProcessEntryAttributesOnly); //force entryAttributes
+    key->renderedText(CSwordKey::ProcessEntryAttributesOnly); // force entryAttributes
 
-    const char* note =
+    const char * const note =
         module->module()->getEntryAttributes()
         ["Footnote"][swordFootnote.toLatin1().data()]["body"].c_str();
 
     QString text = module->isUnicode() ? QString::fromUtf8(note) : QString(note);
-    text = QString::fromUtf8(module->module()->RenderText(
+    text = QString::fromUtf8(module->module()->renderText(
                                  module->isUnicode()
-                                 ? (const char*)text.toUtf8()
-                                 : (const char*)text.toLatin1()
-                             ));
+                                 ? static_cast<const char *>(text.toUtf8())
+                                 : static_cast<const char *>(text.toLatin1())));
 
     return QString("<div class=\"footnoteinfo\" lang=\"%1\"><h3>%2</h3><p>%3</p></div>")
            .arg(module->language()->abbrev())
@@ -362,22 +344,22 @@ const QString CInfoDisplay::decodeFootnote( const QString& data ) {
            .arg(text);
 }
 
-const QString CInfoDisplay::decodeStrongs( const QString& data ) {
+const QString CInfoDisplay::decodeStrongs(const QString & data) {
     QStringList strongs = data.split("|");
     QString ret;
 
     QStringList::const_iterator end = strongs.end();
     for (QStringList::const_iterator it = strongs.begin(); it != end; ++it) {
-        CSwordModuleInfo* const module = CBTConfig::get
+        CSwordModuleInfo * const module = btConfig().getDefaultSwordModuleByType
                                          (
                                              ((*it).left(1) == QString("H")) ?
-                                             CBTConfig::standardHebrewStrongsLexicon :
-                                             CBTConfig::standardGreekStrongsLexicon
+                                             "standardHebrewStrongsLexicon" :
+                                             "standardGreekStrongsLexicon"
                                          );
 
         QString text;
         if (module) {
-            QSharedPointer<CSwordKey> key( CSwordKey::createInstance(module) );
+            QSharedPointer<CSwordKey> key(CSwordKey::createInstance(module));
             key->setKey((*it).mid(1)); // skip H or G (language sign), will have to change later if we have better modules
             text = key->renderedText();
         }
@@ -398,13 +380,13 @@ const QString CInfoDisplay::decodeStrongs( const QString& data ) {
     return ret;
 }
 
-const QString CInfoDisplay::decodeMorph( const QString& data ) {
+const QString CInfoDisplay::decodeMorph(const QString & data) {
     QStringList morphs = data.split("|");
     QString ret;
 
-    foreach(QString morph, morphs) {
+    Q_FOREACH (QString morph, morphs) {
         //qDebug() << "CInfoDisplay::decodeMorph, morph: " << morph;
-        CSwordModuleInfo* module = 0;
+        CSwordModuleInfo * module = 0;
         bool skipFirstChar = false;
         QString value = "";
         QString valueClass = "";
@@ -412,8 +394,8 @@ const QString CInfoDisplay::decodeMorph( const QString& data ) {
         int valStart = morph.indexOf(':');
         if (valStart > -1) {
             valueClass = morph.mid(0, valStart);
-            //qDebug() << "valueClass: " << valueClass;
-            module = CSwordBackend::instance()->findModuleByName( valueClass );
+            // qDebug() << "valueClass: " << valueClass;
+            module = CSwordBackend::instance()->findModuleByName(valueClass);
         }
         value = morph.mid(valStart + 1); //works for prepended module and without (-1 +1 == 0).
 
@@ -425,51 +407,46 @@ const QString CInfoDisplay::decodeMorph( const QString& data ) {
             if (value.size() > 1 && value.at(1).isDigit()) {
                 switch (value.at(0).toLatin1()) {
                     case 'G':
-                        module = CBTConfig::get
-                                 (CBTConfig::standardGreekMorphLexicon);
+                        module = btConfig().getDefaultSwordModuleByType("standardGreekMorphLexicon");
                         skipFirstChar = true;
                         break;
                     case 'H':
-                        module = CBTConfig::get
-                                 (CBTConfig::standardHebrewMorphLexicon);
+                        module = btConfig().getDefaultSwordModuleByType("standardHebrewMorphLexicon");
                         skipFirstChar = true;
                         break;
                     default:
                         skipFirstChar = false;
                         /// \todo we can't tell here if it's a greek or hebrew moprh code, that's a problem we have to solve
-                        //       module = CBTConfig::get(CBTConfig::standardGreekMorphLexicon);
+                        //       module = getBtConfig().getDefaultSwordModuleByType("standardGreekMorphLexicon");
                         break;
                 }
             }
             //if it is still not set use the default
-            if (!module) {
-                module = CBTConfig::get
-                         (CBTConfig::standardGreekMorphLexicon);
-            }
+            if (!module)
+                module = btConfig().getDefaultSwordModuleByType("standardGreekMorphLexicon");
         }
 
         QString text;
-        //Q_ASSERT(module);
+        // Q_ASSERT(module);
         if (module) {
-            QSharedPointer<CSwordKey> key( CSwordKey::createInstance(module) );
+            QSharedPointer<CSwordKey> key(CSwordKey::createInstance(module));
 
-            //skip H or G (language sign) if we have to skip it
+            // skip H or G (language sign) if we have to skip it
             const bool isOk = key->setKey(skipFirstChar ? value.mid(1) : value);
-            //Q_ASSERT(isOk);
-            if (!isOk) { //try to use the other morph lexicon, because this one failed with the current morph code
-                key->setModule(CBTConfig::get
-                               (CBTConfig::standardHebrewMorphLexicon));
+            // Q_ASSERT(isOk);
+            if (!isOk) { // try to use the other morph lexicon, because this one failed with the current morph code
+                key->setModule(btConfig().getDefaultSwordModuleByType("standardHebrewMorphLexicon")); /// \todo: what if the module doesn't exist?
                 key->setKey(skipFirstChar ? value.mid(1) : value);
             }
 
             text = key->renderedText();
         }
 
-        //if the module wasn't found just display an empty morph info
+        // if the module wasn't found just display an empty morph info
         QString lang = "en";  // default to english
         if (module)
             lang = module->language()->abbrev();
-        ret.append( QString("<div class=\"morphinfo\" lang=\"%1\"><h3>%2: %3</h3><p>%4</p></div>")
+        ret.append(QString("<div class=\"morphinfo\" lang=\"%1\"><h3>%2: %3</h3><p>%4</p></div>")
                     .arg(lang)
                     .arg(tr("Morphology"))
                     .arg(value)
@@ -480,26 +457,21 @@ const QString CInfoDisplay::decodeMorph( const QString& data ) {
     return ret;
 }
 
-const QString CInfoDisplay::getWordTranslation( const QString& data ) {
-    CSwordModuleInfo* const module = CBTConfig::get
-                                     (CBTConfig::standardLexicon);
-    if (!module) {
+const QString CInfoDisplay::getWordTranslation(const QString & data) {
+    CSwordModuleInfo * const module = btConfig().getDefaultSwordModuleByType("standardLexicon");
+    if (!module)
         return QString::null;
-    }
 
-    QSharedPointer<CSwordKey> key( CSwordKey::createInstance(module) );
+    QSharedPointer<CSwordKey> key(CSwordKey::createInstance(module));
     key->setKey(data);
-    if (key->key().toUpper() != data.toUpper()) { //key not present in the lexicon
+    if (key->key().toUpper() != data.toUpper()) //key not present in the lexicon
         return QString::null;
-    }
 
-    QString ret = QString("<div class=\"translationinfo\" lang=\"%1\"><h3>%2: %3</h3><p>%4</p></div>")
+    return QString("<div class=\"translationinfo\" lang=\"%1\"><h3>%2: %3</h3><p>%4</p></div>")
                   .arg(module->language()->abbrev())
                   .arg(tr("Word lookup"))
                   .arg(data)
                   .arg(key->renderedText());
-
-    return ret;
 }
 
 QSize CInfoDisplay::sizeHint() const {
diff --git a/src/frontend/cinfodisplay.h b/src/frontend/cinfodisplay.h
index 7bc15e7..46623ba 100644
--- a/src/frontend/cinfodisplay.h
+++ b/src/frontend/cinfodisplay.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -20,51 +22,65 @@
 class CReadDisplay;
 class QAction;
 class QSize;
+class BibleTime;
+
 
 namespace InfoDisplay {
 
-class CInfoDisplay : public QWidget {
-        Q_OBJECT
-    public:
-        enum InfoType {
-            Abbreviation,
-            CrossReference,
-            Footnote,
-            Lemma,
-            Morph,
-            WordTranslation,
-            WordGloss,
-            Text
-        };
-
-        typedef QPair<InfoType, QString> InfoData;
-        typedef QList<InfoData> ListInfoData;
-
-        CInfoDisplay(QWidget *parent = 0);
-
-        void unsetInfo();
-        void setInfo(const QString &data, const QString &lang = QString());
-        void setInfo(const InfoType, const QString& data);
-        void setInfo(const ListInfoData&);
-        QSize sizeHint() const;
-
-    public slots:
-        void setInfo(CSwordModuleInfo *module);
-
-    protected:
-        const QString decodeAbbreviation( const QString& data );
-        const QString decodeCrossReference( const QString& data );
-        const QString decodeFootnote( const QString& data );
-        const QString decodeStrongs( const QString& data );
-        const QString decodeMorph( const QString& data );
-        const QString getWordTranslation( const QString& data );
-
-    protected slots:
-        void lookupInfo(const QString &, const QString &);
-        void selectAll();
-
-    private:
-        CReadDisplay* m_htmlPart;
+class CInfoDisplay: public QWidget {
+
+    Q_OBJECT
+
+public: /* Types: */
+
+    enum InfoType {
+        Abbreviation,
+        CrossReference,
+        Footnote,
+        Lemma,
+        Morph,
+        WordTranslation,
+        WordGloss,
+        Text
+    };
+
+    typedef QPair<InfoType, QString> InfoData;
+    typedef QList<InfoData> ListInfoData;
+
+public: /* Methods: */
+
+    CInfoDisplay(BibleTime * parent = NULL);
+
+    void unsetInfo();
+    void setInfo(const QString & renderedData,
+                 const QString & lang = QString());
+    void setInfo(const InfoType, const QString & data);
+    void setInfo(const ListInfoData &);
+    QSize sizeHint() const;
+
+public slots:
+
+    void setInfo(CSwordModuleInfo * module);
+
+private: /* Methods: */
+
+    const QString decodeAbbreviation(const QString & data);
+    const QString decodeCrossReference(const QString & data);
+    const QString decodeFootnote(const QString & data);
+    const QString decodeStrongs(const QString & data);
+    const QString decodeMorph(const QString & data);
+    const QString getWordTranslation(const QString & data);
+
+private slots:
+
+    void lookupInfo(const QString &, const QString &);
+    void selectAll();
+
+private: /* Fields: */
+
+    CReadDisplay * m_htmlPart;
+    BibleTime * m_mainWindow;
+
 };
 
 } //end of InfoDisplay namespace
diff --git a/src/frontend/cmdiarea.cpp b/src/frontend/cmdiarea.cpp
index fb116af..d879dfa 100644
--- a/src/frontend/cmdiarea.cpp
+++ b/src/frontend/cmdiarea.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -10,7 +10,7 @@
 #include "bibletime.h"
 #include "frontend/cmdiarea.h"
 #include "frontend/displaywindow/btmodulechooserbar.h"
-
+#include "frontend/display/cdisplay.h"
 #include <QEvent>
 #include <QMdiSubWindow>
 #include <QMenu>
@@ -18,9 +18,26 @@
 #include <QTabBar>
 #include <QTimer>
 #include <QToolBar>
+#include <QWebView>
 #include <QWindowStateChangeEvent>
 
-#define MOVESIZE 30
+
+namespace {
+
+inline CDisplayWindow * getDisplayWindow(const QMdiSubWindow * const mdiWindow) {
+    return qobject_cast<CDisplayWindow *>(mdiWindow->widget());
+}
+
+inline QWebView * getWebViewFromDisplayWindow(const CDisplayWindow * const displayWindow) {
+    if (!displayWindow)
+        return NULL;
+    CDisplay * const display = displayWindow->displayWidget();
+    if (!display)
+        return NULL;
+    return qobject_cast<QWebView *>(display->view());
+}
+
+} // anonymous namespace
 
 
 CMDIArea::CMDIArea(BibleTime *parent)
@@ -61,8 +78,10 @@ void CMDIArea::fixSystemMenu(QMdiSubWindow* subWindow) {
     }
 }
 
-QMdiSubWindow* CMDIArea::addSubWindow(QWidget * widget, Qt::WindowFlags windowFlags) {
-    QMdiSubWindow* subWindow = QMdiArea::addSubWindow(widget, windowFlags);
+QMdiSubWindow * CMDIArea::addSubWindow(QWidget * widget,
+                                       Qt::WindowFlags windowFlags)
+{
+    QMdiSubWindow * const subWindow = QMdiArea::addSubWindow(widget, windowFlags);
     subWindow->installEventFilter(this);
     fixSystemMenu(subWindow);
 
@@ -73,28 +92,24 @@ QMdiSubWindow* CMDIArea::addSubWindow(QWidget * widget, Qt::WindowFlags windowFl
         // If we already have an active window, make the new one simular to it
         if (activeSubWindow()) {
             if (activeSubWindow()->isMaximized()) {
-                // Maximize the new window
-                subWindow->showMaximized();
-            }
-            else {
+                subWindow->showMaximized(); // Maximize the new window
+            } else {
                 // Make new window the same size as the active window and move it slightly.
                 subWindow->resize(activeSubWindow()->size());
                 QRect subWinGeom = activeSubWindow()->geometry();
+                static const int MOVESIZE = 30;
                 subWinGeom.translate(MOVESIZE, MOVESIZE);
                 // If it goes off screen, move it almost to the top left
-                if ( ! frameRect().contains(subWinGeom)) {
+                if (!frameRect().contains(subWinGeom))
                     subWinGeom.moveTo(MOVESIZE, MOVESIZE);
-                }
                 subWindow->setGeometry(subWinGeom);
             }
-        }
-        else {
+        } else {
             //set the window to be big enough
             subWindow->resize(400, 400);
         }
         subWindow->raise();
-    }
-    else {
+    } else {
         // Automatic arrangement modes
         enableWindowMinMaxFlags(false);
         triggerWindowUpdate();
@@ -285,6 +300,14 @@ QList<QMdiSubWindow*> CMDIArea::usableWindowList() const {
     return ret;
 }
 
+QWebView* CMDIArea::getActiveWebView()
+{
+    QMdiSubWindow* activeMdiWindow = activeSubWindow();
+    CDisplayWindow* const activeWindow = getDisplayWindow(activeMdiWindow);
+    QWebView* webView = getWebViewFromDisplayWindow(activeWindow);
+    return webView;
+}
+
 void CMDIArea::slotSubWindowActivated(QMdiSubWindow* client) {
     if (subWindowList().isEmpty())
         m_bibleTime->clearMdiToolBars();
@@ -295,13 +318,44 @@ void CMDIArea::slotSubWindowActivated(QMdiSubWindow* client) {
     emit sigSetToplevelCaption( client->windowTitle().trimmed() );
 
     // Notify child window it is active
-    CDisplayWindow * const activeWindow = qobject_cast<CDisplayWindow*>(client->widget());
+    CDisplayWindow* const activeWindow = getDisplayWindow(client);
     if (activeWindow != 0 && activeWindow != m_activeWindow) {
         m_activeWindow = activeWindow;
         activeWindow->windowActivated();
     }
 }
 
+void CMDIArea::findNextTextInActiveWindow(const QString& text, bool caseSensitive) {
+    QWebView* activeWebView = getActiveWebView();
+    if (activeWebView == 0)
+        return;
+    QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument;
+    if (caseSensitive)
+        options |= QWebPage::FindCaseSensitively;
+    activeWebView->findText(text, options);
+}
+
+void CMDIArea::findPreviousTextInActiveWindow(const QString& text, bool caseSensitive) {
+    QWebView* activeWebView = getActiveWebView();
+    if (activeWebView == 0)
+        return;
+    QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument;
+    if (caseSensitive)
+        options |= QWebPage::FindCaseSensitively;
+    activeWebView->findText(text, options);
+}
+
+void CMDIArea::highlightTextInActiveWindow(const QString& text, bool caseSensitive) {
+    QWebView* activeWebView = getActiveWebView();
+    if (activeWebView == 0)
+        return;
+    QWebPage::FindFlags options = QWebPage::HighlightAllOccurrences;
+    if (caseSensitive)
+        options |= QWebPage::FindCaseSensitively;
+    activeWebView->findText("", options); // clear old highlight
+    activeWebView->findText(text, options);
+}
+
 void CMDIArea::resizeEvent(QResizeEvent* e) {
     /*
       Do not call QMdiArea::resizeEvent(e) if we are in manual arrangement
diff --git a/src/frontend/cmdiarea.h b/src/frontend/cmdiarea.h
index 4b9d70e..6245d94 100644
--- a/src/frontend/cmdiarea.h
+++ b/src/frontend/cmdiarea.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -18,6 +20,7 @@
 class BibleTime;
 class CSwordModuleInfo;
 class CDisplayWindow;
+class QWebView;
 
 /**
   A custom MDI area widget.
@@ -51,7 +54,15 @@ class CMDIArea: public QMdiArea {
         /**
           Reimplementation of QMdiArea::addSubWindow().
         */
-        QMdiSubWindow *addSubWindow(QWidget *widget, Qt::WindowFlags windowFlags = 0);
+        QMdiSubWindow * addSubWindow(QWidget * widget,
+                                     Qt::WindowFlags windowFlags = 0);
+
+        /**
+          Returns the BibleTime main window
+        */
+        BibleTime* bibleTimeWindow() {
+            return m_bibleTime;
+        }
 
         /**
           Resets the MDI arrangement mode and arranges the windows.
@@ -118,6 +129,12 @@ class CMDIArea: public QMdiArea {
         */
         void myTileHorizontal();
 
+        void findNextTextInActiveWindow(const QString& text, bool caseSensitive);
+
+        void findPreviousTextInActiveWindow(const QString& text, bool caseSensitive);
+
+        void highlightTextInActiveWindow(const QString& text, bool caseSensitive);
+
     signals:
 
         /**
@@ -143,6 +160,8 @@ class CMDIArea: public QMdiArea {
 
         void fixSystemMenu(QMdiSubWindow* subWindow);
 
+        QWebView* getActiveWebView();
+
     protected slots:
 
         /**
diff --git a/src/frontend/cprinter.cpp b/src/frontend/cprinter.cpp
index 50ff67d..b10d614 100644
--- a/src/frontend/cprinter.cpp
+++ b/src/frontend/cprinter.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -15,6 +15,7 @@
 #include <QWebPage>
 #include "backend/keys/cswordversekey.h"
 #include "backend/managers/cdisplaytemplatemgr.h"
+#include "backend/config/btconfig.h"
 
 
 namespace Printing {
diff --git a/src/frontend/cprinter.h b/src/frontend/cprinter.h
index e702565..48001a1 100644
--- a/src/frontend/cprinter.h
+++ b/src/frontend/cprinter.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/crossrefrendering.cpp b/src/frontend/crossrefrendering.cpp
index ac538da..868b6ce 100644
--- a/src/frontend/crossrefrendering.cpp
+++ b/src/frontend/crossrefrendering.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/crossrefrendering.h b/src/frontend/crossrefrendering.h
index d6f33a2..fb22aa2 100644
--- a/src/frontend/crossrefrendering.h
+++ b/src/frontend/crossrefrendering.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -11,6 +13,7 @@
 #define INFODISPLAYCROSSREFRENDERING_H
 
 #include "backend/rendering/chtmlexportrendering.h"
+#include "backend/config/btconfig.h"
 
 
 namespace InfoDisplay {
@@ -20,8 +23,8 @@ class CrossRefRendering : public Rendering::CHTMLExportRendering {
         friend class CInfoDisplay;
 
         CrossRefRendering(
-            const DisplayOptions &displayOptions = CBTConfig::getDisplayOptionDefaults(),
-            const FilterOptions &filterOptions = CBTConfig::getFilterOptionDefaults()
+            const DisplayOptions &displayOptions = btConfig().getDisplayOptions(),
+            const FilterOptions &filterOptions = btConfig().getFilterOptions()
         );
 
         virtual QString entryLink(const KeyTreeItem &item,
diff --git a/src/frontend/display/btcolorwidget.cpp b/src/frontend/display/btcolorwidget.cpp
index 0d09259..579e461 100644
--- a/src/frontend/display/btcolorwidget.cpp
+++ b/src/frontend/display/btcolorwidget.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/display/btcolorwidget.h b/src/frontend/display/btcolorwidget.h
index 5cc0f56..9dd2e97 100644
--- a/src/frontend/display/btcolorwidget.h
+++ b/src/frontend/display/btcolorwidget.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/display/btfindwidget.cpp b/src/frontend/display/btfindwidget.cpp
new file mode 100644
index 0000000..1ada629
--- /dev/null
+++ b/src/frontend/display/btfindwidget.cpp
@@ -0,0 +1,118 @@
+/*********
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#include "frontend/display/btfindwidget.h"
+
+#include "QApplication"
+#include "QCheckBox"
+#include "QHBoxLayout"
+#include "QLineEdit"
+#include "QSpacerItem"
+#include "QToolButton"
+#include "bibletimeapp.h"
+#include "util/cresmgr.h"
+#include "util/geticon.h"
+
+
+BtFindWidget::BtFindWidget(QWidget* parent)
+        : QWidget(parent) {
+    createLayout();
+    createToolButton(CResMgr::findWidget::close_icon, "", SLOT(hide()));
+    createTextEditor();
+    createToolButton(CResMgr::findWidget::previous_icon, tr("Previous"), SLOT(findPrevious()));
+    createToolButton(CResMgr::findWidget::next_icon, tr("Next"), SLOT(findNext()));
+    createCaseCheckBox();
+    createSpacer();
+    setFocusProxy(m_textEditor);
+}
+
+BtFindWidget::~BtFindWidget() {
+}
+
+void BtFindWidget::createLayout() {
+    m_layout = new QHBoxLayout(this);
+    m_layout->setMargin(0);
+    m_layout->setSpacing(8);
+}
+
+void BtFindWidget::createToolButton(const QString& iconName, const QString& text, const char* slot) {
+    QToolButton* button = new QToolButton(this);
+    button->setIcon(util::getIcon(iconName));
+    button->setIconSize(QSize(16,16));
+    button->setText(text);
+    button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+    button->setAutoRaise(true);
+    m_layout->addWidget(button);
+    bool ok = connect(button, SIGNAL(released()), this, slot);
+    Q_ASSERT(ok);
+}
+
+void BtFindWidget::createTextEditor() {
+    m_textEditor = new QLineEdit(this);
+#if QT_VERSION < 0x050000
+    m_textEditor->setToolTip(QApplication::translate("findWidget",
+        "The text you want to search for", 0, QApplication::UnicodeUTF8));
+#else
+    m_textEditor->setToolTip(QApplication::translate("findWidget",
+        "The text you want to search for", 0));
+#endif
+    m_layout->addWidget(m_textEditor);
+    bool ok = connect(m_textEditor, SIGNAL(textChanged(const QString&)),
+        this, SLOT(textChanged(const QString&)));
+    Q_ASSERT(ok);
+    ok = connect(m_textEditor,SIGNAL(returnPressed()), this, SLOT(returnPressed()));
+    Q_ASSERT(ok);
+}
+
+void BtFindWidget::createCaseCheckBox() {
+    m_caseCheckBox = new QCheckBox(tr("Match case"), this);
+    m_layout->addWidget(m_caseCheckBox);
+}
+
+void BtFindWidget::createSpacer() {
+    QSpacerItem* spacer = new QSpacerItem(0,0,QSizePolicy::Expanding, QSizePolicy::Minimum);
+    m_layout->addItem(spacer);
+}
+
+void BtFindWidget::highlightText(const QString& text) {
+    bool caseSensitive = m_caseCheckBox->checkState() == Qt::Checked;
+    emit highlightText(text, caseSensitive);
+}
+
+void BtFindWidget::returnPressed() {
+    bool caseSensitive = m_caseCheckBox->checkState() == Qt::Checked;
+    QString text = m_textEditor->text();
+    emit highlightText(text, caseSensitive);
+    emit findNext(text, caseSensitive);
+}
+
+void BtFindWidget::textChanged(const QString& text) {
+    bool caseSensitive = m_caseCheckBox->checkState() == Qt::Checked;
+    emit highlightText(text, caseSensitive);
+    emit findNext(text, caseSensitive);
+}
+
+void BtFindWidget::findNext() {
+    bool caseSensitive = m_caseCheckBox->checkState() == Qt::Checked;
+    QString text = m_textEditor->text();
+    emit findNext(text, caseSensitive);
+}
+
+void BtFindWidget::findPrevious() {
+    bool caseSensitive = m_caseCheckBox->checkState() == Qt::Checked;
+    QString text = m_textEditor->text();
+    emit findPrevious(text, caseSensitive);
+}
+
+void BtFindWidget::showAndSelect(){
+    setVisible(true);
+    QWidget::show();
+    m_textEditor->selectAll();
+    m_textEditor->setFocus(Qt::ShortcutFocusReason);
+}
diff --git a/src/frontend/display/btfindwidget.h b/src/frontend/display/btfindwidget.h
new file mode 100644
index 0000000..52a879a
--- /dev/null
+++ b/src/frontend/display/btfindwidget.h
@@ -0,0 +1,56 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#ifndef BTFINDIDGET_H
+#define BTFINDIDGET_H
+
+#include <QWidget>
+#include <QWebPage>
+class QCheckBox;
+class QLineEdit;
+class QHBoxLayout;
+class QString;
+
+class BtFindWidget : public QWidget {
+        Q_OBJECT
+
+    public:
+        BtFindWidget(QWidget* parent = 0);
+        ~BtFindWidget();
+        void showAndSelect();
+
+    private slots:
+        void findNext();
+        void findPrevious();
+        void returnPressed();
+        void textChanged(const QString& text);
+
+    private:
+        void createCaseCheckBox();
+        void createLayout();
+        void createSpacer();
+        void createTextEditor();
+        void createToolButton(const QString& iconName, const QString& text, const char* slot);
+        void highlightText(const QString& searchText);
+
+        QHBoxLayout* m_layout;
+        QLineEdit* m_textEditor;
+        QCheckBox* m_caseCheckBox;
+
+    signals:
+        void findPrevious(const QString & text, bool caseSensitive);
+        void findNext(const QString & text, bool caseSensitive);
+        void highlightText(const QString & text, bool caseSensitive);
+};
+
+#endif
+
+
diff --git a/src/frontend/display/btfontsizewidget.cpp b/src/frontend/display/btfontsizewidget.cpp
index b302fed..82fdd08 100644
--- a/src/frontend/display/btfontsizewidget.cpp
+++ b/src/frontend/display/btfontsizewidget.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/display/btfontsizewidget.h b/src/frontend/display/btfontsizewidget.h
index c2d7198..40b94a1 100644
--- a/src/frontend/display/btfontsizewidget.h
+++ b/src/frontend/display/btfontsizewidget.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/display/bthtml.js b/src/frontend/display/bthtml.js
index 689ba55..d56318f 100644
--- a/src/frontend/display/bthtml.js
+++ b/src/frontend/display/bthtml.js
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -18,119 +18,105 @@ var timeOutId = -1;
 // Scroll window to html anchor
 function gotoAnchor(anchor)
 {
-	document.location=document.location + "#" + anchor;
-}
-
-// Set body editable
-function setEditable()
-{
-	var theBody = document.getElementsByTagName('body')[0];
-	theBody.setAttribute('contenteditable','true');
-}
-
-// Set body not editable
-function setNotEditable()
-{
-	var theBody = document.getElementsByTagName('body')[0]; 
-	theBody.setAttribute('contenteditable','false');
+    document.location=document.location + "#" + anchor;
 }
 
 // Mouse button clicked handler
 function mouseClickHandler (mEvent)
 {
-	var mTarget = mEvent.target;
-	if (mTarget)
-	{
-		var url = "";
-		var tmpUrl = mEvent.target.getAttribute("href");
-		if (tmpUrl)
-			url = tmpUrl;
-		btHtmlJsObject.mouseClick(url);
-	}
+    var mTarget = mEvent.target;
+    if (mTarget)
+    {
+        var url = "";
+        var tmpUrl = mEvent.target.getAttribute("href");
+        if (tmpUrl)
+            url = tmpUrl;
+        btHtmlJsObject.mouseClick(url);
+    }
 }
 
 // Mouse button pressed down handler
 function mouseDownHandler (mEvent)
 {
-	var node;
-	var url = "";
-	var lemma = "";
-	var mTarget = mEvent.target;
-	if (mTarget)
-	{
-		var tmpUrl = mEvent.target.getAttribute("href");
-		if (tmpUrl)
-			url = tmpUrl;
-		var tmpLemma = mEvent.target.getAttribute("lemma");
-		if (tmpLemma)
-			lemma = tmpLemma;
-	}
-
-	if (mEvent.button === 2) // Right mouse button
-	{
-		btHtmlJsObject.mouseDownRight(url, lemma);
-	}
-	if (mEvent.button === 0) // Left mouse button
-	{
-		if (!(mEvent.target === undefined)) 
-		{
-			var X = mEvent.clientX;
-			var Y = mEvent.clientY;
-			btHtmlJsObject.mouseDownLeft(url, X, Y);
-		} 
-	}
+    var node;
+    var url = "";
+    var lemma = "";
+    var mTarget = mEvent.target;
+    if (mTarget)
+    {
+        var tmpUrl = mEvent.target.getAttribute("href");
+        if (tmpUrl)
+            url = tmpUrl;
+        var tmpLemma = mEvent.target.getAttribute("lemma");
+        if (tmpLemma)
+            lemma = tmpLemma;
+    }
+
+    if (mEvent.button === 2) // Right mouse button
+    {
+        btHtmlJsObject.mouseDownRight(url, lemma);
+    }
+    if (mEvent.button === 0) // Left mouse button
+    {
+        if (!(mEvent.target === undefined))
+        {
+            var X = mEvent.clientX;
+            var Y = mEvent.clientY;
+            btHtmlJsObject.mouseDownLeft(url, X, Y);
+        }
+    }
 }
 
 // Mouse moved event handler
 function mouseMoveHandler (mEvent)
 {
-	currentNode = mEvent.target;
-	var shiftKey = mEvent.shiftKey;
-	var x = mEvent.clientX;
-	var y = mEvent.clientY;
-	var node = mEvent.target;
-	if ( node != undefined && node != prevNode ) 
-	{
-		prevNode = node;
-
-		if (node.attributes.length > 0) 
-		{
-			attribList = getNodeAttributes(node);
-			btHtmlJsObject.mouseMoveEvent(attribList, x, y, shiftKey);
-		}
-	}
+    currentNode = mEvent.target;
+    var shiftKey = mEvent.shiftKey;
+    var x = mEvent.clientX;
+    var y = mEvent.clientY;
+    var node = mEvent.target;
+    if ( node != undefined && node != prevNode )
+    {
+        prevNode = node;
+
+        if (node.attributes.length > 0)
+        {
+            attribList = getNodeAttributes(node);
+            btHtmlJsObject.mouseMoveEvent(attribList, x, y, shiftKey);
+        }
+    }
 }
 
 // Get attributes of a DOM node and put into a single string
 function getNodeAttributes(node)
 {
-	var attribList = '';
-	if (node.attributes.length > 0) 
-	{
-		for (i = 0; i < node.attributes.length; i++)
-		{
-			attribList = attribList + node.attributes[i].nodeName + '=' + node.attributes[i].nodeValue + '||';
-		}
-	}
-	return attribList;
+    var attribList = '';
+    if (node.attributes.length > 0)
+    {
+        for (i = 0; i < node.attributes.length; i++)
+        {
+            attribList = attribList + node.attributes[i].nodeName + '=' + node.attributes[i].nodeValue + '||';
+        }
+    }
+    return attribList;
 }
 
 // Start a timer event
 function startTimer(time)
 {
-	clearTimeout(timeOutId);
-	timeOutId = setTimeout("timerEvent()",time);
+    clearTimeout(timeOutId);
+    timeOutId = setTimeout("timerEvent()",time);
 }
 
 // Handles a timer event
 function timerEvent()
 {
-	timeOutId = -1;
-	if (currentNode != 0  && currentNode == prevNode)
-	{
-		var attributes = getNodeAttributes(currentNode);
-		btHtmlJsObject.timeOutEvent(attributes);
-	}
+    timeOutId = -1;
+    if (currentNode != 0  && currentNode == prevNode)
+    {
+        var attributes = getNodeAttributes(currentNode);
+        btHtmlJsObject.timeOutEvent(attributes);
+    }
 }
 
 document.getElementsByTagName("body")[0].addEventListener ('mousedown', function (eve) { mouseDownHandler (eve); }, true);
@@ -139,8 +125,6 @@ document.getElementsByTagName("body")[0].addEventListener ('click',     function
 
 btHtmlJsObject.startTimer.connect(this, this.startTimer);
 btHtmlJsObject.gotoAnchor.connect(this, this.gotoAnchor);
-btHtmlJsObject.setDocumentEditable.connect(this, this.setEditable);
-btHtmlJsObject.setDocumentNotEditable.connect(this, this.setNotEditable);
 
 ;
 
diff --git a/src/frontend/display/bthtmlfindtext.cpp b/src/frontend/display/bthtmlfindtext.cpp
deleted file mode 100644
index 1b15b11..0000000
--- a/src/frontend/display/bthtmlfindtext.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#include "frontend/display/bthtmlfindtext.h"
-
-#include <QMdiSubWindow>
-#include "frontend/cmdiarea.h"
-#include "frontend/display/bthtmlreaddisplay.h"
-#include "frontend/display/creaddisplay.h"
-#include "frontend/displaywindow/cdisplaywindow.h"
-
-
-static BtHtmlFindText* dialog = 0;
-
-void showBtHtmlFindText(CMDIArea* mdiArea) {
-    if (dialog == 0)
-        dialog = new BtHtmlFindText(mdiArea, mdiArea);
-    dialog->show();
-}
-
-BtHtmlFindText::BtHtmlFindText(CMDIArea* mdiArea, QWidget *parent, Qt::WindowFlags f)
-        : QDialog(parent, f), m_mdiArea(mdiArea) {
-    ui.setupUi(this);
-    bool ok;
-    ok = connect(ui.nextButton, SIGNAL(clicked()), this, SLOT(findNext()));
-    Q_ASSERT(ok);
-    ok = connect(ui.previousButton, SIGNAL(clicked()), this, SLOT(findPrevious()));
-    Q_ASSERT(ok);
-}
-
-BtHtmlFindText::~BtHtmlFindText() {
-}
-
-void BtHtmlFindText::findNext() {
-    QWebView* webView = getActiveWindowWebView();
-    if (webView != 0) {
-        QWebPage::FindFlags options = 0;
-        if (ui.caseBox->checkState() == Qt::Checked)
-            options |= QWebPage::FindCaseSensitively;
-        QString searchText = ui.findTextComboBox->currentText();
-        if (!searchText.isEmpty())
-            webView->findText(searchText, options);
-    }
-}
-
-void BtHtmlFindText::findPrevious() {
-    QWebView* webView = getActiveWindowWebView();
-    if (webView != 0) {
-        QWebPage::FindFlags options = QWebPage::FindBackward;
-        if (ui.caseBox->checkState() == Qt::Checked)
-            options |= QWebPage::FindCaseSensitively;
-        QString searchText = ui.findTextComboBox->currentText();
-        if (!searchText.isEmpty())
-            webView->findText(searchText, options);
-    }
-}
-
-
-QWebView* BtHtmlFindText::getActiveWindowWebView() {
-    QMdiSubWindow* activeSubWindow = m_mdiArea->activeSubWindow();
-    if (activeSubWindow == 0)
-        return 0;
-
-    QWidget* activeWindowWidget = activeSubWindow->widget();
-    if (activeWindowWidget == 0)
-        return 0;
-
-    CDisplayWindow* cDisplayWindow = qobject_cast<CDisplayWindow*>(activeWindowWidget);
-    if (cDisplayWindow == 0)
-        return 0;
-
-    CDisplay* cDisplay = cDisplayWindow->displayWidget();
-    if (cDisplay == 0)
-        return 0;
-
-    QWidget* textView = cDisplay->view();
-    if (textView == 0)
-        return 0;
-
-    QWebView* webView = qobject_cast<QWebView*>(textView);
-    return webView;
-}
-
-
-
-
-
-
-
diff --git a/src/frontend/display/bthtmlfindtext.h b/src/frontend/display/bthtmlfindtext.h
deleted file mode 100644
index 1d941c1..0000000
--- a/src/frontend/display/bthtmlfindtext.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#ifndef BTHTMLFINDTEXT_H
-#define BTHTMLFINDTEXT_H
-
-/// \todo Qt Designer UI file!?
-#include "ui_bthtmlfindtext.h"
-
-
-class CMDIArea;
-class QWebView;
-
-class BtHtmlFindText : public QDialog {
-        Q_OBJECT
-
-    public:
-        BtHtmlFindText(CMDIArea* mdiArea, QWidget *parent = 0, Qt::WindowFlags f = 0);
-        ~BtHtmlFindText();
-    public slots:
-        void findNext();
-        void findPrevious();
-    private:
-        QWebView* getActiveWindowWebView();
-        Ui_findTextDialog ui;
-        CMDIArea* m_mdiArea;
-};
-
-
-#endif
diff --git a/src/frontend/display/bthtmlfindtext.ui b/src/frontend/display/bthtmlfindtext.ui
deleted file mode 100644
index c04de0c..0000000
--- a/src/frontend/display/bthtmlfindtext.ui
+++ /dev/null
@@ -1,145 +0,0 @@
-<ui version="4.0" >
- <class>findTextDialog</class>
- <widget class="QDialog" name="findTextDialog" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>227</width>
-    <height>115</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Find Text</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
-   <item>
-    <widget class="QFrame" name="findFrame" >
-     <property name="frameShape" >
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow" >
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2" >
-      <item>
-       <spacer name="verticalSpacer" >
-        <property name="orientation" >
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QComboBox" name="findTextComboBox" >
-        <property name="toolTip" >
-         <string>The text you want to search for</string>
-        </property>
-        <property name="editable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="caseBox" >
-        <property name="toolTip" >
-         <string>Search with case sensitivity</string>
-        </property>
-        <property name="text" >
-         <string>Case &amp;sensitive</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer_2" >
-        <property name="orientation" >
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_6" >
-     <item>
-      <spacer name="horizontalSpacer_6" >
-       <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="previousButton" >
-       <property name="toolTip" >
-        <string>Find the previous location of the text</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Previous</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="nextButton" >
-       <property name="toolTip" >
-        <string>Find the next location of the text</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Next</string>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closeButton" >
-       <property name="toolTip" >
-        <string>Close the dialog</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Close</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>closeButton</sender>
-   <signal>clicked()</signal>
-   <receiver>findTextDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>200</x>
-     <y>124</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>224</x>
-     <y>106</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/src/frontend/display/bthtmljsobject.cpp b/src/frontend/display/bthtmljsobject.cpp
index aa44865..cb395cc 100644
--- a/src/frontend/display/bthtmljsobject.cpp
+++ b/src/frontend/display/bthtmljsobject.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -11,7 +11,7 @@
 
 #include <QDrag>
 #include <QSharedPointer>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/keys/cswordkey.h"
 #include "backend/managers/referencemanager.h"
 #include "backend/managers/cswordbackend.h"
@@ -105,7 +105,7 @@ void BtHtmlJsObject::mouseMoveEvent(const QString& attributes, const int& x, con
         // no mouse button pressed and tracking enabled
         // start timer that updates the mag window
         // Sets timer in javascript. See bthtml.js startTimer()
-        emit startTimer(CBTConfig::get(CBTConfig::magDelay));
+        emit startTimer(btConfig().value<int>("GUI/magDelay", 400));
         m_prev_attributes = attributes;
         // When the javascript timer interupts, the see timerEvent() in bthtml.js
         // will call the timeOutEvent in this class
@@ -113,40 +113,32 @@ void BtHtmlJsObject::mouseMoveEvent(const QString& attributes, const int& x, con
 }
 
 // called from javascript timerEvent() in bthtml.js
-void BtHtmlJsObject::timeOutEvent(const QString& attributes) {
+void BtHtmlJsObject::timeOutEvent(const QString & attributes) {
     if (m_prev_attributes != attributes)
         return;
 
     m_prev_attributes = "";
     CInfoDisplay::ListInfoData infoList;
-    QStringList attrList = attributes.split("||");
+    const QStringList attrList = attributes.split("||");
     for (int i = 0; i < attrList.count(); i++) {
-        QString attrPair = attrList[i];
-        QStringList attr = attrPair.split("=");
+        const QStringList attr(attrList[i].split('='));
         if (attr.count() == 2) {
-            QString attrName = attr[0];
-            QString attrValue = attr[1];
-            if (attrName == "note") {
-                infoList.append( qMakePair(CInfoDisplay::Footnote, attrValue));
-            }
-            if (attrName == "lemma") {
-                infoList.append( qMakePair(CInfoDisplay::Lemma, attrValue));
-            }
-            if (attrName == "morph") {
-                infoList.append( qMakePair(CInfoDisplay::Morph, attrValue));
-            }
-            if (attrName == "expansion") {
-                infoList.append( qMakePair(CInfoDisplay::Abbreviation, attrValue));
-            }
-            if (attrName == "crossrefs") {
-                infoList.append( qMakePair(CInfoDisplay::CrossReference, attrValue));
+            if (attr[0] == "note") {
+                infoList.append(qMakePair(CInfoDisplay::Footnote, attr[1]));
+            } else if (attr[0] == "lemma") {
+                infoList.append(qMakePair(CInfoDisplay::Lemma, attr[1]));
+            } else if (attr[0] == "morph") {
+                infoList.append(qMakePair(CInfoDisplay::Morph, attr[1]));
+            } else if (attr[0] == "expansion") {
+                infoList.append(qMakePair(CInfoDisplay::Abbreviation, attr[1]));
+            } else if (attr[0] == "crossrefs") {
+                infoList.append(qMakePair(CInfoDisplay::CrossReference, attr[1]));
             }
         }
     }
     // Update the mag if valid attributes were found
-    if (!(infoList.isEmpty())) {
+    if (!(infoList.isEmpty()))
         BibleTime::instance()->infoDisplay()->setInfo(infoList);
-    }
 }
 
 // clearing the previous attribute effectively stops any time out event
diff --git a/src/frontend/display/bthtmljsobject.h b/src/frontend/display/bthtmljsobject.h
index 109de5a..3bf37f5 100644
--- a/src/frontend/display/bthtmljsobject.h
+++ b/src/frontend/display/bthtmljsobject.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/display/bthtmlreaddisplay.cpp b/src/frontend/display/bthtmlreaddisplay.cpp
index 1842178..7b303e7 100644
--- a/src/frontend/display/bthtmlreaddisplay.cpp
+++ b/src/frontend/display/bthtmlreaddisplay.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -14,8 +14,10 @@
 #include <QString>
 #include "backend/keys/cswordkey.h"
 #include "backend/managers/referencemanager.h"
+#include "bibletime.h"
 #include "frontend/cdragdrop.h"
 #include "frontend/cinfodisplay.h"
+#include "frontend/cmdiarea.h"
 #include "frontend/display/bthtmljsobject.h"
 #include "frontend/displaywindow/cdisplaywindow.h"
 #include "frontend/displaywindow/cdisplaywindowfactory.h"
@@ -25,8 +27,6 @@
 
 using namespace InfoDisplay;
 
-void showBtHtmlFindText(CMDIArea*);
-
 static QString javascript; // Initialized from file bthtml.js
 
 BtHtmlReadDisplay::BtHtmlReadDisplay(CReadWindow* readWindow, QWidget* parentWidget)
@@ -266,8 +266,8 @@ void BtHtmlReadDisplay::setLemma(const QString& lemma) {
 
 // Open the Find text dialog
 void BtHtmlReadDisplay::openFindTextDialog() {
-    CMDIArea* mdiArea = parentWindow()->mdi();
-    showBtHtmlFindText(mdiArea);
+    BibleTime* bibleTime = parentWindow()->mdi()->bibleTimeWindow();
+    bibleTime->openFindWidget();
 }
 
 // Send "completed" signal when the text is finished loading into the viewer
diff --git a/src/frontend/display/bthtmlreaddisplay.h b/src/frontend/display/bthtmlreaddisplay.h
index f1e1f5c..0a703d3 100644
--- a/src/frontend/display/bthtmlreaddisplay.h
+++ b/src/frontend/display/bthtmlreaddisplay.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -23,11 +25,6 @@
 
 
 class BtHtmlReadDisplayView;
-class QScrollArea;
-class QWidget;
-class QString;
-class BtHtmlReadDisplay;
-class QEvent;
 
 /** The implementation for the HTML read display.
   * @author The BibleTime team
@@ -38,6 +35,10 @@ class BtHtmlReadDisplay : public QWebPage, public CReadDisplay {
         friend class BtHtmlReadDisplayView;
 
     public:
+
+        BtHtmlReadDisplay( CReadWindow* readWindow, QWidget* parent = 0 );
+        virtual ~BtHtmlReadDisplay();
+
         //reimplemented functions from CDisplay
         // Returns the right text part in the specified format.
         virtual const QString text( const CDisplay::TextType format = CDisplay::HTMLText,
@@ -68,9 +69,7 @@ class BtHtmlReadDisplay : public QWebPage, public CReadDisplay {
         void completed();
 
     protected:
-        friend class CDisplay;
-        BtHtmlReadDisplay( CReadWindow* readWindow, QWidget* parent = 0 );
-        virtual ~BtHtmlReadDisplay();
+
         void slotGoToAnchor(const QString& anchor);
         struct DNDData {
             bool mousePressed;
diff --git a/src/frontend/display/cdisplay.cpp b/src/frontend/display/cdisplay.cpp
index 4def9f5..a5c5bc8 100644
--- a/src/frontend/display/cdisplay.cpp
+++ b/src/frontend/display/cdisplay.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -98,20 +98,6 @@ void CDisplayConnections::openFindTextDialog() {
 
 /*----------------------*/
 
-CReadDisplay* CDisplay::createReadInstance( CReadWindow* readWindow, QWidget* parent ) {
-    return new BtHtmlReadDisplay(readWindow, parent);
-}
-
-CWriteDisplay* CDisplay::createWriteInstance( CWriteWindow* writeWindow, const CWriteDisplay::WriteDisplayType& type, QWidget* parent ) {
-    //  qWarning("CDisplay::createWriteInstance");
-    if (type == PlainTextDisplay) {
-        return new CPlainWriteDisplay(writeWindow, parent);
-    }
-    else {
-        return new CHTMLWriteDisplay(writeWindow, parent);
-    };
-}
-
 
 CDisplay::CDisplay(CDisplayWindow* parent) :
         m_parentWindow(parent),
diff --git a/src/frontend/display/cdisplay.h b/src/frontend/display/cdisplay.h
index a0a0020..de971d5 100644
--- a/src/frontend/display/cdisplay.h
+++ b/src/frontend/display/cdisplay.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,10 +18,6 @@
 
 class CDisplayConnections;
 class CDisplayWindow;
-class CReadDisplay;
-class CReadWindow;
-class CWriteDisplay;
-class CWriteWindow;
 class QMenu;
 
 /** The base class for all display widgets.
@@ -27,15 +25,6 @@ class QMenu;
   */
 class CDisplay {
     public:
-        enum WriteDisplayType {
-            HTMLDisplay = 0,
-            PlainTextDisplay
-        };
-
-        static CReadDisplay* createReadInstance(CReadWindow* readWindow, QWidget* parent = 0);
-        static CWriteDisplay* createWriteInstance( CWriteWindow* writeWindow,
-                                                   const WriteDisplayType& type = PlainTextDisplay,
-                                                   QWidget* parent = 0 );
 
         enum TextType {
             HTMLText, /* Used for HTML markup */
diff --git a/src/frontend/display/chtmlwritedisplay.cpp b/src/frontend/display/chtmlwritedisplay.cpp
index ce7b94c..829f607 100644
--- a/src/frontend/display/chtmlwritedisplay.cpp
+++ b/src/frontend/display/chtmlwritedisplay.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -14,90 +14,109 @@
 #include <QTextEdit>
 #include <QToolBar>
 #include <QToolTip>
+#include "backend/config/btconfig.h"
+#include "bibletimeapp.h"
 #include "frontend/display/btcolorwidget.h"
 #include "frontend/display/btfontsizewidget.h"
 #include "frontend/displaywindow/btactioncollection.h"
-#include "frontend/displaywindow/cwritewindow.h"
+#include "frontend/displaywindow/chtmlwritewindow.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
+#include "util/geticon.h"
 
 
 class BtActionCollection;
 
-CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* parentWindow, QWidget* parent)
-: CPlainWriteDisplay(parentWindow, parent) {
-    m_actions.bold = 0;
-    m_actions.italic = 0;
-    m_actions.underline = 0;
-    m_actions.selectAll = 0;
+namespace {
+const QString CHTMLWriteDisplayFontKey = "HtmlWriteDisplay/font";
+const QString CHTMLWriteDisplayFontColorKey = "HtmlWriteDisplay/fontColor";
+}
+
+CHTMLWriteDisplay::CHTMLWriteDisplay(CHTMLWriteWindow * parentWindow, QWidget* parent)
+    : CPlainWriteDisplay(parentWindow, parent)
+    , m_handingFormatChangeFromEditor(false)
+{
+
+    BtConfig & conf = btConfig();
+    setTextColor(conf.sessionValue(CHTMLWriteDisplayFontColorKey, textColor()));
+    QFont f = conf.sessionValue(CHTMLWriteDisplayFontKey, currentFont());
+    setCurrentFont(f);
+
 
     //--------------------bold toggle-------------------------
-    namespace DU = util::directory;
     m_actions.bold = new QAction(
-        DU::getIcon(CResMgr::displaywindows::writeWindow::boldText::icon),
+        util::getIcon(CResMgr::displaywindows::writeWindow::boldText::icon),
         tr("Bold"),
         this);
     m_actions.bold->setCheckable(true);
+    m_actions.bold->setChecked(f.bold());
     m_actions.bold->setShortcut(CResMgr::displaywindows::writeWindow::boldText::accel);
     m_actions.bold->setToolTip( tr("Bold") );
-    connect(m_actions.bold, SIGNAL(toggled(bool)), this, SLOT(toggleBold(bool)));
+    connect(m_actions.bold, SIGNAL(toggled(bool)),
+            this,           SLOT(toggleBold(bool)), Qt::DirectConnection);
 
     //--------------------italic toggle-------------------------
     m_actions.italic = new QAction(
-        DU::getIcon(CResMgr::displaywindows::writeWindow::italicText::icon),
+        util::getIcon(CResMgr::displaywindows::writeWindow::italicText::icon),
         tr("Italic"),
         this );
     m_actions.italic->setCheckable(true);
+    m_actions.italic->setChecked(f.italic());
     m_actions.bold->setShortcut(CResMgr::displaywindows::writeWindow::italicText::accel);
-    connect(m_actions.italic, SIGNAL(toggled(bool)), this, SLOT(toggleItalic(bool)));
+    connect(m_actions.italic, SIGNAL(toggled(bool)),
+            this,             SLOT(toggleItalic(bool)), Qt::DirectConnection);
     m_actions.italic->setToolTip( tr("Italic") );
 
     //--------------------underline toggle-------------------------
     m_actions.underline = new QAction(
-        DU::getIcon(CResMgr::displaywindows::writeWindow::underlinedText::icon),
+        util::getIcon(CResMgr::displaywindows::writeWindow::underlinedText::icon),
         tr("Underline"),
         this );
     m_actions.underline->setCheckable(true);
+    m_actions.underline->setChecked(f.underline());
     m_actions.underline->setShortcut(CResMgr::displaywindows::writeWindow::underlinedText::accel);
-    connect(m_actions.underline, SIGNAL(toggled(bool)), this, SLOT(toggleUnderline(bool)));
+    connect(m_actions.underline, SIGNAL(toggled(bool)),
+            this,                SLOT(toggleUnderline(bool)), Qt::DirectConnection);
     m_actions.underline->setToolTip( tr("Underline") );
 
     //--------------------align left toggle-------------------------
     m_actions.alignLeft = new QAction(
-        DU::getIcon(CResMgr::displaywindows::writeWindow::alignLeft::icon),
+        util::getIcon(CResMgr::displaywindows::writeWindow::alignLeft::icon),
         tr("Left"), this);
     m_actions.alignLeft->setCheckable(true);
     m_actions.alignLeft->setShortcut(CResMgr::displaywindows::writeWindow::alignLeft::accel);
-    connect(m_actions.alignLeft, SIGNAL(toggled(bool)), this, SLOT(alignLeft(bool)));
+    connect(m_actions.alignLeft, SIGNAL(toggled(bool)),
+            this,                SLOT(alignLeft(bool)), Qt::DirectConnection);
     m_actions.alignLeft->setToolTip( tr("Align left") );
 
     //--------------------align center toggle-------------------------
     m_actions.alignCenter = new QAction(
-        DU::getIcon(CResMgr::displaywindows::writeWindow::alignCenter::icon),
+        util::getIcon(CResMgr::displaywindows::writeWindow::alignCenter::icon),
         tr("Center"), this);
     m_actions.alignCenter->setCheckable(true);
     m_actions.alignCenter->setShortcut(CResMgr::displaywindows::writeWindow::alignCenter::accel);
-    connect(m_actions.alignCenter, SIGNAL(toggled(bool)), this, SLOT(alignCenter(bool)));
+    connect(m_actions.alignCenter, SIGNAL(toggled(bool)),
+            this,                  SLOT(alignCenter(bool)), Qt::DirectConnection);
     m_actions.alignCenter->setToolTip( tr("Center") );
 
     //--------------------align right toggle-------------------------
     m_actions.alignRight = new QAction(
-        DU::getIcon(CResMgr::displaywindows::writeWindow::alignRight::icon),
+        util::getIcon(CResMgr::displaywindows::writeWindow::alignRight::icon),
         tr("Right"), this);
     m_actions.alignRight->setCheckable(true);
     m_actions.alignRight->setShortcut(CResMgr::displaywindows::writeWindow::alignRight::accel);
-    connect(m_actions.alignRight, SIGNAL(toggled(bool)), this, SLOT(alignRight(bool)));
+    connect(m_actions.alignRight, SIGNAL(toggled(bool)),
+            this,                 SLOT(alignRight(bool)), Qt::DirectConnection);
     m_actions.alignRight->setToolTip( tr("Align right") );
 
     setAcceptRichText(true);
     setAcceptDrops(true);
     viewport()->setAcceptDrops(true);
-}
 
-CHTMLWriteDisplay::~CHTMLWriteDisplay() {
+    connect(this, SIGNAL(currentCharFormatChanged(QTextCharFormat)),
+            this, SLOT(slotCurrentCharFormatChanged(QTextCharFormat)), Qt::DirectConnection);
 }
 
-void CHTMLWriteDisplay::setText( const QString& newText ) {
+void CHTMLWriteDisplay::setText(const QString & newText) {
     QTextEdit::setHtml(newText);
 }
 
@@ -105,42 +124,45 @@ const QString CHTMLWriteDisplay::plainText() {
     return QTextEdit::toPlainText();
 }
 
-void CHTMLWriteDisplay::toggleBold(bool) {
-    setFontWeight( m_actions.bold->isChecked() ? QFont::Bold : QFont::Normal );
+void CHTMLWriteDisplay::toggleBold(bool checked) {
+    if (!m_handingFormatChangeFromEditor)
+        setFontWeight(checked ? QFont::Bold : QFont::Normal);
 }
 
-void CHTMLWriteDisplay::toggleItalic(bool) {
-    setFontItalic( m_actions.italic->isChecked() );
+void CHTMLWriteDisplay::toggleItalic(bool checked) {
+    if (!m_handingFormatChangeFromEditor)
+        setFontItalic(checked);
 }
 
-void CHTMLWriteDisplay::toggleUnderline(bool) {
-    setFontUnderline( m_actions.underline->isChecked() );
+void CHTMLWriteDisplay::toggleUnderline(bool checked) {
+    if (!m_handingFormatChangeFromEditor)
+        setFontUnderline(checked);
 }
 
-
 void CHTMLWriteDisplay::alignLeft(bool set) {
-    if (set && (alignment() != Qt::AlignLeft)) {
+    if (!m_handingFormatChangeFromEditor && set && (alignment() != Qt::AlignLeft)) {
         setAlignment(Qt::AlignLeft);
-        slotAlignmentChanged(Qt::AlignLeft);
+        alignmentChanged(Qt::AlignLeft);
     }
 }
 
 void CHTMLWriteDisplay::alignCenter(bool set) {
-    if (set && (alignment() != Qt::AlignHCenter)) {
+    if (!m_handingFormatChangeFromEditor && set && (alignment() != Qt::AlignHCenter)) {
         setAlignment(Qt::AlignHCenter);
-        slotAlignmentChanged(Qt::AlignHCenter);
+        alignmentChanged(Qt::AlignHCenter);
     }
 }
 
 void CHTMLWriteDisplay::alignRight(bool set) {
-    if (set && (alignment() != Qt::AlignRight)) {
+    if (!m_handingFormatChangeFromEditor && set && (alignment() != Qt::AlignRight)) {
         setAlignment(Qt::AlignRight);
-        slotAlignmentChanged(Qt::AlignRight);
+        alignmentChanged(Qt::AlignRight);
     }
 }
 
 /** The text's alignment changed. Enable the right buttons. */
-void CHTMLWriteDisplay::slotAlignmentChanged( int a ) {
+void CHTMLWriteDisplay::alignmentChanged( int a ) {
+    Q_ASSERT(!m_handingFormatChangeFromEditor);
     bool alignLeft = false;
     bool alignCenter = false;
     bool alignRight = false;
@@ -164,61 +186,79 @@ void CHTMLWriteDisplay::slotAlignmentChanged( int a ) {
     m_actions.alignRight->setChecked( alignRight );
 }
 
-void CHTMLWriteDisplay::changeFontSize(int newSize) {
-    setFontPointSize((qreal)newSize);
-}
-
-/** Is called when a new color was selected. */
-void CHTMLWriteDisplay::slotColorSelected( const QColor& c) {
-    setTextColor( c );
+void CHTMLWriteDisplay::slotCurrentCharFormatChanged(const QTextCharFormat &) {
+    Q_ASSERT(!m_handingFormatChangeFromEditor);
+    m_handingFormatChangeFromEditor = true;
+    QFont f = currentFont();
+    emit signalFontChanged(f);
+    emit signalFontSizeChanged(f.pointSize());
+    emit signalFontColorChanged(textColor());
+
+    m_actions.bold->setChecked(f.bold());
+    m_actions.italic->setChecked(f.italic());
+    m_actions.underline->setChecked(f.underline());
+    m_handingFormatChangeFromEditor = false;
+
+    BtConfig & conf = btConfig();
+    conf.setSessionValue(CHTMLWriteDisplayFontKey, currentFont());
+    conf.setSessionValue(CHTMLWriteDisplayFontColorKey, textColor());
 }
 
-/** Is called when a text with another color was selected. */
-void CHTMLWriteDisplay::slotColorChanged(const QColor& c) {
-    emit setColor(c);
+void CHTMLWriteDisplay::slotFontSizeChosen(int newSize) {
+    if (!m_handingFormatChangeFromEditor)
+        setFontPointSize((qreal)newSize);
 }
 
-void CHTMLWriteDisplay::slotFontChanged( const QFont& font ) {
-    emit fontChanged(font);
-    emit fontSizeChanged(font.pointSize());
-
-    m_actions.bold->setChecked( font.bold() );
-    m_actions.italic->setChecked( font.italic() );
-    m_actions.underline->setChecked( font.underline() );
+/** Is called when a new color was selected. */
+void CHTMLWriteDisplay::slotFontColorChosen( const QColor& c) {
+    if (!m_handingFormatChangeFromEditor)
+        setTextColor( c );
 }
 
-void CHTMLWriteDisplay::slotFontFamilyChoosen(const QFont& font) {
-    setFontFamily(font.family());
+void CHTMLWriteDisplay::slotFontFamilyChosen(const QFont& font) {
+    if (!m_handingFormatChangeFromEditor)
+        setFontFamily(font.family());
 }
 
 void CHTMLWriteDisplay::setupToolbar(QToolBar * bar, BtActionCollection * actions) {
+    Q_UNUSED(actions);
+
+    QFont f = currentFont();
 
     //--------------------font chooser-------------------------
     QFontComboBox* fontFamilyCombo = new QFontComboBox(this);
+    fontFamilyCombo->setCurrentFont(f);
     fontFamilyCombo->setToolTip( tr("Font") );
     bar->addWidget(fontFamilyCombo);
     bool ok = connect(fontFamilyCombo, SIGNAL(currentFontChanged(const QFont&)),
-                      this, SLOT(slotFontFamilyChoosen(const QFont&)));
+                      this,            SLOT(slotFontFamilyChosen(const QFont&)), Qt::DirectConnection);
     Q_ASSERT(ok);
-    ok = connect(this, SIGNAL(fontChanged(const QFont&)), fontFamilyCombo, SLOT(setCurrentFont(const QFont&)));
+    ok = connect(this,            SIGNAL(signalFontChanged(const QFont&)),
+                 fontFamilyCombo, SLOT(setCurrentFont(const QFont&)), Qt::DirectConnection);
     Q_ASSERT(ok);
 
     //--------------------font size chooser-------------------------
     BtFontSizeWidget* fontSizeChooser = new BtFontSizeWidget(this);
+    fontSizeChooser->setFontSize(f.pointSize());
     fontSizeChooser->setToolTip( tr("Font size") );
     bar->addWidget(fontSizeChooser);
-    ok = connect(fontSizeChooser, SIGNAL(fontSizeChanged(int)), this, SLOT(changeFontSize(int)));
+    ok = connect(fontSizeChooser, SIGNAL(fontSizeChanged(int)),
+                 this,            SLOT(slotFontSizeChosen(int)), Qt::DirectConnection);
     Q_ASSERT(ok);
-    ok = connect(this, SIGNAL(fontSizeChanged(int)), fontSizeChooser, SLOT(setFontSize(int)));
+    ok = connect(this,            SIGNAL(signalFontSizeChanged(int)),
+                 fontSizeChooser, SLOT(setFontSize(int)), Qt::DirectConnection);
     Q_ASSERT(ok);
 
     //--------------------color button-------------------------
-    BtColorWidget* colorChooser = new BtColorWidget();
-    colorChooser->setToolTip(tr("Font color"));
-    bar->addWidget(colorChooser);
-    ok = connect(colorChooser, SIGNAL(changed(const QColor&)), this, SLOT(slotColorSelected(const QColor&)));
+    BtColorWidget* fontColorChooser = new BtColorWidget();
+    fontColorChooser->setColor(textColor());
+    fontColorChooser->setToolTip(tr("Font color"));
+    bar->addWidget(fontColorChooser);
+    ok = connect(fontColorChooser, SIGNAL(changed(const QColor&)),
+                 this,             SLOT(slotFontColorChosen(const QColor&)), Qt::DirectConnection);
     Q_ASSERT(ok);
-    ok = connect(this, SIGNAL(setColor(const QColor&)), colorChooser, SLOT(setColor(const QColor&)));
+    ok = connect(this,             SIGNAL(signalFontColorChanged(const QColor&)),
+                 fontColorChooser, SLOT(setColor(QColor)), Qt::DirectConnection);
     Q_ASSERT(ok);
 
     bar->addSeparator();
@@ -233,13 +273,4 @@ void CHTMLWriteDisplay::setupToolbar(QToolBar * bar, BtActionCollection * action
     bar->addAction(m_actions.alignLeft);
     bar->addAction(m_actions.alignCenter);
     bar->addAction(m_actions.alignRight);
-
-    connect(this, SIGNAL(currentFontChanged(const QFont&)), SLOT(slotFontChanged(const QFont&)));
-    connect(this, SIGNAL(currentAlignmentChanged(int)), SLOT(slotAlignmentChanged(int)));
-    connect(this, SIGNAL(currentColorChanged(const QColor&)), SLOT(slotColorChanged(const QColor&)));
-
-    //set initial values for toolbar items
-    slotFontChanged( font() );
-    slotAlignmentChanged( alignment() );
-    slotColorChanged( textColor() );
 }
diff --git a/src/frontend/display/chtmlwritedisplay.h b/src/frontend/display/chtmlwritedisplay.h
index e8e4e7c..1bc9dd0 100644
--- a/src/frontend/display/chtmlwritedisplay.h
+++ b/src/frontend/display/chtmlwritedisplay.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,7 +18,7 @@
 class BtActionCollection;
 class BtColorWidget;
 class BtFontSizeWidget;
-class CWriteWindow;
+class CHTMLWriteWindow;
 class QAction;
 class QFontComboBox;
 class QMenu;
@@ -29,6 +31,9 @@ class QWidget;
 class CHTMLWriteDisplay : public CPlainWriteDisplay {
         Q_OBJECT
     public:
+
+        CHTMLWriteDisplay(CHTMLWriteWindow * parentWindow, QWidget * parent = 0);
+
         /**
         * Sets the new text for this display widget. (CPlainWriteDisplay).
         */
@@ -45,41 +50,29 @@ class CHTMLWriteDisplay : public CPlainWriteDisplay {
         virtual void setupToolbar(QToolBar * bar, BtActionCollection * actionCollection);
 
     protected:
-        friend class CDisplay;
-        CHTMLWriteDisplay(CWriteWindow* parentWindow, QWidget* parent);
-        ~CHTMLWriteDisplay();
+
+        void alignmentChanged(int);
 
     protected slots:
-        void toggleBold(bool);
-        void toggleItalic(bool);
-        void toggleUnderline(bool);
+        void toggleBold(bool checked);
+        void toggleItalic(bool checked);
+        void toggleUnderline(bool checked);
 
         void alignLeft(bool);
         void alignCenter(bool);
         void alignRight(bool);
 
-        void changeFontSize(int);
+        void slotFontFamilyChosen(const QFont&);
+        void slotFontSizeChosen(int);
+        void slotFontColorChosen( const QColor& );
 
-        void slotFontChanged( const QFont& );
-        void slotFontFamilyChoosen(const QFont&);
-
-        /**
-        * The text's alignment changed. Enable the right buttons.
-        */
-        void slotAlignmentChanged( int );
-        /**
-        * Is called when a new color was selected.
-        */
-        void slotColorSelected( const QColor& );
-        /**
-        * Is called when a text with another color was selected.
-        */
-        void slotColorChanged( const QColor& );
+        void slotCurrentCharFormatChanged(const QTextCharFormat &);
 
     signals:
-        void fontChanged(const QFont& font);
-        void fontSizeChanged(int);
-        void setColor(const QColor&);
+
+        void signalFontChanged(const QFont &);
+        void signalFontSizeChanged(int);
+        void signalFontColorChanged(const QColor &);
 
     private:
         struct {
@@ -90,11 +83,10 @@ class CHTMLWriteDisplay : public CPlainWriteDisplay {
             QAction* alignLeft;
             QAction* alignCenter;
             QAction* alignRight;
-
-            //popup menu
-            QAction* selectAll;
         }
         m_actions;
+
+        bool m_handingFormatChangeFromEditor;
 };
 
 #endif
diff --git a/src/frontend/display/cplainwritedisplay.cpp b/src/frontend/display/cplainwritedisplay.cpp
index 07cecf3..e4b22d5 100644
--- a/src/frontend/display/cplainwritedisplay.cpp
+++ b/src/frontend/display/cplainwritedisplay.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -19,10 +19,13 @@
 #include "frontend/cdragdrop.h"
 #include "frontend/displaywindow/btactioncollection.h"
 #include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/displaywindow/cwritewindow.h"
+#include "frontend/displaywindow/cplainwritewindow.h"
 
 
-CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, QWidget* parent) : QTextEdit(parentWindow ? parentWindow : parent), CWriteDisplay(parentWindow) {
+CPlainWriteDisplay::CPlainWriteDisplay(CPlainWriteWindow * parentWindow, QWidget * parent)
+    : QTextEdit(parentWindow ? parentWindow : parent)
+    , CDisplay(parentWindow)
+{
     setAcceptRichText(false);
     setAcceptDrops(true);
     viewport()->setAcceptDrops(true);
diff --git a/src/frontend/display/cplainwritedisplay.h b/src/frontend/display/cplainwritedisplay.h
index 575789e..dad57a1 100644
--- a/src/frontend/display/cplainwritedisplay.h
+++ b/src/frontend/display/cplainwritedisplay.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -11,22 +13,21 @@
 #define CPLAINWRITEDISPLAY_H
 
 #include <QTextEdit>
-#include "frontend/display/cwritedisplay.h"
+#include "frontend/display/cdisplay.h"
 
 
 class BtActionCollection;
-class CHTMLWriteDisplay;
-class QDragEnterEvent;
-class QDragMoveEvent;
-class QDropEvent;
-class QMenu;
-class QWidget;
+class CPlainWriteWindow;
+class QToolBar;
 
 /** The write display implementation for plain source code editing.
   * @author The BibleTime team
   */
-class CPlainWriteDisplay : public QTextEdit, public CWriteDisplay  {
+class CPlainWriteDisplay : public QTextEdit, public CDisplay  {
     public:
+
+        CPlainWriteDisplay(CPlainWriteWindow * parentWindow, QWidget * parent = 0);
+
         /**
         * Reimplementation.
         */
@@ -52,27 +53,21 @@ class CPlainWriteDisplay : public QTextEdit, public CWriteDisplay  {
                                   const DisplayOptions &,
                                   const FilterOptions &) {}
 
-        /**
-        * Reimplementation (CWriteDisplay).
-        */
         virtual bool isModified() const;
         /**
-        * Sets the current status of the edit widget (CWriteDisplay).
+        * Sets the current status of the edit widget.
         */
         virtual void setModified( const bool modified );
         /**
-        * Returns the text of this edit widget (CWriteDisplay).
+        * Returns the text of this edit widget.
         */
         virtual const QString plainText();
         /**
-        * Creates the necessary action objects and puts them on the toolbar (CWriteDisplay).
+        * Creates the necessary action objects and puts them on the toolbar.
         */
         virtual void setupToolbar(QToolBar*, BtActionCollection*);
 
     protected:
-        friend class CDisplay;
-
-        CPlainWriteDisplay(CWriteWindow* parentWindow, QWidget* parent);
 
         /**
         * Reimplementation from QTextEdit to manage drops of our drag and drop objects.
diff --git a/src/frontend/display/creaddisplay.cpp b/src/frontend/display/creaddisplay.cpp
index f1b2f65..f5c3459 100644
--- a/src/frontend/display/creaddisplay.cpp
+++ b/src/frontend/display/creaddisplay.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/display/creaddisplay.h b/src/frontend/display/creaddisplay.h
index 4b6dbeb..dd25a76 100644
--- a/src/frontend/display/creaddisplay.h
+++ b/src/frontend/display/creaddisplay.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,6 +18,8 @@
 #include "backend/managers/cswordbackend.h"
 
 
+class CReadWindow;
+
 /** The base class for all read-only widgets like KHTMLView.
   *@author The BibleTime team
   */
diff --git a/src/frontend/display/cwritedisplay.cpp b/src/frontend/display/cwritedisplay.cpp
deleted file mode 100644
index 47a3302..0000000
--- a/src/frontend/display/cwritedisplay.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#include "frontend/display/cwritedisplay.h"
-
-#include "frontend/displaywindow/cwritewindow.h"
-
-
-CWriteDisplay::CWriteDisplay( CWriteWindow* writeWindow ) : CDisplay(writeWindow) {
-    // Intentionally empty
-}
-
-CWriteDisplay::~CWriteDisplay() {
-    // Intentionally empty
-}
diff --git a/src/frontend/display/cwritedisplay.h b/src/frontend/display/cwritedisplay.h
deleted file mode 100644
index 0010749..0000000
--- a/src/frontend/display/cwritedisplay.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#ifndef CWRITEDISPLAY_H
-#define CWRITEDISPLAY_H
-
-#include "frontend/display/cdisplay.h"
-
-
-class BtActionCollection;
-class QToolBar;
-
-/** The base class for all read/write-display classes.
-  *@author The BibleTime team
-  */
-class CWriteDisplay : public CDisplay  {
-    protected:
-
-        CWriteDisplay( CWriteWindow* writeWindow );
-        ~CWriteDisplay();
-
-    public: // Public methods
-        /**
-        * Sets the current modified status of the widget.
-        */
-        virtual void setModified( const bool modified ) = 0;
-        /**
-        * Returns true if the current text was modified.
-        */
-        virtual bool isModified() const = 0;
-        /**
-        * Returns the text of this edit widget.
-        */
-        virtual const QString plainText() = 0;
-        /**
-        * Creates the necessary action objects and puts them on the toolbar.
-        */
-        virtual void setupToolbar( QToolBar* bar, BtActionCollection* actionCollection ) = 0;
-};
-
-#endif
diff --git a/src/frontend/displaywindow/btactioncollection.cpp b/src/frontend/displaywindow/btactioncollection.cpp
index 55909b7..f25b972 100644
--- a/src/frontend/displaywindow/btactioncollection.cpp
+++ b/src/frontend/displaywindow/btactioncollection.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -12,10 +12,8 @@
 #include <QAction>
 #include <QDebug>
 #include <QKeySequence>
-#include <QSettings>
 #include <QString>
 #include <QStringList>
-#include "backend/config/cbtconfig.h"
 #include "util/directory.h"
 
 
@@ -40,7 +38,7 @@ QList<QAction*> BtActionCollection::actions() {
     QList<QAction*> actionList;
     for (ActionMap::const_iterator iter = m_actions.constBegin();
          iter != m_actions.constEnd();
-         iter++)
+         ++iter)
     {
         actionList.append(iter.value()->action);
     }
@@ -79,7 +77,7 @@ QAction* BtActionCollection::addAction(const QString &name, const QObject *recei
 QKeySequence BtActionCollection::getDefaultShortcut(QAction* action) {
     for (ActionMap::const_iterator iter = m_actions.constBegin();
          iter != m_actions.constEnd();
-         iter++)
+         ++iter)
     {
         if (iter.value()->action == action) {
             return iter.value()->defaultKeys;
@@ -88,57 +86,26 @@ QKeySequence BtActionCollection::getDefaultShortcut(QAction* action) {
     return QKeySequence();
 }
 
-void BtActionCollection::readSettings() {
-    QSettings* settings = CBTConfig::getConfig();
-    settings->beginGroup(m_groupName);
-
-    Q_FOREACH (const QString &key, settings->childKeys()) {
-        QAction *a = action(key);
+void BtActionCollection::readShortcuts(const QString &group) {
+    QHash<QString, QList <QKeySequence > > shortcuts = btConfig().getShortcuts(group);
+    for(QHash<QString, QList <QKeySequence> >::const_iterator iter = shortcuts.begin();
+                                                             iter != shortcuts.end();
+                                                             ++iter)
+    {
+        QAction *a = action(iter.key());
         if (a == 0)
             continue;
-
-        QVariant variant = settings->value(key);
-        // qDebug() << variant << " | " << variant.typeName();
-        if (variant.type() != QVariant::List
-            && variant.type() != QVariant::StringList)
-        {
-            continue;
-        }
-
-        QList<QKeySequence> shortcuts;
-        if (variant.type() == QVariant::List) { // For BibleTime before 2.9
-            Q_FOREACH (const QVariant &shortcut, variant.toList()) {
-                shortcuts.append(shortcut.toString());
-            }
-        } else {
-            Q_ASSERT(variant.type() == QVariant::StringList);
-            Q_FOREACH (const QString &shortcut, variant.toStringList()) {
-                shortcuts.append(shortcut);
-            }
-        }
-        a->setShortcuts(shortcuts);
+        action(iter.key())->setShortcuts(iter.value());
     }
-
-    settings->endGroup();
 }
 
-void BtActionCollection::writeSettings() {
-    QSettings* settings = CBTConfig::getConfig();
-    settings->beginGroup(m_groupName);
-
+void BtActionCollection::writeShortcuts(const QString &group) {
+    QHash< QString, QList<QKeySequence> > shortcuts;
     for (ActionMap::const_iterator iter = m_actions.constBegin();
-         iter != m_actions.constEnd();
-         iter++)
+        iter != m_actions.constEnd();
+        ++iter)
     {
-        // Write beautiful string lists (since 2.9):
-        QStringList varList;
-        Q_FOREACH (const QKeySequence &shortcut, iter.value()->action->shortcuts()) {
-            /// \note saving QKeySequences directly doesn't appear to work!
-            varList.append(shortcut.toString());
-        }
-        settings->setValue(iter.key(), varList);
-        // qDebug() << ">>" << settings->value(iter.key()).typeName();
+        shortcuts.insert(iter.key(), iter.value()->action->shortcuts());
     }
-
-    settings->endGroup();
+    btConfig().setShortcuts(group, shortcuts);
 }
diff --git a/src/frontend/displaywindow/btactioncollection.h b/src/frontend/displaywindow/btactioncollection.h
index e99522d..a4d062f 100644
--- a/src/frontend/displaywindow/btactioncollection.h
+++ b/src/frontend/displaywindow/btactioncollection.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -15,10 +17,12 @@
 #include <QList>
 #include <QMap>
 
+#include "backend/config/btconfig.h"
 
 class BtActionItem;
 class QAction;
 class QKeySequence;
+class QString;
 
 class BtActionCollection: public QObject {
 
@@ -40,20 +44,31 @@ class BtActionCollection: public QObject {
 
         QAction *action(const QString &name) const;
 
-        inline void setConfigGroup(const QString &group) {
-            m_groupName = group;
-        }
-
-        void readSettings();
-
-        void writeSettings();
-
+        /*!
+         * \brief Read shortcuts from config.
+         *
+         * Read the shortcuts for the given group
+         * from the configuration and add them to
+         * this action collection.
+         *
+         * \param[in] group Shortcut group to read actions from.
+         */
+        void readShortcuts(const QString &group);
+
+        /*!
+         * \brief Write shortcuts to config.
+         *
+         * Write the shortcuts of this action collection
+         * to the given group in the configuration.
+         *
+         * \param[in] group Shortcut group to write actions to.
+         */
+        void writeShortcuts(const QString& group);
         QKeySequence getDefaultShortcut(QAction* action);
 
     private: /* Fields: */
 
         ActionMap m_actions;
-        QString m_groupName;
 
 };
 
diff --git a/src/frontend/displaywindow/btdisplaysettingsbutton.cpp b/src/frontend/displaywindow/btdisplaysettingsbutton.cpp
index 597a965..bca9334 100644
--- a/src/frontend/displaywindow/btdisplaysettingsbutton.cpp
+++ b/src/frontend/displaywindow/btdisplaysettingsbutton.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -14,17 +14,16 @@
 #include <QString>
 #include <QToolTip>
 #include <QToolButton>
-#include "util/directory.h"
+#include "bibletimeapp.h"
 #include "util/cresmgr.h"
+#include "util/geticon.h"
 
 
 BtDisplaySettingsButton::BtDisplaySettingsButton(QWidget *parent)
         : QToolButton(parent) {
-    namespace DU = util::directory;
-
     initMenu();
 
-    setIcon(DU::getIcon(CResMgr::displaywindows::displaySettings::icon));
+    setIcon(util::getIcon(CResMgr::displaywindows::displaySettings::icon));
     setPopupMode(QToolButton::InstantPopup);
     setEnabled(false);
 
diff --git a/src/frontend/displaywindow/btdisplaysettingsbutton.h b/src/frontend/displaywindow/btdisplaysettingsbutton.h
index c7c8f09..f82f682 100644
--- a/src/frontend/displaywindow/btdisplaysettingsbutton.h
+++ b/src/frontend/displaywindow/btdisplaysettingsbutton.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/displaywindow/btmodulechooserbar.cpp b/src/frontend/displaywindow/btmodulechooserbar.cpp
index 22b5ca8..e8d80cb 100644
--- a/src/frontend/displaywindow/btmodulechooserbar.cpp
+++ b/src/frontend/displaywindow/btmodulechooserbar.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/displaywindow/btmodulechooserbar.h b/src/frontend/displaywindow/btmodulechooserbar.h
index 977d3c0..024bc08 100644
--- a/src/frontend/displaywindow/btmodulechooserbar.h
+++ b/src/frontend/displaywindow/btmodulechooserbar.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/displaywindow/btmodulechooserbutton.cpp b/src/frontend/displaywindow/btmodulechooserbutton.cpp
index 200da78..4e0a5fc 100644
--- a/src/frontend/displaywindow/btmodulechooserbutton.cpp
+++ b/src/frontend/displaywindow/btmodulechooserbutton.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -15,11 +15,12 @@
 #include <QString>
 #include <QToolButton>
 #include <QToolTip>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/managers/cswordbackend.h"
+#include "bibletimeapp.h"
 #include "frontend/displaywindow/btmodulechooserbar.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
+#include "util/geticon.h"
 
 
 BtModuleChooserButton::BtModuleChooserButton(BtModuleChooserBar *parent, CSwordModuleInfo::ModuleType mtype)
@@ -58,7 +59,6 @@ void BtModuleChooserButton::updateMenu(QStringList newModulesToUse, QString this
 
     m_module = thisModule;
     m_hasModule = thisModule.isEmpty() ? false : true;
-    namespace DU = util::directory;
 
     //All items are iterated and the state is changed properly
     QListIterator<QMenu*> it(m_submenus);
@@ -70,7 +70,7 @@ void BtModuleChooserButton::updateMenu(QStringList newModulesToUse, QString this
         }
     }
     m_noneAction->setChecked(m_hasModule ? false : true);
-    setIcon(DU::getIcon(iconName()));
+    setIcon(util::getIcon(iconName()));
 
     if (m_hasModule) {
         setToolTip( QString(tr("Select a work [%1]")).arg(m_module) );
@@ -141,7 +141,7 @@ void BtModuleChooserButton::populateMenu() {
     // Filters: add only non-hidden and right type
     BTModuleTreeItem::HiddenOff hiddenFilter;
     QList<BTModuleTreeItem::Filter*> filters;
-    if (!CBTConfig::get(CBTConfig::bookshelfShowHidden)) {
+    if (!btConfig().value<bool>("GUI/bookshelfShowHidden", false)) {
         filters.append(&hiddenFilter);
     }
     TypeFilter typeFilter(m_moduleType);
@@ -150,7 +150,7 @@ void BtModuleChooserButton::populateMenu() {
     if (m_moduleType == CSwordModuleInfo::Bible) {
       BTModuleTreeItem root(filters, BTModuleTreeItem::CatLangMod);
         QList<BTModuleTreeItem::Filter*> filters2;
-        if (!CBTConfig::get(CBTConfig::bookshelfShowHidden)) {
+        if (!btConfig().value<bool>("GUI/bookshelfShowHidden", false)) {
             filters2.append(&hiddenFilter);
         }
         TypeFilter typeFilter2(CSwordModuleInfo::Commentary);
diff --git a/src/frontend/displaywindow/btmodulechooserbutton.h b/src/frontend/displaywindow/btmodulechooserbutton.h
index ba7d89e..03c2b9b 100644
--- a/src/frontend/displaywindow/btmodulechooserbutton.h
+++ b/src/frontend/displaywindow/btmodulechooserbutton.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/displaywindow/bttextwindowheader.cpp b/src/frontend/displaywindow/bttextwindowheader.cpp
index 71e98f0..6f108d7 100644
--- a/src/frontend/displaywindow/bttextwindowheader.cpp
+++ b/src/frontend/displaywindow/bttextwindowheader.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/displaywindow/bttextwindowheader.h b/src/frontend/displaywindow/bttextwindowheader.h
index 6dd4b0a..2673d78 100644
--- a/src/frontend/displaywindow/bttextwindowheader.h
+++ b/src/frontend/displaywindow/bttextwindowheader.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/displaywindow/bttextwindowheaderwidget.cpp b/src/frontend/displaywindow/bttextwindowheaderwidget.cpp
index 600bf15..a974c2c 100644
--- a/src/frontend/displaywindow/bttextwindowheaderwidget.cpp
+++ b/src/frontend/displaywindow/bttextwindowheaderwidget.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -17,11 +17,17 @@
 #include <QSizePolicy>
 #include <QLabel>
 
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/managers/cswordbackend.h"
+#include "bibletimeapp.h"
 #include "frontend/displaywindow/bttextwindowheader.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
+#include "util/geticon.h"
+
+
+namespace {
+const QString BookshelfShowHiddenKey = "GUI/bookshelfShowHidden";
+} // anonymous namespace
 
 const char* ActionType = "ActionType";
 
@@ -81,7 +87,6 @@ void BtTextWindowHeaderWidget::updateWidget(QStringList newModulesToUse, QString
         populateMenu();
 
     m_module = thisModule;
-    namespace DU = util::directory;
 
     //All items are iterated and the state is changed properly
     QListIterator<QMenu*> it(m_submenus);
@@ -147,18 +152,18 @@ void BtTextWindowHeaderWidget::populateMenu() {
 
     m_removeAction = new QAction(tr("Remove"), m_popup);
     m_removeAction->setProperty(ActionType, RemoveAction);
-    m_removeAction->setIcon(util::directory::getIcon(CResMgr::displaywindows::general::removemoduleicon));
+    m_removeAction->setIcon(util::getIcon(CResMgr::displaywindows::general::removemoduleicon));
     m_popup->addAction(m_removeAction);
 
     // Add Replace and Add menus, both have all modules in them
     QMenu* replaceItem = new QMenu(tr("Replace"), m_popup);
-    replaceItem->setIcon(util::directory::getIcon(CResMgr::displaywindows::general::replacemoduleicon));
+    replaceItem->setIcon(util::getIcon(CResMgr::displaywindows::general::replacemoduleicon));
     replaceItem->setProperty(ActionType, ReplaceAction);
     m_popup->addMenu(replaceItem);
 
     QMenu* addItem = new QMenu(tr("Add"), m_popup);
     addItem->setProperty(ActionType, AddAction);
-    addItem->setIcon(util::directory::getIcon(CResMgr::displaywindows::general::addmoduleicon));
+    addItem->setIcon(util::getIcon(CResMgr::displaywindows::general::addmoduleicon));
     m_popup->addMenu(addItem);
 
     QList<QMenu*> toplevelMenus;
@@ -170,7 +175,7 @@ void BtTextWindowHeaderWidget::populateMenu() {
         // Filters: add only non-hidden, non-locked and correct type
         BTModuleTreeItem::HiddenOff hiddenFilter;
         QList<BTModuleTreeItem::Filter*> filters;
-        if (!CBTConfig::get(CBTConfig::bookshelfShowHidden)) {
+        if (!btConfig().value<bool>(BookshelfShowHiddenKey, false)) {
             filters.append(&hiddenFilter);
         }
         TypeFilter typeFilter(m_moduleType);
@@ -179,7 +184,7 @@ void BtTextWindowHeaderWidget::populateMenu() {
         if (m_moduleType == CSwordModuleInfo::Bible) {
             BTModuleTreeItem root(filters, BTModuleTreeItem::CatLangMod);
             QList<BTModuleTreeItem::Filter*> filters2;
-            if (!CBTConfig::get(CBTConfig::bookshelfShowHidden)) {
+            if (!btConfig().value<bool>(BookshelfShowHiddenKey, false)) {
                 filters2.append(&hiddenFilter);
             }
             if (menu == addItem || menu == replaceItem) {
diff --git a/src/frontend/displaywindow/bttextwindowheaderwidget.h b/src/frontend/displaywindow/bttextwindowheaderwidget.h
index 02e0310..c69bf11 100644
--- a/src/frontend/displaywindow/bttextwindowheaderwidget.h
+++ b/src/frontend/displaywindow/bttextwindowheaderwidget.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/displaywindow/bttoolbarpopupaction.cpp b/src/frontend/displaywindow/bttoolbarpopupaction.cpp
index 1a5593b..e443f8a 100644
--- a/src/frontend/displaywindow/bttoolbarpopupaction.cpp
+++ b/src/frontend/displaywindow/bttoolbarpopupaction.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/displaywindow/bttoolbarpopupaction.h b/src/frontend/displaywindow/bttoolbarpopupaction.h
index ebbc848..4999098 100644
--- a/src/frontend/displaywindow/bttoolbarpopupaction.h
+++ b/src/frontend/displaywindow/bttoolbarpopupaction.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/displaywindow/btwindowmodulechooser.h b/src/frontend/displaywindow/btwindowmodulechooser.h
index a39e7a1..40ffcf0 100644
--- a/src/frontend/displaywindow/btwindowmodulechooser.h
+++ b/src/frontend/displaywindow/btwindowmodulechooser.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/displaywindow/cbiblereadwindow.cpp b/src/frontend/displaywindow/cbiblereadwindow.cpp
index aa6ae6b..4d88f13 100644
--- a/src/frontend/displaywindow/cbiblereadwindow.cpp
+++ b/src/frontend/displaywindow/cbiblereadwindow.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,7 +16,6 @@
 #include <QMenu>
 #include <QTimer>
 #include <QWidget>
-#include "backend/config/cbtconfig.h"
 #include "backend/drivers/cswordbiblemoduleinfo.h"
 #include "backend/keys/cswordversekey.h"
 #include "frontend/cexportmanager.h"
@@ -26,44 +25,19 @@
 #include "frontend/displaywindow/ccommentaryreadwindow.h"
 #include "frontend/displaywindow/btdisplaysettingsbutton.h"
 #include "frontend/keychooser/ckeychooser.h"
-#include "frontend/profile/cprofilewindow.h"
 #include "util/directory.h"
 #include "util/cresmgr.h"
 #include "util/tool.h"
 
 
-using namespace Profile;
+void CBibleReadWindow::applyProfileSettings(const QString & windowGroup) {
+    CLexiconReadWindow::applyProfileSettings(windowGroup);
 
-CBibleReadWindow::CBibleReadWindow(QList<CSwordModuleInfo*> moduleList, CMDIArea* parent)
-        : CLexiconReadWindow(moduleList, parent) {
-}
-
-CBibleReadWindow::~CBibleReadWindow() {
-}
-
-void CBibleReadWindow::applyProfileSettings(CProfileWindow* const settings) {
-    /**
-      \todo Make CProfileWindow properly handle these things so we wouldn't have
-            to mess around with bits.
-    */
-    CLexiconReadWindow::applyProfileSettings(settings);
-
-    int result = settings->windowSettings;
-
-    filterOptions().footnotes           = (result & 0x0001) != 0;
-    filterOptions().strongNumbers       = (result & 0x0002) != 0;
-    filterOptions().headings            = (result & 0x0004) != 0;
-    filterOptions().morphTags           = (result & 0x0008) != 0;
-    filterOptions().lemmas              = (result & 0x0010) != 0;
-    filterOptions().hebrewPoints        = (result & 0x0020) != 0;
-    filterOptions().hebrewCantillation  = (result & 0x0040) != 0;
-    filterOptions().greekAccents        = (result & 0x0080) != 0;
-    filterOptions().textualVariants     = (result & 0x0100) != 0;
-    filterOptions().redLetterWords      = (result & 0x0200) != 0;
-    filterOptions().scriptureReferences = (result & 0x0400) != 0;
-    filterOptions().morphSegmentation   = (result & 0x0800) != 0;
-    displayOptions().lineBreaks         = (result & 0x1000) != 0;
-    displayOptions().verseNumbers       = (result & 0x2000) != 0;
+    BtConfig & conf = btConfig();
+    conf.beginGroup(windowGroup);
+    filterOptions() = conf.getFilterOptions();
+    displayOptions() = conf.getDisplayOptions();
+    conf.endGroup();
 
     emit sigFilterOptionsChanged(filterOptions());
     emit sigDisplayOptionsChanged(displayOptions());
@@ -72,31 +46,14 @@ void CBibleReadWindow::applyProfileSettings(CProfileWindow* const settings) {
     lookup();
 }
 
-void CBibleReadWindow::storeProfileSettings( CProfileWindow * const settings) {
-    /**
-      \todo Make CProfileWindow properly handle these things so we wouldn't have
-            to mess around with bits.
-    */
-
-    int result = 0x0000;
-    if (filterOptions().footnotes)           result |= 0x0001;
-    if (filterOptions().strongNumbers)       result |= 0x0002;
-    if (filterOptions().headings)            result |= 0x0004;
-    if (filterOptions().morphTags)           result |= 0x0008;
-    if (filterOptions().lemmas)              result |= 0x0010;
-    if (filterOptions().hebrewPoints)        result |= 0x0020;
-    if (filterOptions().hebrewCantillation)  result |= 0x0040;
-    if (filterOptions().greekAccents)        result |= 0x0080;
-    if (filterOptions().textualVariants)     result |= 0x0100;
-    if (filterOptions().redLetterWords)      result |= 0x0200;
-    if (filterOptions().scriptureReferences) result |= 0x0400;
-    if (filterOptions().morphSegmentation)   result |= 0x0800;
-    if (displayOptions().lineBreaks)         result |= 0x1000;
-    if (displayOptions().verseNumbers)       result |= 0x2000;
-
-    settings->windowSettings = result;
-
-    CLexiconReadWindow::storeProfileSettings(settings);
+void CBibleReadWindow::storeProfileSettings(const QString & windowGroup) {
+    BtConfig & conf = btConfig();
+    conf.beginGroup(windowGroup);
+    conf.setFilterOptions(filterOptions());
+    conf.setDisplayOptions(displayOptions());
+    conf.endGroup();
+
+    CLexiconReadWindow::storeProfileSettings(windowGroup);
 }
 
 
@@ -274,7 +231,7 @@ void CBibleReadWindow::initActions() {
                      this,                    SLOT(printAll()));
     addAction(m_actions.print.chapter);
 
-    CBTConfig::setupAccelSettings(CBTConfig::bibleWindow, ac);
+    ac->readShortcuts("Bible shortcuts");
 }
 
 void CBibleReadWindow::initConnections() {
@@ -405,11 +362,11 @@ void CBibleReadWindow::copyDisplayedText() {
     dummy.setVerse(1);
 
     CSwordVerseKey vk(*verseKey());
-    vk.LowerBound(dummy);
+    vk.setLowerBound(dummy);
 
     const CSwordBibleModuleInfo* bible = dynamic_cast<const CSwordBibleModuleInfo*>(modules().first());
     dummy.setVerse(bible->verseCount(dummy.book(), dummy.getChapter()));
-    vk.UpperBound(dummy);
+    vk.setUpperBound(dummy);
 
     CExportManager mgr(false, tr("Copying"), filterOptions(), displayOptions());
     mgr.copyKey(&vk, CExportManager::Text, true);
@@ -425,10 +382,10 @@ void CBibleReadWindow::saveChapterHTML() {
     dummy.setVerse(1);
 
     CSwordVerseKey vk(*verseKey());
-    vk.LowerBound(dummy);
+    vk.setLowerBound(dummy);
 
     dummy.setVerse(bible->verseCount(dummy.book(), dummy.getChapter()));
-    vk.UpperBound(dummy);
+    vk.setUpperBound(dummy);
 
     CExportManager mgr(true, tr("Saving"), filterOptions(), displayOptions());
     mgr.saveKey(&vk, CExportManager::HTML, true);
@@ -442,11 +399,11 @@ void CBibleReadWindow::saveChapterPlain() {
     CSwordVerseKey dummy(*verseKey());
 
     dummy.setVerse(1);
-    vk.LowerBound(dummy);
+    vk.setLowerBound(dummy);
 
     const CSwordBibleModuleInfo* bible = dynamic_cast<const CSwordBibleModuleInfo*>(modules().first());
     dummy.setVerse(bible->verseCount(dummy.book(), dummy.getChapter()));
-    vk.UpperBound(dummy);
+    vk.setUpperBound(dummy);
 
     CExportManager mgr(true, tr("Saving"), filterOptions(), displayOptions());
     mgr.saveKey(&vk, CExportManager::Text, true);
@@ -464,7 +421,7 @@ void CBibleReadWindow::reload(CSwordBackend::SetupChangedReason reason) {
     verseKey()->setLocale( CSwordBackend::instance()->booknameLanguage().toLatin1() );
     keyChooser()->refreshContent();
 
-    CBTConfig::setupAccelSettings(CBTConfig::bibleWindow, actionCollection());
+    actionCollection()->readShortcuts("Bible shortcuts");
 }
 
 /** No descriptions */
diff --git a/src/frontend/displaywindow/cbiblereadwindow.h b/src/frontend/displaywindow/cbiblereadwindow.h
index 198c4fd..99c98fb 100644
--- a/src/frontend/displaywindow/cbiblereadwindow.h
+++ b/src/frontend/displaywindow/cbiblereadwindow.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -22,28 +24,21 @@ class QEvent;
 class QMenu;
 class QObject;
 
-/** The read display window for Bibles.
-  *@author The BibleTime team
-  */
-class CBibleReadWindow : public CLexiconReadWindow  {
+class CBibleReadWindow: public CLexiconReadWindow  {
+
         Q_OBJECT
-    public:
-        CBibleReadWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent);
-        virtual ~CBibleReadWindow();
-        /**
-        * Store the settings of this window in the given CProfileWindow object.
-        */
-        virtual void storeProfileSettings( Profile::CProfileWindow* const settings );
-        /**
-        * Store the settings of this window in the given profile window.
-        */
-        virtual void applyProfileSettings( Profile::CProfileWindow* const settings );
-        /**
-        * Reimplementation.
-        */
+
+    public: /* Methods: */
+
+        inline CBibleReadWindow(const QList<CSwordModuleInfo*> & modules, CMDIArea* parent)
+            : CLexiconReadWindow(modules, parent) {}
+
+        virtual void storeProfileSettings(const QString & windowGroup);
+        virtual void applyProfileSettings(const QString & windowGroup);
         static void insertKeyboardActions( BtActionCollection* const a );
 
-    protected:
+    protected: /* Methods: */
+
         virtual void initActions();
         virtual void initToolbars();
         virtual void initConnections();
@@ -97,6 +92,7 @@ class CBibleReadWindow : public CLexiconReadWindow  {
 
 
     public slots:
+
         void nextBook();
         void previousBook();
         void nextChapter();
@@ -108,7 +104,8 @@ class CBibleReadWindow : public CLexiconReadWindow  {
         */
         virtual void reload(CSwordBackend::SetupChangedReason reason);
 
-    protected slots: // Protected slots
+    protected slots:
+
         /**
         * Copies the current chapter into the clipboard.
         */
@@ -124,14 +121,13 @@ class CBibleReadWindow : public CLexiconReadWindow  {
         virtual void lookupSwordKey( CSwordKey* newKey );
         void syncWindows();
 
-    private:
+    private: /* Methods: */
 
         /**
         * Wrapper around key() to return the right type of key.
         */
         CSwordVerseKey* verseKey();
 
-        //  CTransliterationButton* m_transliterationButton;
 };
 
-#endif
+#endif /* CBIBLEREADWINDOW_H */
diff --git a/src/frontend/displaywindow/cbookreadwindow.cpp b/src/frontend/displaywindow/cbookreadwindow.cpp
index ff2adf2..fade4d5 100644
--- a/src/frontend/displaywindow/cbookreadwindow.cpp
+++ b/src/frontend/displaywindow/cbookreadwindow.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -14,41 +14,31 @@
 #include <QSplitter>
 #include <QToolBar>
 #include "bibletime.h"
-#include "backend/config/cbtconfig.h"
 #include "backend/keys/cswordtreekey.h"
-#include "frontend/display/cdisplay.h"
+#include "frontend/display/bthtmlreaddisplay.h"
 #include "frontend/displaywindow/bttoolbarpopupaction.h"
 #include "frontend/displaywindow/btactioncollection.h"
 #include "frontend/displaywindow/btmodulechooserbar.h"
 #include "frontend/displaywindow/btdisplaysettingsbutton.h"
 #include "frontend/keychooser/cbooktreechooser.h"
-#include "frontend/profile/cprofilewindow.h"
 #include "util/cresmgr.h"
 #include "util/tool.h"
 
 
-using namespace Profile;
+void CBookReadWindow::applyProfileSettings(const QString & windowGroup) {
+    CLexiconReadWindow::applyProfileSettings(windowGroup);
 
-CBookReadWindow::CBookReadWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent)
-        : CLexiconReadWindow(modules, parent), m_treeAction(0), m_treeChooser(0) {
-}
-
-CBookReadWindow::~CBookReadWindow() {
-}
-
-void CBookReadWindow::applyProfileSettings( CProfileWindow* profileWindow ) {
-    CLexiconReadWindow::applyProfileSettings(profileWindow);
-
-    if (profileWindow->windowSettings) {
+    Q_ASSERT(m_treeAction);
+    Q_ASSERT(windowGroup.endsWith('/'));
+    if (btConfig().sessionValue<bool>(windowGroup + "treeShown", true) != m_treeAction->isChecked())
         m_treeAction->activate(QAction::Trigger);
-    }
 }
 
-void CBookReadWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
-    CLexiconReadWindow::storeProfileSettings(profileWindow);
+void CBookReadWindow::storeProfileSettings(const QString & windowGroup) {
+    CLexiconReadWindow::storeProfileSettings(windowGroup);
 
-    //store information about our show tree structure button
-    profileWindow->windowSettings = m_treeAction->isChecked();
+    Q_ASSERT(windowGroup.endsWith('/'));
+    btConfig().setSessionValue(windowGroup + "treeShown", m_treeAction->isChecked());
 }
 
 void CBookReadWindow::initActions() {
@@ -70,7 +60,7 @@ void CBookReadWindow::initActions() {
                      this,         SLOT(treeToggled()));
     addAction(m_treeAction);
 
-    CBTConfig::setupAccelSettings(CBTConfig::bookWindow, ac);
+    ac->readShortcuts("Book shortcuts");
 }
 
 void CBookReadWindow::insertKeyboardActions( BtActionCollection* const a ) {
@@ -96,7 +86,7 @@ void CBookReadWindow::initConnections() {
 void CBookReadWindow::initView() {
     QSplitter* splitter = new QSplitter(this);
     m_treeChooser = new CBookTreeChooser(modules(), history(), key(), splitter);
-    setDisplayWidget( CDisplay::createReadInstance(this, splitter) );
+    setDisplayWidget(new BtHtmlReadDisplay(this, splitter));
     m_treeChooser->hide();
 
     // Create Navigation toolbar
diff --git a/src/frontend/displaywindow/cbookreadwindow.h b/src/frontend/displaywindow/cbookreadwindow.h
index 8b85504..63f3922 100644
--- a/src/frontend/displaywindow/cbookreadwindow.h
+++ b/src/frontend/displaywindow/cbookreadwindow.h
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's BtActionCollection code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime BtActionCollection code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -17,33 +17,30 @@ class BtActionCollection;
 class CBookTreeChooser;
 class QAction;
 
-/**
-  * @author The BibleTime team
-  */
-class CBookReadWindow : public CLexiconReadWindow  {
+class CBookReadWindow: public CLexiconReadWindow {
+
         Q_OBJECT
-    public:
-        static void insertKeyboardActions( BtActionCollection* const a );
 
-        CBookReadWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent);
+    public: /* Methods: */
 
-        virtual ~CBookReadWindow();
-        /**
-        * Store the settings of this window in the given CProfileWindow object.
-        */
-        virtual void storeProfileSettings( Profile::CProfileWindow* profileWindow );
-        /**
-        * Store the settings of this window in the given profile window.
-        */
-        virtual void applyProfileSettings( Profile::CProfileWindow* profileWindow );
+        inline CBookReadWindow(const QList<CSwordModuleInfo *> & modules, CMDIArea * parent)
+            : CLexiconReadWindow(modules, parent)
+            , m_treeAction(0)
+            , m_treeChooser(0) {}
+
+        virtual void storeProfileSettings(const QString & windowGroup);
+        virtual void applyProfileSettings(const QString & windowGroup);
+        static void insertKeyboardActions(BtActionCollection * const a);
 
     public slots:
+
         /**
         * Refreshes the content of this display window and the content of the keychooser.
         */
         virtual void reload(CSwordBackend::SetupChangedReason reason);
 
-    protected:
+    protected: /* Methods: */
+
         virtual void initActions();
         virtual void initToolbars();
         virtual void initConnections();
@@ -53,21 +50,24 @@ class CBookReadWindow : public CLexiconReadWindow  {
 
         virtual void setupPopupMenu();
 
-    protected slots: // Protected slots
+    protected slots:
+
         /**
          * Reimplementation to take care of the tree chooser.
          */
         virtual void modulesChanged();
 
-    private:
-        QAction* m_treeAction;
-        CBookTreeChooser* m_treeChooser;
+    private slots:
 
-    private slots: // Private slots
         /**
         * Is called when the action was executed to toggle the tree view.
         */
         void treeToggled();
+
+    private: /* Fields: */
+
+        QAction * m_treeAction;
+        CBookTreeChooser * m_treeChooser;
 };
 
 #endif
diff --git a/src/frontend/displaywindow/ccommentaryreadwindow.cpp b/src/frontend/displaywindow/ccommentaryreadwindow.cpp
index f2c2c3d..1beb5c5 100644
--- a/src/frontend/displaywindow/ccommentaryreadwindow.cpp
+++ b/src/frontend/displaywindow/ccommentaryreadwindow.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -13,25 +13,19 @@
 #include <QIcon>
 #include <QMenu>
 #include <QToolBar>
-#include "backend/config/cbtconfig.h"
 #include "backend/keys/cswordversekey.h"
 #include "bibletime.h"
+#include "bibletimeapp.h"
 #include "frontend/display/cdisplay.h"
 #include "frontend/display/creaddisplay.h"
 #include "frontend/displaywindow/btactioncollection.h"
 #include "frontend/displaywindow/btmodulechooserbar.h"
 #include "frontend/keychooser/ckeychooser.h"
-#include "frontend/profile/cprofilewindow.h"
-#include "util/directory.h"
 #include "util/cresmgr.h"
+#include "util/geticon.h"
 
-using namespace Profile;
-
-CCommentaryReadWindow::CCommentaryReadWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent) : CLexiconReadWindow(modules, parent) {
-}
 
 void CCommentaryReadWindow::insertKeyboardActions(BtActionCollection* const a) {
-    namespace DU = util::directory;
     QAction* qaction;
 
     qaction = new QAction(tr("Next book"), a);
@@ -58,7 +52,7 @@ void CCommentaryReadWindow::insertKeyboardActions(BtActionCollection* const a) {
     qaction->setShortcut(CResMgr::displaywindows::bibleWindow::previousVerse::accel);
     a->addAction("previousVerse", qaction);
 
-    qaction = new QAction(QIcon(DU::getIcon(CResMgr::displaywindows::commentaryWindow::syncWindow::icon)),
+    qaction = new QAction(QIcon(util::getIcon(CResMgr::displaywindows::commentaryWindow::syncWindow::icon)),
         tr("Synchronize"), a);
     qaction->setCheckable(true);
     qaction->setShortcut(CResMgr::displaywindows::commentaryWindow::syncWindow::accel);
@@ -120,19 +114,23 @@ void CCommentaryReadWindow::initActions() {
     m_syncButton = qaction;
     addAction(qaction);
 
-    CBTConfig::setupAccelSettings(CBTConfig::commentaryWindow, actionCollection());
+    actionCollection()->readShortcuts("Commentary shortcuts");
 }
 
-void CCommentaryReadWindow::applyProfileSettings( CProfileWindow* profileWindow ) {
-    CLexiconReadWindow::applyProfileSettings(profileWindow);
-    if (profileWindow->windowSettings) {
-        m_syncButton->setChecked(true);
-    }
+void CCommentaryReadWindow::applyProfileSettings(const QString & windowGroup) {
+    CLexiconReadWindow::applyProfileSettings(windowGroup);
+
+    Q_ASSERT(windowGroup.endsWith('/'));
+    Q_ASSERT(m_syncButton);
+    m_syncButton->setChecked(btConfig().sessionValue<bool>(windowGroup + "syncEnabled", false));
 }
 
-void CCommentaryReadWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
-    CLexiconReadWindow::storeProfileSettings(profileWindow);
-    profileWindow->windowSettings = m_syncButton->isChecked();
+void CCommentaryReadWindow::storeProfileSettings(const QString & windowGroup) {
+    CLexiconReadWindow::storeProfileSettings(windowGroup);
+
+    Q_ASSERT(windowGroup.endsWith('/'));
+    Q_ASSERT(m_syncButton);
+    btConfig().setSessionValue(windowGroup + "syncEnabled", m_syncButton->isChecked());
 }
 
 void CCommentaryReadWindow::initToolbars() {
@@ -153,7 +151,7 @@ void CCommentaryReadWindow::reload(CSwordBackend::SetupChangedReason reason) {
     verseKey()->setLocale( CSwordBackend::instance()->booknameLanguage().toLatin1() );
     keyChooser()->refreshContent();
 
-    CBTConfig::setupAccelSettings(CBTConfig::commentaryWindow, actionCollection());
+    actionCollection()->readShortcuts("Commentary shortcuts");
 }
 
 /** rapper around key() to return the right type of key. */
diff --git a/src/frontend/displaywindow/ccommentaryreadwindow.h b/src/frontend/displaywindow/ccommentaryreadwindow.h
index 679906c..06cbd93 100644
--- a/src/frontend/displaywindow/ccommentaryreadwindow.h
+++ b/src/frontend/displaywindow/ccommentaryreadwindow.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -28,15 +30,11 @@ class CCommentaryReadWindow : public CLexiconReadWindow  {
         */
         static void insertKeyboardActions( BtActionCollection* const a );
 
-        CCommentaryReadWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent);
-        /**
-        * Store the settings of this window in the given CProfileWindow object.
-        */
-        virtual void storeProfileSettings( Profile::CProfileWindow* profileWindow );
-        /**
-        * Store the settings of this window in the given profile window.
-        */
-        virtual void applyProfileSettings( Profile::CProfileWindow* profileWindow );
+        inline CCommentaryReadWindow(const QList<CSwordModuleInfo *> & modules, CMDIArea * parent)
+            : CLexiconReadWindow(modules, parent) {}
+
+        virtual void storeProfileSettings(const QString & windowGroup);
+        virtual void applyProfileSettings(const QString & windowGroup);
         virtual bool syncAllowed() const;
 
     public slots: // Public slots
diff --git a/src/frontend/displaywindow/cdisplaywindow.cpp b/src/frontend/displaywindow/cdisplaywindow.cpp
index 0b9bc61..a584d6e 100644
--- a/src/frontend/displaywindow/cdisplaywindow.cpp
+++ b/src/frontend/displaywindow/cdisplaywindow.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -11,12 +11,14 @@
 
 #include <QCloseEvent>
 #include <QDebug>
+#include <QMdiSubWindow>
 #include <QMenu>
 #include <QStringList>
 #include <QWidget>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/keys/cswordkey.h"
 #include "bibletime.h"
+#include "bibletimeapp.h"
 #include "frontend/cmdiarea.h"
 #include "frontend/display/cdisplay.h"
 #include "frontend/displaywindow/bttoolbarpopupaction.h"
@@ -25,15 +27,12 @@
 #include "frontend/displaywindow/btdisplaysettingsbutton.h"
 #include "frontend/keychooser/ckeychooser.h"
 #include "frontend/keychooser/bthistory.h"
-#include "frontend/profile/cprofilewindow.h"
 #include "frontend/searchdialog/csearchdialog.h"
-#include "util/directory.h"
 #include "util/cresmgr.h"
+#include "util/geticon.h"
 
 
-using namespace Profile;
-
-CDisplayWindow::CDisplayWindow(QList<CSwordModuleInfo*> modules, CMDIArea *parent)
+CDisplayWindow::CDisplayWindow(const QList<CSwordModuleInfo *> & modules, CMDIArea * parent)
         : QMainWindow(parent),
         m_actionCollection(0),
         m_mdi(parent),
@@ -69,8 +68,17 @@ CDisplayWindow::~CDisplayWindow() {
     m_swordKey = 0;
 }
 
+QWidget * CDisplayWindow::getProfileWindow() const {
+    for (QWidget * w = parentWidget(); w; w = w->parentWidget()) {
+        QMdiSubWindow * sw = qobject_cast<QMdiSubWindow *>(w);
+        if (sw)
+            return sw;
+    }
+    return const_cast<CDisplayWindow *>(this);
+}
+
 BibleTime* CDisplayWindow::btMainWindow() {
-    return dynamic_cast<BibleTime*>(m_mdi->parent());
+    return dynamic_cast<BibleTime*>(m_mdi->parent()->parent());
 }
 
 void CDisplayWindow::setToolBarsHidden() {
@@ -110,9 +118,77 @@ const QList<const CSwordModuleInfo*> CDisplayWindow::modules() const {
     return CSwordBackend::instance()->getConstPointerList(m_modules);
 }
 
-void CDisplayWindow::insertKeyboardActions( BtActionCollection* a ) {
-    namespace DU = util::directory;
+/** Store the settings of this window in the given CProfileWindow object. */
+void CDisplayWindow::storeProfileSettings(const QString & windowGroup) {
+    BtConfig & conf = btConfig();
+
+    conf.beginGroup(windowGroup);
+
+    QWidget * w = getProfileWindow();
+
+    /**
+      \note We don't use saveGeometry/restoreGeometry for MDI subwindows,
+            because they give slightly incorrect results with some window
+            managers. Might be related to Qt bug QTBUG-7634.
+    */
+    const QRect rect(w->x(), w->y(), w->width(), w->height());
+    conf.setSessionValue<QRect>("windowRect", rect);
+
+    conf.setSessionValue("maximized", w->isMaximized());
+
+    bool hasFocus = (w == dynamic_cast<CDisplayWindow *>(mdi()->activeSubWindow()));
+    conf.setSessionValue("hasFocus", hasFocus);
+    // conf.setSessionValue("type", static_cast<int>(modules().first()->type()));
+
+    // Save current key:
+    if (key()) {
+        CSwordKey * k = key();
+        sword::VerseKey * vk = dynamic_cast<sword::VerseKey*>(k);
+        QString oldLang;
+        if (vk) {
+            // Save keys in english only:
+            const QString oldLang = QString::fromLatin1(vk->getLocale());
+            vk->setLocale("en");
+            conf.setSessionValue("key", k->key());
+            vk->setLocale(oldLang.toLatin1());
+        } else {
+            conf.setSessionValue("key", k->key());
+        }
+    }
 
+    // Save list of modules:
+    QStringList mods;
+    Q_FOREACH (const CSwordModuleInfo * module, modules())
+        mods.append(module->name());
+    conf.setSessionValue("modules", mods);
+
+    conf.endGroup();
+}
+
+void CDisplayWindow::applyProfileSettings(const QString & windowGroup) {
+    BtConfig & conf = btConfig();
+    conf.beginGroup(windowGroup);
+    setUpdatesEnabled(false);
+
+    QWidget * w = getProfileWindow();
+
+    /**
+      \note We don't use restoreGeometry/saveGeometry for MDI subwindows,
+            because they give slightly incorrect results with some window
+            managers. Might be related to Qt bug QTBUG-7634.
+    */
+    const QRect rect = conf.sessionValue<QRect>("windowRect");
+    w->resize(rect.width(), rect.height());
+    w->move(rect.x(), rect.y());
+
+    if (conf.sessionValue<bool>("maximized"))
+        w->showMaximized();
+
+    setUpdatesEnabled(true);
+    conf.endGroup();
+}
+
+void CDisplayWindow::insertKeyboardActions( BtActionCollection* a ) {
     QAction* actn = new QAction(QIcon(), tr("Select all"), a);
     actn->setShortcut(QKeySequence::SelectAll);
     a->addAction("selectAll", actn);
@@ -129,13 +205,13 @@ void CDisplayWindow::insertKeyboardActions( BtActionCollection* a ) {
     actn->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L));
     a->addAction("openLocation", actn);
 
-    actn = new QAction(QIcon(DU::getIcon(CResMgr::displaywindows::general::search::icon)),
+    actn = new QAction(QIcon(util::getIcon(CResMgr::displaywindows::general::search::icon)),
                        tr("Search with works of this window"), a);
     actn->setShortcut(CResMgr::displaywindows::general::search::accel);
     a->addAction(CResMgr::displaywindows::general::search::actionName, actn);
 
     BtToolBarPopupAction* action = new BtToolBarPopupAction(
-        QIcon(DU::getIcon(CResMgr::displaywindows::general::backInHistory::icon)),
+        QIcon(util::getIcon(CResMgr::displaywindows::general::backInHistory::icon)),
         tr("Back in history"),
         a
     );
@@ -143,7 +219,7 @@ void CDisplayWindow::insertKeyboardActions( BtActionCollection* a ) {
     a->addAction(CResMgr::displaywindows::general::backInHistory::actionName, action);
 
     action = new BtToolBarPopupAction(
-        QIcon(DU::getIcon(CResMgr::displaywindows::general::forwardInHistory::icon)),
+        QIcon(util::getIcon(CResMgr::displaywindows::general::forwardInHistory::icon)),
         tr("Forward in history"),
         a
     );
@@ -201,7 +277,7 @@ void CDisplayWindow::initActions() {
     Q_ASSERT(ok);
     addAction(actn);
 
-    CBTConfig::setupAccelSettings(CBTConfig::allWindows, ac);
+    ac->readShortcuts("Displaywindow shortcuts");
 }
 
 /** Refresh the settings of this window. */
@@ -223,8 +299,8 @@ void CDisplayWindow::reload(CSwordBackend::SetupChangedReason) {
 
     lookup();
 
-    CBTConfig::setupAccelSettings(CBTConfig::allWindows, actionCollection());
-    CBTConfig::setupAccelSettings(CBTConfig::readWindow, actionCollection());
+    actionCollection()->readShortcuts("DisplayWindow shortcuts");
+    actionCollection()->readShortcuts("Readwindow shortcuts");
     emit sigModuleListSet(m_modules);
 }
 
@@ -316,7 +392,7 @@ void CDisplayWindow::setModuleChooserBar( BtModuleChooserBar* bar ) {
         m_moduleChooserBar = bar;
         bar->setWindowTitle(tr("Work chooser buttons"));
         bar->setLayoutDirection(Qt::LeftToRight);
-        bar->setVisible(CBTConfig::get(CBTConfig::showTextWindowModuleSelectorButtons));
+        bar->setVisible(btConfig().sessionValue<bool>("GUI/showTextWindowModuleSelectorButtons", true));
     }
 }
 
@@ -325,7 +401,7 @@ void CDisplayWindow::setHeaderBar( QToolBar* header ) {
     m_headerBar = header;
     header->setMovable(false);
     header->setWindowTitle(tr("Text area header"));
-    header->setVisible(CBTConfig::get(CBTConfig::showTextWindowHeaders));
+    header->setVisible(btConfig().sessionValue<bool>("GUI/showTextWindowHeaders", true));
 }
 
 /** Sets the modules. */
@@ -348,15 +424,15 @@ bool CDisplayWindow::init() {
     parentWidget()->setFocusPolicy(Qt::ClickFocus);
     initActions();
     initToolbars();
-    if ( ! CBTConfig::get(CBTConfig::showToolbarsInEachWindow))
+    if (!btConfig().sessionValue<bool>("GUI/showToolbarsInEachWindow", true))
         setToolBarsHidden();
     btMainWindow()->clearMdiToolBars();
     clearMainWindowToolBars();
     initConnections();
     setupPopupMenu();
 
-    m_filterOptions = CBTConfig::getFilterOptionDefaults();
-    m_displayOptions = CBTConfig::getDisplayOptionDefaults();
+    m_filterOptions = btConfig().getFilterOptions();
+    m_displayOptions = btConfig().getDisplayOptions();
     emit sigDisplayOptionsChanged(m_displayOptions);
     emit sigFilterOptionsChanged(m_filterOptions);
     emit sigModulesChanged(modules());
@@ -374,13 +450,13 @@ static void prepareToolBar(QToolBar* bar, const QString& title, bool visible) {
 
 /** Setup the Navigation toolbar. */
 void CDisplayWindow::setMainToolBar( QToolBar* bar ) {
-    prepareToolBar(bar, tr("Navigation"), CBTConfig::get(CBTConfig::showTextWindowNavigator) );
+    prepareToolBar(bar, tr("Navigation"), btConfig().sessionValue<bool>("GUI/showTextWindowNavigator", true));
     m_mainToolBar = bar;
 }
 
 /** Setup the Tools toolbar. */
 void CDisplayWindow::setButtonsToolBar( QToolBar* bar ) {
-    prepareToolBar(bar, tr("Tool"), CBTConfig::get(CBTConfig::showTextWindowToolButtons) );
+    prepareToolBar(bar, tr("Tool"), btConfig().sessionValue<bool>("GUI/showTextWindowToolButtons", true));
     m_buttonsToolBar = bar;
 }
 
diff --git a/src/frontend/displaywindow/cdisplaywindow.h b/src/frontend/displaywindow/cdisplaywindow.h
index 4935d8f..72199d1 100644
--- a/src/frontend/displaywindow/cdisplaywindow.h
+++ b/src/frontend/displaywindow/cdisplaywindow.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -15,7 +17,6 @@
 #include <QStringList>
 #include "backend/managers/cswordbackend.h"
 #include "btglobal.h"
-#include "frontend/profile/cprofilewindow.h"
 
 
 class BtActionCollection;
@@ -25,14 +26,13 @@ class CKeyChooser;
 class CMDIArea;
 class BtModuleChooserBar;
 class CSwordModuleInfo;
-class QCloseEvent;
 class QMenu;
 class QToolBar;
 class BTHistory;
 class BibleTime;
 
-/** The base class for all display windows of BibleTime. 
-  * 
+/** The base class for all display windows of BibleTime.
+  *
   * Inherits QMainWindow.
   *
   * Inherited by CReadWindow and CWriteWindow.
@@ -46,6 +46,9 @@ class CDisplayWindow : public QMainWindow {
         /** Insert the keyboard accelerators of this window into the given actioncollection.*/
         static void insertKeyboardActions( BtActionCollection* const a );
 
+        /** Returns a pointer to the parent widget of type QMdiSubWindow or pointer to self if none found. */
+        QWidget * getProfileWindow() const;
+
         /** Returns pointer to the mdi area object.*/
         inline CMDIArea *mdi() const {
             return m_mdi;
@@ -63,10 +66,10 @@ class CDisplayWindow : public QMainWindow {
         }
 
         /** Store the settings of this window in the given CProfileWindow object.*/
-        virtual void storeProfileSettings( Profile::CProfileWindow* profileWindow ) = 0;
+        virtual void storeProfileSettings(const QString & windowGroup);
 
         /** Load the settings the given CProfileWindow object into this window.*/
-        virtual void applyProfileSettings( Profile::CProfileWindow* profileWindow ) = 0;
+        virtual void applyProfileSettings(const QString & windowGroup);
 
         /** Returns the display options used by this display window. */
         inline const DisplayOptions &displayOptions() const {
@@ -228,7 +231,7 @@ class CDisplayWindow : public QMainWindow {
 
         friend class CBibleReadWindow;
 
-        CDisplayWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent);
+        CDisplayWindow(const QList<CSwordModuleInfo *> & modules, CMDIArea * parent);
         virtual ~CDisplayWindow();
 
         /**
diff --git a/src/frontend/displaywindow/cdisplaywindowfactory.cpp b/src/frontend/displaywindow/cdisplaywindowfactory.cpp
index e280c6d..12059d1 100644
--- a/src/frontend/displaywindow/cdisplaywindowfactory.cpp
+++ b/src/frontend/displaywindow/cdisplaywindowfactory.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -17,11 +17,10 @@
 #include "frontend/displaywindow/clexiconreadwindow.h"
 #include "frontend/displaywindow/cplainwritewindow.h"
 #include "frontend/displaywindow/creadwindow.h"
-#include "frontend/displaywindow/cwritewindow.h"
 #include "frontend/cmdiarea.h"
 
 
-CReadWindow* CDisplayWindowFactory::createReadInstance(QList<CSwordModuleInfo*> modules, CMDIArea* parent) {
+CReadWindow* CDisplayWindowFactory::createReadInstance(const QList<CSwordModuleInfo *> & modules, CMDIArea * parent) {
     CReadWindow* win = 0;
     switch (modules.first()->type()) {
         case CSwordModuleInfo::Bible:
@@ -43,8 +42,8 @@ CReadWindow* CDisplayWindowFactory::createReadInstance(QList<CSwordModuleInfo*>
     return win;
 }
 
-CWriteWindow* CDisplayWindowFactory::createWriteInstance(QList<CSwordModuleInfo*> modules, CMDIArea* parent, const CWriteWindow::WriteWindowType type) {
-    if (type == CWriteWindow::HTMLWindow) {
+CPlainWriteWindow * CDisplayWindowFactory::createWriteInstance(const QList<CSwordModuleInfo *> & modules, CMDIArea * parent, CPlainWriteWindow::WriteWindowType type) {
+    if (type == CPlainWriteWindow::HTMLWindow) {
         return new CHTMLWriteWindow(modules, parent);
     }
     else {
@@ -53,7 +52,7 @@ CWriteWindow* CDisplayWindowFactory::createWriteInstance(QList<CSwordModuleInfo*
     return 0;
 }
 
-const CSwordModuleInfo::ModuleType CDisplayWindowFactory::getModuleType(QObject* widget) {
+CSwordModuleInfo::ModuleType CDisplayWindowFactory::getModuleType(QObject* widget) {
     if (qobject_cast<CBibleReadWindow*>(widget) != 0 )
         return CSwordModuleInfo::Bible;
     if (qobject_cast<CCommentaryReadWindow*>(widget) != 0 )
diff --git a/src/frontend/displaywindow/cdisplaywindowfactory.h b/src/frontend/displaywindow/cdisplaywindowfactory.h
index 06d9aa4..e065e50 100644
--- a/src/frontend/displaywindow/cdisplaywindowfactory.h
+++ b/src/frontend/displaywindow/cdisplaywindowfactory.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -11,20 +13,18 @@
 #define CDISPLAYWINDOWFACTORY_H
 
 #include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/displaywindow/cwritewindow.h"
+#include "frontend/displaywindow/cplainwritewindow.h"
 
 
-class CMDIArea;
 class CReadWindow;
 class CSwordModuleInfo;
-class CWriteWindow;
 
 /// \todo Make CDisplayWindowFactory a namespace instead?
 class CDisplayWindowFactory {
     public:
-        static CReadWindow* createReadInstance(QList<CSwordModuleInfo*> modules, CMDIArea* parent);
-        static CWriteWindow* createWriteInstance(QList<CSwordModuleInfo*> modules, CMDIArea* parent, const CWriteWindow::WriteWindowType type = CWriteWindow::HTMLWindow);
-        static const CSwordModuleInfo::ModuleType getModuleType(QObject* widget);
+        static CReadWindow* createReadInstance(const QList<CSwordModuleInfo *> & modules, CMDIArea * parent);
+        static CPlainWriteWindow* createWriteInstance(const QList<CSwordModuleInfo*> & modules, CMDIArea * parent, CPlainWriteWindow::WriteWindowType type = CPlainWriteWindow::HTMLWindow);
+        static CSwordModuleInfo::ModuleType getModuleType(QObject* widget);
 
     private:
         CDisplayWindowFactory();
diff --git a/src/frontend/displaywindow/chtmlwritewindow.cpp b/src/frontend/displaywindow/chtmlwritewindow.cpp
index 705daf0..20c8323 100644
--- a/src/frontend/displaywindow/chtmlwritewindow.cpp
+++ b/src/frontend/displaywindow/chtmlwritewindow.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -14,26 +14,22 @@
 #include "bibletime.h"
 #include "backend/keys/cswordkey.h"
 #include "frontend/display/chtmlwritedisplay.h"
-#include "frontend/display/cwritedisplay.h"
 #include "frontend/displaywindow/btactioncollection.h"
 #include "frontend/displaywindow/btmodulechooserbar.h"
 #include "frontend/keychooser/ckeychooser.h"
-#include "frontend/profile/cprofilewindow.h"
+#include "frontend/messagedialog.h"
 #include "util/directory.h"
-#include "util/dialogutil.h"
 #include "util/cresmgr.h"
 
 
-using namespace Profile;
-
-CHTMLWriteWindow::CHTMLWriteWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent)
+CHTMLWriteWindow::CHTMLWriteWindow(const QList<CSwordModuleInfo *> & modules, CMDIArea * parent)
         : CPlainWriteWindow(modules, parent) {}
 
 void CHTMLWriteWindow::initView() {
-    CWriteDisplay* writeDisplay = CDisplay::createWriteInstance(this, CDisplay::HTMLDisplay);
-    Q_ASSERT(writeDisplay);
-    setDisplayWidget( writeDisplay );
-    setCentralWidget( displayWidget()->view() );
+    m_writeDisplay = new CHTMLWriteDisplay(this, this);
+    Q_ASSERT(m_writeDisplay);
+    setDisplayWidget(m_writeDisplay);
+    setCentralWidget(m_writeDisplay->view() );
 
     // Create Navigation toolbar
     setMainToolBar( new QToolBar(this) );
@@ -48,19 +44,11 @@ void CHTMLWriteWindow::initView() {
     addToolBar(formatToolBar());
 }
 
-void CHTMLWriteWindow::initActions() {
-    insertKeyboardActions(actionCollection());
-    CPlainWriteWindow::initActions();
-}
-
-void CHTMLWriteWindow::insertKeyboardActions( BtActionCollection* const a) {
-}
-
 void CHTMLWriteWindow::initConnections() {
-    CWriteWindow::initConnections();
+    CPlainWriteWindow::initConnections();
 
     connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), this, SLOT(lookupSwordKey(CSwordKey*)));
-    connect(displayWidget()->connectionsProxy(), SIGNAL(textChanged()), this, SLOT(textChanged()) );
+    connect(m_writeDisplay->connectionsProxy(), SIGNAL(textChanged()), this, SLOT(textChanged()) );
 }
 
 void CHTMLWriteWindow::initToolbars() {
@@ -69,39 +57,41 @@ void CHTMLWriteWindow::initToolbars() {
     CPlainWriteWindow::initToolbars();
 
     //Formatting toolbar
-    ((CWriteDisplay*)displayWidget())->setupToolbar( formatToolBar(), actionCollection() );
+    m_writeDisplay->setupToolbar( formatToolBar(), actionCollection() );
 }
 
-void CHTMLWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
-    CWriteWindow::storeProfileSettings(profileWindow);
-    QAction* action = actionCollection()->action(CResMgr::displaywindows::commentaryWindow::syncWindow::actionName);
+void CHTMLWriteWindow::storeProfileSettings(const QString & windowGroup) {
+    CPlainWriteWindow::storeProfileSettings(windowGroup);
+
+    QAction * action = actionCollection()->action(CResMgr::displaywindows::commentaryWindow::syncWindow::actionName);
     Q_ASSERT(action != 0);
-    profileWindow->windowSettings = action->isChecked();
+    Q_ASSERT(windowGroup.endsWith('/'));
+    btConfig().setSessionValue(windowGroup + "syncWindowEnabled", action->isChecked());
 }
 
-void CHTMLWriteWindow::applyProfileSettings( CProfileWindow* profileWindow ) {
-    CWriteWindow::applyProfileSettings(profileWindow);
-    if (profileWindow->windowSettings) {
-        QAction* action = actionCollection()->action(CResMgr::displaywindows::commentaryWindow::syncWindow::actionName);
-        Q_ASSERT(action != 0);
-        action->setChecked(true);
-    }
+void CHTMLWriteWindow::applyProfileSettings(const QString & windowGroup) {
+    CPlainWriteWindow::applyProfileSettings(windowGroup);
+
+    QAction* action = actionCollection()->action(CResMgr::displaywindows::commentaryWindow::syncWindow::actionName);
+    Q_ASSERT(action != 0);
+    Q_ASSERT(windowGroup.endsWith('/'));
+    action->setChecked(btConfig().sessionValue<bool>(windowGroup + "syncWindowEnabled", false));
 }
 
 /** Is called when the current text was changed. */
 void CHTMLWriteWindow::textChanged() {
     QAction* action = actionCollection()->action(CResMgr::displaywindows::writeWindow::saveText::actionName);
     Q_ASSERT(action != 0);
-    action->setEnabled( ((CWriteDisplay*)displayWidget())->isModified() );
+    action->setEnabled(m_writeDisplay->isModified());
     action = actionCollection()->action(CResMgr::displaywindows::writeWindow::restoreText::actionName);
     Q_ASSERT(action != 0);
-    action->setEnabled( ((CWriteDisplay*)displayWidget())->isModified() );
+    action->setEnabled(m_writeDisplay->isModified());
 }
 
 /** Loads the original text from the module. */
 void CHTMLWriteWindow::restoreText() {
     lookupSwordKey(key());
-    ((CWriteDisplay*)displayWidget())->setModified(false);
+    m_writeDisplay->setModified(false);
     textChanged();
 }
 
@@ -113,7 +103,7 @@ bool CHTMLWriteWindow::syncAllowed() const {
 
 /** Saves the text for the current key. Directly writes the changed text into the module. */
 void CHTMLWriteWindow::saveCurrentText( const QString& /*key*/ ) {
-    QString t = ((CHTMLWriteDisplay*)displayWidget())->toHtml();
+    QString t = m_writeDisplay->toHtml();
     //since t is a complete HTML page at the moment, strip away headers and footers of a HTML page
     QRegExp re("(?:<html.*>.+<body.*>)", Qt::CaseInsensitive); //remove headers, case insensitive
     re.setMinimal(true);
@@ -125,11 +115,11 @@ void CHTMLWriteWindow::saveCurrentText( const QString& /*key*/ ) {
         const_cast<CSwordModuleInfo*>(modules().first())->write(this->key(), t);
         this->key()->setKey(oldKey);
 
-        ((CWriteDisplay*)displayWidget())->setModified(false);
+        m_writeDisplay->setModified(false);
         textChanged();
     }
     else {
-        util::showCritical( this, tr("Module not writable"),
+        message::showCritical( this, tr("Module not writable"),
                             QString::fromLatin1("<qt><b>%1</b><br />%2</qt>")
                             .arg( tr("Module is not writable.") )
                             .arg( tr("Either the module may not be edited, or you do not have write permission.") ) );
@@ -139,5 +129,5 @@ void CHTMLWriteWindow::saveCurrentText( const QString& /*key*/ ) {
 void CHTMLWriteWindow::setupMainWindowToolBars() {
     CPlainWriteWindow::setupMainWindowToolBars();
     //Formatting toolbar
-    ((CWriteDisplay*)displayWidget())->setupToolbar( btMainWindow()->formatToolBar(), actionCollection() );
+    m_writeDisplay->setupToolbar( btMainWindow()->formatToolBar(), actionCollection() );
 }
diff --git a/src/frontend/displaywindow/chtmlwritewindow.h b/src/frontend/displaywindow/chtmlwritewindow.h
index 8aec012..2d2eee6 100644
--- a/src/frontend/displaywindow/chtmlwritewindow.h
+++ b/src/frontend/displaywindow/chtmlwritewindow.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -13,9 +15,7 @@
 #include "frontend/displaywindow/cplainwritewindow.h"
 
 
-class QAction;
-
-/** 
+/**
  * The write window class which offers a WYSIWYG text editor for creating a personal commentary.
   *
   * Inherits CPlainWriteWindow.
@@ -25,17 +25,10 @@ class QAction;
 class CHTMLWriteWindow : public CPlainWriteWindow  {
         Q_OBJECT
     public:
-        CHTMLWriteWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent);
-
-        /**
-        * Store the settings of this window in the given CProfileWindow object.
-        */
-        virtual void storeProfileSettings( Profile::CProfileWindow* );
+        CHTMLWriteWindow(const QList<CSwordModuleInfo *> & modules, CMDIArea * parent);
 
-        /**
-        * Store the settings of this window in the given profile window.
-        */
-        virtual void applyProfileSettings( Profile::CProfileWindow* );
+        virtual void storeProfileSettings(const QString & windowGroup);
+        virtual void applyProfileSettings(const QString & windowGroup);
 
         /**
          * Returns true if the sync toolbar is enabled.
@@ -49,18 +42,12 @@ class CHTMLWriteWindow : public CPlainWriteWindow  {
         virtual void initView();
         virtual void initConnections();
         virtual void initToolbars();
-        virtual void initActions();
-
-        /**
-        * Insert the keyboard accelerators of this window into the given KAccel object.
-        */
-        static void insertKeyboardActions( BtActionCollection* const a );
 
-        virtual CWriteWindow::WriteWindowType writeWindowType() {
-            return CWriteWindow::HTMLWindow;
+        virtual WriteWindowType writeWindowType() const {
+            return HTMLWindow;
         }
-        /** 
-         * Called to add actions to mainWindow toolbars 
+        /**
+         * Called to add actions to mainWindow toolbars
          */
         virtual void setupMainWindowToolBars();
 
@@ -77,6 +64,7 @@ class CHTMLWriteWindow : public CPlainWriteWindow  {
         * Saves the text for the current key. Directly writes the changed text into the module.
         */
         virtual void saveCurrentText( const QString& );
+
 };
 
 #endif
diff --git a/src/frontend/displaywindow/clexiconreadwindow.cpp b/src/frontend/displaywindow/clexiconreadwindow.cpp
index 7d76293..3b76f38 100644
--- a/src/frontend/displaywindow/clexiconreadwindow.cpp
+++ b/src/frontend/displaywindow/clexiconreadwindow.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -17,13 +17,10 @@
 #include <QDebug>
 
 #include "bibletime.h"
-#include "backend/config/cbtconfig.h"
 #include "backend/keys/cswordldkey.h"
 #include "backend/keys/cswordkey.h"
 #include "frontend/cexportmanager.h"
 #include "frontend/display/bthtmlreaddisplay.h"
-#include "frontend/display/cdisplay.h"
-#include "frontend/display/creaddisplay.h"
 #include "frontend/displaywindow/btactioncollection.h"
 #include "frontend/displaywindow/bttoolbarpopupaction.h"
 #include "frontend/displaywindow/btdisplaysettingsbutton.h"
@@ -36,7 +33,7 @@
 #include "util/tool.h"
 
 
-CLexiconReadWindow::CLexiconReadWindow(QList<CSwordModuleInfo*> moduleList, CMDIArea* parent)
+CLexiconReadWindow::CLexiconReadWindow(const QList<CSwordModuleInfo *> & moduleList, CMDIArea * parent)
         : CReadWindow(moduleList, parent) {
     moduleList.first();
     setKey( CSwordKey::createInstance(moduleList.first()) );
@@ -158,7 +155,7 @@ void CLexiconReadWindow::initActions() {
     addAction(m_actions.print.entry);
 
     // init with the user defined settings
-    CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, ac);
+    ac->readShortcuts("Lexicon shortcuts");
 }
 
 /** No descriptions */
@@ -194,7 +191,7 @@ void CLexiconReadWindow::initConnections() {
 
 void CLexiconReadWindow::initView() {
     // Create display widget for this window
-    setDisplayWidget( CDisplay::createReadInstance(this) );
+    setDisplayWidget(new BtHtmlReadDisplay(this, this));
     setCentralWidget( displayWidget()->view() );
     setWindowIcon(util::tool::getIconForModule(modules().first()));
 
@@ -320,7 +317,7 @@ void CLexiconReadWindow::updatePopupMenu() {
 void CLexiconReadWindow::reload(CSwordBackend::SetupChangedReason reason) {
     CReadWindow::reload(reason);
 
-    CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, actionCollection());
+    actionCollection()->readShortcuts("Lexicon shortcuts");
 }
 
 /** No descriptions */
diff --git a/src/frontend/displaywindow/clexiconreadwindow.h b/src/frontend/displaywindow/clexiconreadwindow.h
index 36b47db..6233545 100644
--- a/src/frontend/displaywindow/clexiconreadwindow.h
+++ b/src/frontend/displaywindow/clexiconreadwindow.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -33,7 +35,7 @@ class QMenu;
 class CLexiconReadWindow : public CReadWindow  {
         Q_OBJECT
     public:
-        CLexiconReadWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent);
+        CLexiconReadWindow(const QList<CSwordModuleInfo *> & modules, CMDIArea * parent);
         virtual ~CLexiconReadWindow();
 
         /** Insert the keyboard accelerators of this window into the given actioncollection.*/
diff --git a/src/frontend/displaywindow/cplainwritewindow.cpp b/src/frontend/displaywindow/cplainwritewindow.cpp
index f0af601..f4b2d0b 100644
--- a/src/frontend/displaywindow/cplainwritewindow.cpp
+++ b/src/frontend/displaywindow/cplainwritewindow.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -14,30 +14,55 @@
 #include <QRegExp>
 #include <QToolBar>
 #include "bibletime.h"
-#include "backend/config/cbtconfig.h"
 #include "backend/keys/cswordkey.h"
-#include "frontend/display/cwritedisplay.h"
+#include "bibletimeapp.h"
+#include "frontend/display/cplainwritedisplay.h"
 #include "frontend/displaywindow/btactioncollection.h"
 #include "frontend/displaywindow/btmodulechooserbar.h"
 #include "frontend/keychooser/ckeychooser.h"
-#include "frontend/profile/cprofilewindow.h"
+#include "frontend/messagedialog.h"
+#include "util/btsignal.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
-#include "util/dialogutil.h"
+#include "util/geticon.h"
 
 
-using namespace Profile;
-
-CPlainWriteWindow::CPlainWriteWindow(QList<CSwordModuleInfo*> moduleList, CMDIArea* parent) :
-        CWriteWindow(moduleList, parent) {
+CPlainWriteWindow::CPlainWriteWindow(const QList<CSwordModuleInfo*> & moduleList, CMDIArea * parent)
+    : CDisplayWindow(moduleList, parent)
+    , m_writeDisplay(0)
+{
     setKey( CSwordKey::createInstance(moduleList.first()) );
 }
 
+void CPlainWriteWindow::setDisplayWidget(CDisplay * display) {
+    Q_ASSERT(dynamic_cast<CPlainWriteDisplay *>(display));
+    CDisplayWindow::setDisplayWidget(static_cast<CPlainWriteDisplay *>(display));
+    m_writeDisplay = static_cast<CPlainWriteDisplay *>(display);
+}
+
+void CPlainWriteWindow::lookupSwordKey(CSwordKey * newKey) {
+    //set the raw text to the display widget
+    if (!newKey)
+        return;
+
+    /*
+      Set passage of newKey to key() if they're different, otherwise we'd get
+      mixed up if we look up newkey which may have a different module set.
+    */
+    if (key() != newKey)
+        key()->setKey(newKey->key());
+
+    if (modules().count())
+        displayWidget()->setText(key()->rawText());
+
+    setWindowTitle(windowCaption());
+}
+
 /** Initialize the state of this widget. */
 void CPlainWriteWindow::initView() {
     //  qWarning("CPlainWriteWindow::initView()");
-    setDisplayWidget( CDisplay::createWriteInstance(this) );
-    setCentralWidget( displayWidget()->view() );
+    m_writeDisplay = new CPlainWriteDisplay(this, this);
+    setDisplayWidget(m_writeDisplay);
+    setCentralWidget(m_writeDisplay->view());
 
     // Create Navigation toolbar
     setMainToolBar( new QToolBar(this) );
@@ -49,8 +74,6 @@ void CPlainWriteWindow::initView() {
 }
 
 void CPlainWriteWindow::initToolbars() {
-    namespace DU = util::directory;
-
     // Navigation toolbar
     setKeyChooser( CKeyChooser::createInstance(modules(),
         history(), key(), mainToolBar()) );
@@ -94,30 +117,35 @@ void CPlainWriteWindow::setupMainWindowToolBars() {
 }
 
 void CPlainWriteWindow::initConnections() {
-    CWriteWindow::initConnections();
+    Q_ASSERT(keyChooser());
+    QObject::connect(key()->beforeChangedSignaller(), SIGNAL(signal()), this, SLOT(beforeKeyChange()));
     QObject::connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), this, SLOT(lookupSwordKey(CSwordKey*)));
     QObject::connect(displayWidget()->connectionsProxy(), SIGNAL(textChanged()), this, SLOT(textChanged()) );
 }
 
-void CPlainWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
-    CWriteWindow::storeProfileSettings(profileWindow);
-    QAction* action = actionCollection()->action(CResMgr::displaywindows::commentaryWindow::syncWindow::actionName);
-    Q_ASSERT(action != 0);
-    profileWindow->windowSettings = action->isChecked();
+void CPlainWriteWindow::storeProfileSettings(const QString & windowGroup) {
+    CDisplayWindow::storeProfileSettings(windowGroup);
+
+    QAction * action = actionCollection()->action(CResMgr::displaywindows::commentaryWindow::syncWindow::actionName);
+    Q_ASSERT(action);
+    Q_ASSERT(windowGroup.endsWith('/'));
+    btConfig().setSessionValue(windowGroup + "writeWindowType",
+                               static_cast<int>(writeWindowType()));
+    btConfig().setSessionValue(windowGroup + "syncWindowEnabled", action->isChecked());
 }
 
-void CPlainWriteWindow::applyProfileSettings( CProfileWindow* profileWindow ) {
-    CWriteWindow::applyProfileSettings(profileWindow);
-    if (profileWindow->windowSettings) {
-        QAction* action = actionCollection()->action(CResMgr::displaywindows::commentaryWindow::syncWindow::actionName);
-        Q_ASSERT(action != 0);
-        action->setChecked(true);
-    }
+void CPlainWriteWindow::applyProfileSettings(const QString & windowGroup) {
+    CDisplayWindow::applyProfileSettings(windowGroup);
+
+    QAction * action = actionCollection()->action(CResMgr::displaywindows::commentaryWindow::syncWindow::actionName);
+    Q_ASSERT(action != 0);
+    Q_ASSERT(windowGroup.endsWith('/'));
+    action->setChecked(btConfig().sessionValue<bool>(windowGroup + "syncWindowEnabled", false));
 }
 
 /** Saves the text for the current key. Directly writes the changed text into the module. */
 void CPlainWriteWindow::saveCurrentText( const QString& /*key*/ ) {
-    QString t = ((CWriteDisplay*)displayWidget())->plainText();
+    QString t = m_writeDisplay->plainText();
     //since t is a complete HTML page at the moment, strip away headers and footers of a HTML page
     QRegExp re("(?:<html.*>.+<body.*>)", Qt::CaseInsensitive); //remove headers, case insensitive
     re.setMinimal(true);
@@ -127,12 +155,12 @@ void CPlainWriteWindow::saveCurrentText( const QString& /*key*/ ) {
     const QString& oldKey = this->key()->key();
     if ( modules().first()->isWritable() ) {
         const_cast<CSwordModuleInfo*>(modules().first())->write(this->key(), t);
-        ((CWriteDisplay*)displayWidget())->setModified(false);
+        m_writeDisplay->setModified(false);
         this->key()->setKey(oldKey);
         textChanged();
     }
     else {
-        util::showCritical( this, tr("Module not writable"),
+        message::showCritical( this, tr("Module not writable"),
                             QString::fromLatin1("<qt><b>%1</b><br/>%2</qt>")
                             .arg( tr("Module is not writable.") )
                             .arg( tr("Either the module may not be edited, or "
@@ -143,7 +171,7 @@ void CPlainWriteWindow::saveCurrentText( const QString& /*key*/ ) {
 /** Loads the original text from the module. */
 void CPlainWriteWindow::restoreText() {
     lookupSwordKey(key());
-    ((CWriteDisplay*)displayWidget())->setModified(false);
+    m_writeDisplay->setModified(false);
     textChanged();
 }
 
@@ -151,17 +179,17 @@ void CPlainWriteWindow::restoreText() {
 void CPlainWriteWindow::textChanged() {
     QAction* action = actionCollection()->action(CResMgr::displaywindows::writeWindow::saveText::actionName);
     Q_ASSERT(action != 0);
-    action->setEnabled( ((CWriteDisplay*)displayWidget())->isModified() );
+    action->setEnabled(m_writeDisplay->isModified());
     action = actionCollection()->action(CResMgr::displaywindows::writeWindow::restoreText::actionName);
     Q_ASSERT(action != 0);
-    action->setEnabled( ((CWriteDisplay*)displayWidget())->isModified() );
+    action->setEnabled(m_writeDisplay->isModified());
 }
 
 /** Deletes the module entry and clears the edit widget, */
 void CPlainWriteWindow::deleteEntry() {
     const_cast<CSwordModuleInfo*>(modules().first())->deleteEntry(key());
     lookupSwordKey( key() );
-    ((CWriteDisplay*)displayWidget())->setModified(false);
+    m_writeDisplay->setModified(false);
 }
 
 /** Setups the popup menu of this display widget. */
@@ -202,11 +230,8 @@ void CPlainWriteWindow::initActions() {
 }
 
 void CPlainWriteWindow::insertKeyboardActions( BtActionCollection* const a) {
-
-    namespace DU = util::directory;
-
     QAction* action = new QAction(
-        DU::getIcon(CResMgr::displaywindows::commentaryWindow::syncWindow::icon),
+        util::getIcon(CResMgr::displaywindows::commentaryWindow::syncWindow::icon),
         tr("Sync with active Bible"),
         a
     );
@@ -216,7 +241,7 @@ void CPlainWriteWindow::insertKeyboardActions( BtActionCollection* const a) {
     a->addAction(CResMgr::displaywindows::commentaryWindow::syncWindow::actionName, action);
 
     action = new QAction(
-        DU::getIcon(CResMgr::displaywindows::writeWindow::saveText::icon),
+        util::getIcon(CResMgr::displaywindows::writeWindow::saveText::icon),
         tr("Save text"),
         a
     );
@@ -225,7 +250,7 @@ void CPlainWriteWindow::insertKeyboardActions( BtActionCollection* const a) {
     a->addAction(CResMgr::displaywindows::writeWindow::saveText::actionName, action);
 
     action = new QAction(
-        DU::getIcon(CResMgr::displaywindows::writeWindow::deleteEntry::icon),
+        util::getIcon(CResMgr::displaywindows::writeWindow::deleteEntry::icon),
         tr("Delete current entry"),
         a
     );
@@ -234,7 +259,7 @@ void CPlainWriteWindow::insertKeyboardActions( BtActionCollection* const a) {
     a->addAction(CResMgr::displaywindows::writeWindow::deleteEntry::actionName, action);
 
     action = new QAction(
-        DU::getIcon(CResMgr::displaywindows::writeWindow::restoreText::icon),
+        util::getIcon(CResMgr::displaywindows::writeWindow::restoreText::icon),
         tr("Restore original text"),
         a
     );
@@ -242,3 +267,55 @@ void CPlainWriteWindow::insertKeyboardActions( BtActionCollection* const a) {
     action->setToolTip( tr("Restore original text, new text will be lost") );
     a->addAction(CResMgr::displaywindows::writeWindow::restoreText::actionName, action);
 }
+
+void CPlainWriteWindow::saveCurrentText() {
+    if (key())
+        saveCurrentText(key()->key());
+}
+
+
+bool CPlainWriteWindow::queryClose() {
+    //save the text if it has changed
+    if (m_writeDisplay->isModified()) {
+        switch (message::showQuestion( this, tr("Save Text?"), tr("Save text before closing?"), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, QMessageBox::Yes) ) {
+            case QMessageBox::Yes: //save and close
+                saveCurrentText();
+                m_writeDisplay->setModified( false );
+                return true;
+            case QMessageBox::No: //don't save and close
+                return true;
+            default: // cancel, don't close
+                return false;
+        }
+    }
+    return true;
+}
+
+void CPlainWriteWindow::beforeKeyChange() {
+    Q_ASSERT(displayWidget());
+    Q_ASSERT(keyChooser());
+    if (!isReady())
+        return;
+
+    // Get current key string for this window
+    QString thisWindowsKey;
+    CSwordKey* oldKey = key();
+    if (oldKey == 0)
+        return;
+    thisWindowsKey = oldKey->key();
+
+    //If the text changed and we'd do a lookup ask the user if the text should be saved
+    if (modules().first() && m_writeDisplay->isModified()) {
+
+        switch (message::showQuestion( this, tr("Save Text?"), tr("Save changed text?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) ) {
+            case QMessageBox::Yes: { //save the changes
+                saveCurrentText( thisWindowsKey );
+                break;
+            }
+            default: {// set modified to false so it won't ask again
+                m_writeDisplay->setModified(false);
+                break;
+            }
+        }
+    }
+}
diff --git a/src/frontend/displaywindow/cplainwritewindow.h b/src/frontend/displaywindow/cplainwritewindow.h
index 732ff8a..cf11a46 100644
--- a/src/frontend/displaywindow/cplainwritewindow.h
+++ b/src/frontend/displaywindow/cplainwritewindow.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -10,12 +12,11 @@
 #ifndef CPLAINWRITEWINDOW_H
 #define CPLAINWRITEWINDOW_H
 
-#include "frontend/displaywindow/cwritewindow.h"
+#include "frontend/displaywindow/cdisplaywindow.h"
 
 
 class BtActionCollection;
-class QAction;
-class QString;
+class CPlainWriteDisplay;
 
 /** The write window class which offers a plain text editor for creating a personal commentary.
   *
@@ -25,19 +26,24 @@ class QString;
   *
   * @author The BibleTime team
   */
-class CPlainWriteWindow : public CWriteWindow  {
+class CPlainWriteWindow : public CDisplayWindow {
         Q_OBJECT
     public:
-        CPlainWriteWindow( QList<CSwordModuleInfo*> modules, CMDIArea* parent);
+
+        enum WriteWindowType {
+            HTMLWindow = 1,
+            PlainTextWindow = 2
+        };
+
+        CPlainWriteWindow(const QList<CSwordModuleInfo *> & modules, CMDIArea * parent);
 
         /**
-        * Store the settings of this window in the given CProfileWindow object.
-        */
-        virtual void storeProfileSettings( Profile::CProfileWindow* profileWindow );
-        /**
-        * Store the settings of this window in the given profile window.
+        * Set the displayWidget which is a subclass of QWebPage.
         */
-        virtual void applyProfileSettings( Profile::CProfileWindow* profileWindow );
+        void setDisplayWidget( CDisplay* display );
+
+        virtual void storeProfileSettings(const QString & windowGroup);
+        virtual void applyProfileSettings(const QString & windowGroup);
 
         /**
          * Setups the popup menu of this display widget.
@@ -49,6 +55,13 @@ class CPlainWriteWindow : public CWriteWindow  {
          */
         virtual bool syncAllowed() const;
 
+    public slots:
+
+        /**
+          Look up the given key and display the text. In our case we offer to edit the text.
+        */
+        virtual void lookupSwordKey(CSwordKey * key);
+
     protected: // Protected methods
         /**
         * Initialize the state of this widget.
@@ -56,9 +69,9 @@ class CPlainWriteWindow : public CWriteWindow  {
         virtual void initView();
         virtual void initConnections();
         virtual void initToolbars();
-        virtual CWriteWindow::WriteWindowType writeWindowType() {
-            return CWriteWindow::PlainTextWindow;
-        };
+        virtual WriteWindowType writeWindowType() const {
+            return PlainTextWindow;
+        }
 
         /** Called to add actions to mainWindow toolbars */
         virtual void setupMainWindowToolBars();
@@ -71,7 +84,13 @@ class CPlainWriteWindow : public CWriteWindow  {
         */
         static void insertKeyboardActions( BtActionCollection* const a );
 
+        /** \returns whether the window may be closed.*/
+        virtual bool queryClose();
+
     protected slots: // Protected slots
+
+        void saveCurrentText();
+
         /**
         * Saves the text for the current key. Directly writes the changed text into the module.
         */
@@ -88,6 +107,13 @@ class CPlainWriteWindow : public CWriteWindow  {
         * Deletes the module entry and clears the edit widget.
         */
         virtual void deleteEntry();
+
+        virtual void beforeKeyChange();
+
+    protected: /* Fields: */
+
+        CPlainWriteDisplay * m_writeDisplay;
+
 };
 
 #endif
diff --git a/src/frontend/displaywindow/creadwindow.cpp b/src/frontend/displaywindow/creadwindow.cpp
index 7f11dca..0d8f2d9 100644
--- a/src/frontend/displaywindow/creadwindow.cpp
+++ b/src/frontend/displaywindow/creadwindow.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -19,12 +19,9 @@
 #include "frontend/cmdiarea.h"
 #include "frontend/display/bthtmlreaddisplay.h"
 #include "frontend/displaywindow/btactioncollection.h"
-#include "frontend/profile/cprofilewindow.h"
 #include "frontend/searchdialog/csearchdialog.h"
 
 
-using namespace Profile;
-
 CReadWindow::CReadWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent)
         : CDisplayWindow(modules, parent),
         m_readDisplayWidget(0) {
@@ -108,57 +105,6 @@ void CReadWindow::slotMoveToAnchor() {
     ((CReadDisplay*)displayWidget())->moveToAnchor( Rendering::CDisplayRendering::keyToHTMLAnchor(key()->key()) );
 }
 
-/** Store the settings of this window in the given CProfileWindow object. */
-void CReadWindow::storeProfileSettings(CProfileWindow * const settings) {
-    QRect rect;
-    rect.setX(parentWidget()->x());
-    rect.setY(parentWidget()->y());
-    rect.setWidth(parentWidget()->width());
-    rect.setHeight(parentWidget()->height());
-    settings->windowGeometry = rect;
-
-    // settings->setScrollbarPositions( m_htmlWidget->view()->horizontalScrollBar()->value(), m_htmlWidget->view()->verticalScrollBar()->value() );
-    settings->type = modules().first()->type();
-    settings->maximized = (isMaximized() || parentWidget()->isMaximized());
-    settings->hasFocus = (this == dynamic_cast<CReadWindow*>(mdi()->activeSubWindow()) ); //set property to true if this window is the active one.
-
-    if (key()) {
-        sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key());
-        QString oldLang;
-        if (vk) {
-            oldLang = QString(vk->getLocale());
-            vk->setLocale("en"); //save english locale names as default!
-        }
-        settings->key = key()->key();
-        if (vk) {
-            vk->setLocale(oldLang.toLatin1());
-        }
-    }
-
-    QStringList mods;
-    Q_FOREACH (const CSwordModuleInfo *module, modules()) {
-        mods.append(module->name());
-    }
-    settings->modules = mods;
-}
-
-void CReadWindow::applyProfileSettings(CProfileWindow * const settings) {
-    //  parentWidget()->setUpdatesEnabled(false);
-    setUpdatesEnabled(false);
-
-    if (settings->maximized) { //maximize this window
-        // Use parentWidget() to call showMaximized. Otherwise we'd get lot's of X11 errors
-        parentWidget()->showMaximized();
-    }
-    else {
-        const QRect &rect = settings->windowGeometry;
-        parentWidget()->resize(rect.width(), rect.height());
-        parentWidget()->move(rect.x(), rect.y());
-    }
-
-    setUpdatesEnabled(true);
-}
-
 void CReadWindow::insertKeyboardActions( BtActionCollection* const ) {}
 
 /** No descriptions */
diff --git a/src/frontend/displaywindow/creadwindow.h b/src/frontend/displaywindow/creadwindow.h
index d00d4f0..2446e1e 100644
--- a/src/frontend/displaywindow/creadwindow.h
+++ b/src/frontend/displaywindow/creadwindow.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -19,15 +21,10 @@
 class BtActionCollection;
 class QResizeEvent;
 
-/** The base class for all read-only display windows.
-  *
-  * Inherits CDisplayWindow.
-  *
-  * Inherited by CLexiconReadWindow
-  *
-  * @author The BibleTime team
-  */
-class CReadWindow : public CDisplayWindow  {
+/**
+  \brief The base class for all read-only display windows.
+*/
+class CReadWindow: public CDisplayWindow {
         Q_OBJECT
     public:
 
@@ -36,15 +33,6 @@ class CReadWindow : public CDisplayWindow  {
 
         CReadWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent);
 
-        /**
-        * Store the settings of this window in the given CProfileWindow object.
-        */
-        virtual void storeProfileSettings(Profile::CProfileWindow * const settings);
-        /**
-        * Load the settings the given CProfileWindow object into this window.
-        */
-        virtual void applyProfileSettings(Profile::CProfileWindow * const settings);
-
     protected:
         /**
         * Sets the display widget of this display window.
@@ -72,7 +60,7 @@ class CReadWindow : public CDisplayWindow  {
         * Update the status of the popup menu entries.
         */
         virtual void copyDisplayedText();
-        /** 
+        /**
          * Open the search dialog with the strong info of the last clicked word.
         */
         void openSearchStrongsDialog();
diff --git a/src/frontend/displaywindow/cwritewindow.cpp b/src/frontend/displaywindow/cwritewindow.cpp
deleted file mode 100644
index fbcf8de..0000000
--- a/src/frontend/displaywindow/cwritewindow.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-
-#include "frontend/displaywindow/cwritewindow.h"
-
-#include "backend/drivers/cswordmoduleinfo.h"
-#include "backend/keys/cswordversekey.h"
-#include "frontend/display/cwritedisplay.h"
-#include "frontend/keychooser/ckeychooser.h"
-#include "frontend/profile/cprofilewindow.h"
-#include "util/dialogutil.h"
-#include "util/btsignal.h"
-
-using namespace Profile;
-
-CWriteWindow::CWriteWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent)
-        : CDisplayWindow(modules, parent), m_writeDisplay(0) {}
-
-void CWriteWindow::insertKeyboardActions( BtActionCollection* const ) {}
-
-void CWriteWindow::initConnections() {
-    Q_ASSERT(keyChooser());
-    QObject::connect(key()->signaler(), SIGNAL(beforeChanged()), this, SLOT(beforeKeyChange()));
-}
-
-void CWriteWindow::initActions() {}
-
-
-void CWriteWindow::storeProfileSettings(CProfileWindow * const settings) {
-
-    settings->writeWindowType = writeWindowType();
-    settings->windowGeometry.setRect(parentWidget()->x(),
-                                     parentWidget()->y(),
-                                     parentWidget()->width(),
-                                     parentWidget()->height());
-
-    // settings->setScrollbarPositions( m_htmlWidget->view()->horizontalScrollBar()->value(), m_htmlWidget->view()->verticalScrollBar()->value() );
-    settings->type = modules().first()->type();
-    settings->maximized = isMaximized() || parentWidget()->isMaximized();
-
-    if (key()) {
-        sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key());
-        QString oldLang;
-        if (vk) {
-            oldLang = QString::fromLatin1(vk->getLocale());
-            vk->setLocale("en"); //save english locale names as default!
-        }
-        settings->key = key()->key();
-        if (vk) {
-            vk->setLocale(oldLang.toLatin1());
-        }
-    }
-
-    QStringList mods;
-    Q_FOREACH(const CSwordModuleInfo *m, modules()) {
-        mods.append(m->name());
-    }
-    settings->modules = mods;
-}
-
-void CWriteWindow::applyProfileSettings(CProfileWindow * const settings) {
-    setUpdatesEnabled(false);
-
-    if (settings->maximized) {
-        parentWidget()->showMaximized();
-    }
-    else {
-        const QRect &rect = settings->windowGeometry;
-        parentWidget()->resize(rect.width(), rect.height());
-        parentWidget()->move(rect.x(), rect.y());
-        //setGeometry( settings->geometry() );
-    }
-    // displayWidget()->view()->horizontalScrollBar()->setValue( settings->scrollbarPositions().horizontal );
-    // m_htmlWidget->view()->verticalScrollBar()->setValue( settings->scrollbarPositions().vertical );
-
-    setUpdatesEnabled(true);
-}
-
-void CWriteWindow::setDisplayWidget( CDisplay* display ) {
-    Q_ASSERT(dynamic_cast<CWriteDisplay*>(display));
-    CDisplayWindow::setDisplayWidget((CWriteDisplay*)display);
-    m_writeDisplay = (CWriteDisplay*)display;
-}
-
-void CWriteWindow::lookupSwordKey( CSwordKey* newKey ) {
-    //set the raw text to the display widget
-    if (!newKey)
-        return;
-
-    if (key() != newKey) { //set passage of newKey to key() if they're different, otherwise we'd get mixed up if we look up newkey which may have a different module set
-        key()->setKey(newKey->key());
-    }
-
-    if ( modules().count() ) {
-        displayWidget()->setText( key()->rawText() );
-    }
-    setWindowTitle(windowCaption());
-}
-
-bool CWriteWindow::queryClose() {
-    //save the text if it has changed
-    if (m_writeDisplay->isModified()) {
-        switch (util::showQuestion( this, tr("Save Text?"), tr("Save text before closing?"), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, QMessageBox::Yes) ) {
-            case QMessageBox::Yes: //save and close
-                saveCurrentText();
-                m_writeDisplay->setModified( false );
-                return true;
-            case QMessageBox::No: //don't save and close
-                return true;
-            default: // cancel, don't close
-                return false;
-        }
-    }
-    return true;
-}
-
-void CWriteWindow::beforeKeyChange() {
-    Q_ASSERT(displayWidget());
-    Q_ASSERT(keyChooser());
-    if (!isReady())
-        return;
-
-    // Get current key string for this window
-    QString thisWindowsKey;
-    CSwordKey* oldKey = key();
-    if (oldKey == 0)
-        return;
-    thisWindowsKey = oldKey->key();
-    
-    //If the text changed and we'd do a lookup ask the user if the text should be saved
-    if (modules().first() && ((CWriteDisplay*)displayWidget())->isModified()) {
-
-        switch (util::showQuestion( this, tr("Save Text?"), tr("Save changed text?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) ) {
-            case QMessageBox::Yes: { //save the changes
-                saveCurrentText( thisWindowsKey );
-                break;
-            }
-            default: {// set modified to false so it won't ask again
-                ((CWriteDisplay*)displayWidget())->setModified(false);
-                break;
-            }
-        }
-    }
-}
-
-void CWriteWindow::saveCurrentText() {
-    if (key()) {
-        saveCurrentText(key()->key());
-    }
-}
-
diff --git a/src/frontend/displaywindow/cwritewindow.h b/src/frontend/displaywindow/cwritewindow.h
deleted file mode 100644
index 3ff9d06..0000000
--- a/src/frontend/displaywindow/cwritewindow.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#ifndef CWRITEWINDOW_H
-#define CWRITEWINDOW_H
-
-#include "frontend/displaywindow/cdisplaywindow.h"
-
-
-class BtActionCollection;
-class CWriteDisplay;
-class QString;
-
-/** The base class for all write-only display windows.
-  *
-  * Inherits CDisplayWindow.
-  *
-  * Inherited by CPlainWriteWindow.
-  *
-  *@author The BibleTime team
-  */
-class CWriteWindow : public CDisplayWindow  {
-        Q_OBJECT
-    public:
-        enum WriteWindowType {
-            HTMLWindow = 1,
-            PlainTextWindow = 2
-        };
-
-        /** Insert the keyboard accelerators of this window into the given actioncollection.*/
-        static void insertKeyboardActions( BtActionCollection* const a );
-
-        CWriteWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent);
-        /**
-        * Store the settings of this window in the given CProfileWindow object.
-        */
-        virtual void storeProfileSettings(Profile::CProfileWindow * const settings);
-        /**
-        * Load the settings the given CProfileWindow object into this window.
-        */
-        virtual void applyProfileSettings(Profile::CProfileWindow * const settings);
-
-        /** Initializes the signal / slot connections of this display window.*/
-        virtual void initConnections();
-
-        /** Initializes the internel keyboard actions.*/
-        virtual void initActions();
-
-    public slots:
-        /**
-        * Look up the given key and display the text. In our case we offer to edit the text.
-        */
-        virtual void lookupSwordKey( CSwordKey* key );
-
-
-    protected: // Protected methods
-        /**
-        * Set the displayWidget which is a subclass of QWebPage.
-        */
-        void setDisplayWidget( CDisplay* display );
-
-        /** Returns the type of the write window.*/
-        virtual CWriteWindow::WriteWindowType writeWindowType() = 0;
-
-        /** Returns true if the window may be closed.*/
-        virtual bool queryClose();
-
-        /** Saves the text for the current key. Directly writes the changed text into the module. */
-        virtual void saveCurrentText( const QString& key ) = 0;
-
-        /** Called to add actions to mainWindow toolbars */
-        virtual void setupMainWindowToolBars() = 0;
-
-    protected slots:
-        /** Save text to the module
-        */
-        void saveCurrentText();
-        /**
-         */
-        virtual void beforeKeyChange();
-
-    private:
-        CWriteDisplay* m_writeDisplay;
-};
-
-#endif
diff --git a/src/frontend/keychooser/bthistory.cpp b/src/frontend/keychooser/bthistory.cpp
index 93651a5..22c9e69 100644
--- a/src/frontend/keychooser/bthistory.cpp
+++ b/src/frontend/keychooser/bthistory.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -44,8 +44,7 @@ void BTHistory::move(QAction* historyItem) {
     //find the action in the list
     m_index = m_historyList.indexOf(historyItem);
     //move to the selected item in the list, it will be the current item
-    QString newKey = m_historyList.at(m_index)->text();
-    emit historyMoved(newKey); // signal to "outsiders"; key has been changed
+    emit historyMoved(m_historyList.at(m_index)->text()); // signal to "outsiders"; key has been changed
     sendChangedSignal();
 
     m_inHistoryFunction = false;
diff --git a/src/frontend/keychooser/bthistory.h b/src/frontend/keychooser/bthistory.h
index a92a25e..6c65aca 100644
--- a/src/frontend/keychooser/bthistory.h
+++ b/src/frontend/keychooser/bthistory.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -60,7 +62,7 @@ class BTHistory: public QObject {
         /**
         * Signal will be sent when the current point in history has moved
         */
-        void historyMoved(QString& newKey);
+        void historyMoved(QString newKey);
 
     private:
 
diff --git a/src/frontend/keychooser/cbookkeychooser.cpp b/src/frontend/keychooser/cbookkeychooser.cpp
index 1c7fccb..9255980 100644
--- a/src/frontend/keychooser/cbookkeychooser.cpp
+++ b/src/frontend/keychooser/cbookkeychooser.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -13,78 +13,76 @@
 #include <QHBoxLayout>
 #include <QList>
 #include <QWidget>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/drivers/cswordbookmoduleinfo.h"
 #include "backend/keys/cswordtreekey.h"
 #include "frontend/keychooser/bthistory.h"
 
 
-QMap<QObject*, int> boxes;
+#define ID_PROPERTY_NAME "CBookKeyChooser_ID"
 
-CBookKeyChooser::CBookKeyChooser(const QList<const CSwordModuleInfo*> &modules,
-                                 BTHistory *historyPtr, CSwordKey *key,
-                                 QWidget *parent)
-    : CKeyChooser(modules, historyPtr, key, parent), m_layout(0)
+CBookKeyChooser::CBookKeyChooser(const QList<const CSwordModuleInfo *> & modules,
+                                 BTHistory * historyPtr,
+                                 CSwordKey * key,
+                                 QWidget * parent)
+    : CKeyChooser(modules, historyPtr, parent)
+    , m_layout(0)
 {
-
     setModules(modules, false);
-    m_key = dynamic_cast<CSwordTreeKey*>(key);
-    if (!m_modules.count()) {
+    m_key = dynamic_cast<CSwordTreeKey * >(key);
+    if (!m_modules.count())
         m_key = 0;
-    }
 
     setModules(modules, true);
     setKey(key);
 
     adjustFont();
-    connect(this, SIGNAL(keyChanged(CSwordKey*)), history(), SLOT(add(CSwordKey*)) );
+    connect(this,      SIGNAL(keyChanged(CSwordKey *)),
+            history(), SLOT(add(CSwordKey *)));
 }
 
-void CBookKeyChooser::setKey(CSwordKey* newKey) {
+void CBookKeyChooser::setKey(CSwordKey * newKey) {
     setKey(newKey, true);
 }
 
 /** Sets a new key to this keychooser */
-void CBookKeyChooser::setKey(CSwordKey* newKey, const bool emitSignal) {
-    if (m_key != newKey) { //set the internal key to the new one
+void CBookKeyChooser::setKey(CSwordKey * newKey, const bool emitSignal) {
+    if (m_key != newKey) // Set the internal key to the new one
         m_key = dynamic_cast<CSwordTreeKey*>(newKey);
-    }
 
-    QString oldKey = m_key->key(); //string backup of key
+    QString oldKey(m_key->key());
 
-    if (oldKey.isEmpty()) { //don't set keys equal to "/", always use a key which may have content
+    if (oldKey.isEmpty()) { // Don't set keys equal to "/", always use a key which may have content
         m_key->firstChild();
         oldKey = m_key->key();
     }
 
-    const int oldOffset = m_key->getOffset(); //backup key position
+    const int oldOffset = m_key->getOffset();
 
-    QStringList siblings; //split up key
-    if (m_key && !oldKey.isEmpty()) {
+    QStringList siblings; // Split up key
+    if (m_key && !oldKey.isEmpty())
         siblings = oldKey.split('/', QString::SkipEmptyParts);
-    }
 
     int depth = 0;
-    int index = 0;
 
     m_key->root(); //start iteration at root node
 
-    while ( m_key->firstChild() && (depth < siblings.count()) ) {
+    while (m_key->firstChild() && (depth < siblings.count())) {
         QString key = m_key->key();
-        index = (depth == 0) ? -1 : 0;
+        int index = (depth == 0) ? -1 : 0;
 
         bool found = false;
 
         do { //look for matching sibling
             ++index;
             found = (m_key->getLocalNameUnicode() == siblings[depth]);
-        }
-        while (!found && m_key->nextSibling());
+        } while (!found && m_key->nextSibling());
 
-        if (found)
+        if (found) {
             key = m_key->key(); //found: change key to this level
-        else
+        } else {
             m_key->setKey(key); //not found: restore old key
+        }
 
         setupCombo(key, depth, index);
 
@@ -98,41 +96,41 @@ void CBookKeyChooser::setKey(CSwordKey* newKey, const bool emitSignal) {
     }
 
     //clear the combos which were not filled
-    for (; depth < m_modules.first()->depth(); ++depth)  {
-        CKeyChooserWidget* chooser = m_chooserWidgets.at(depth);
-        if (chooser) chooser->reset(0, 0, false);
+    for (; depth < m_modules.first()->depth(); ++depth) {
+        CKeyChooserWidget * const chooser = m_chooserWidgets.at(depth);
+        if (chooser)
+            chooser->reset(0, 0, false);
     }
 
     if (oldKey.isEmpty()) {
         m_key->root();
-    }
-    else {
+    } else {
         //m_key->key(oldKey);
         m_key->setOffset(oldOffset);
     }
 
-    if (emitSignal) emit keyChanged(m_key);
+    if (emitSignal)
+        emit keyChanged(m_key);
 }
 
 /** Returns the key of this kechooser. */
-CSwordKey* CBookKeyChooser::key() {
+CSwordKey * CBookKeyChooser::key() {
     return m_key;
 }
 
 /** Sets another module to this keychooser */
-void CBookKeyChooser::setModules(const QList<const CSwordModuleInfo*> &modules,
+void CBookKeyChooser::setModules(const QList<const CSwordModuleInfo *> & modules,
                                  bool refresh)
 {
     typedef CSwordBookModuleInfo CSBMI;
     m_modules.clear();
 
     //   for (modules.first(); modules.current(); modules.next()) {
-    Q_FOREACH(const CSwordModuleInfo *m, modules) {
+    Q_FOREACH(const CSwordModuleInfo * m, modules) {
         if (m->type() == CSwordModuleInfo::GenericBook ) {
-            const CSBMI *book = dynamic_cast<const CSBMI*>(m);
-            if (book != 0) {
+            const CSBMI * const book = dynamic_cast<const CSBMI *>(m);
+            if (book != 0)
                 m_modules.append(book);
-            }
         }
     }
 
@@ -149,45 +147,43 @@ void CBookKeyChooser::setModules(const QList<const CSwordModuleInfo*> &modules,
 
         for (int i = 0; i < m_modules.first()->depth(); ++i) {
             // Create an empty keychooser, don't handle next/prev signals
-            CKeyChooserWidget* w = new CKeyChooserWidget(0, false, this);
-            m_chooserWidgets.append( w );
+            CKeyChooserWidget * const w = new CKeyChooserWidget(0, this);
+            m_chooserWidgets.append(w);
 
             //don't allow a too high width, try to keep as narrow as possible
             //to aid users with smaller screen resolutions
             int totalWidth = 200; //only 1 level
             if (m_modules.first()->depth() > 1) {
-                if (m_modules.first()->depth() > 3)
+                if (m_modules.first()->depth() > 3) {
                     totalWidth = 400; //4+ levels
-                else
+                } else {
                     totalWidth = 300; //2-3 levels
+                }
             }
 
             int maxWidth = (int) ((float) totalWidth / (float) m_modules.first()->depth());
 
-            w->comboBox()->setMaximumWidth(maxWidth);
-            w->comboBox()->setCurrentIndex(0);
+            w->comboBox().setMaximumWidth(maxWidth);
+            w->comboBox().setCurrentIndex(0);
 
-            connect(w, SIGNAL(changed(int)), SLOT(keyChooserChanged(int)));
+            connect(w, SIGNAL(changed(int)),  SLOT(keyChooserChanged(int)));
             connect(w, SIGNAL(focusOut(int)), SLOT(keyChooserChanged(int)));
 
             m_layout->addWidget(w);
-            boxes[w] = i;
-
+            w->setProperty(ID_PROPERTY_NAME, i+1);
             w->show();
         }
 
         //set the tab order of the key chooser widgets
 
-        CKeyChooserWidget* chooser = 0;
-        CKeyChooserWidget* chooser_prev = 0;
+        CKeyChooserWidget * chooser = 0;
+        CKeyChooserWidget * chooser_prev = 0;
         const int count = m_chooserWidgets.count();
-        for (int i = 0; i < count; ++i) {
+        for (int i = 0; i < count; i++) {
             chooser = m_chooserWidgets.at(i);
             Q_ASSERT(chooser);
-
-            if (chooser && chooser_prev) {
+            if (chooser_prev)
                 QWidget::setTabOrder(chooser_prev, chooser);
-            }
 
             chooser_prev = chooser;
         }
@@ -201,21 +197,22 @@ void CBookKeyChooser::setModules(const QList<const CSwordModuleInfo*> &modules,
 /** No descriptions */
 void CBookKeyChooser::adjustFont() {
     //Make sure the entries are displayed correctly.
-    QListIterator<CKeyChooserWidget*> it(m_chooserWidgets);
-    while (it.hasNext()) {
-        it.next()->comboBox()->setFont( CBTConfig::get( m_modules.first()->language() ).second );
-    }
+    QListIterator<CKeyChooserWidget *> it(m_chooserWidgets);
+    while (it.hasNext())
+        it.next()->comboBox().setFont(btConfig().getFontForLanguage(*m_modules.first()->language()).second);
 }
 
 /** Refreshes the content. */
 void CBookKeyChooser::refreshContent() {
-    if (m_key) {
-        updateKey( m_key ); //refresh with current key
-    }
+    if (m_key)
+        updateKey(m_key); // Refresh with current key
 }
 
-void CBookKeyChooser::setupCombo(const QString key, const int depth, const int currentItem) {
-    CKeyChooserWidget* chooserWidget = m_chooserWidgets.at(depth);
+void CBookKeyChooser::setupCombo(const QString & key,
+                                 const int depth,
+                                 const int currentItem)
+{
+    CKeyChooserWidget * const chooserWidget = m_chooserWidgets.at(depth);
 
     CSwordTreeKey tmpKey(*m_key);
     tmpKey.setKey(key);
@@ -223,32 +220,32 @@ void CBookKeyChooser::setupCombo(const QString key, const int depth, const int c
     tmpKey.firstChild();
 
     QStringList items;
-    if (depth > 0) items << QString::null; //insert an empty item at the top
+    if (depth > 0)
+        items.append(QString::null); // Insert an empty item at the top
 
     do {
-        items << tmpKey.getLocalNameUnicode();
-    }
-    while (tmpKey.nextSibling());
+        items.append(tmpKey.getLocalNameUnicode());
+    } while (tmpKey.nextSibling());
 
-    if (chooserWidget) chooserWidget->reset(items, currentItem, false);
+    if (chooserWidget)
+        chooserWidget->reset(items, currentItem, false);
 }
 
 /** A keychooser changed. Update and emit a signal if necessary. */
-void CBookKeyChooser::keyChooserChanged(int /*newIndex*/) {
-    const int activeID = boxes[const_cast<QObject*>(sender())]; //no so good code!
-
+void CBookKeyChooser::keyChooserChanged(int newIndex) {
+    Q_UNUSED(newIndex);
     QStringList items;
-    CKeyChooserWidget* chooser;
 
-    for (int i = 0; i < m_chooserWidgets.count(); ++i) {
-        chooser = m_chooserWidgets.at(i);
-        const QString currentText = (chooser && chooser->comboBox()) ? chooser->comboBox()->currentText() : QString::null;
-
-        if (currentText.isEmpty() || i > activeID) {
+    const int max = std::min(m_chooserWidgets.count(),
+                             sender()->property(ID_PROPERTY_NAME).toInt());
+    for (int i = 0; i < max; i++) {
+        CKeyChooserWidget * const chooser = m_chooserWidgets.at(i);
+        Q_ASSERT(chooser);
+        const QString currentText = chooser->comboBox().currentText();
+        if (currentText.isEmpty())
             break;
-        }
 
-        items << currentText;
+        items.append(currentText);
     }
 
     QString newKey("/");
@@ -259,11 +256,11 @@ void CBookKeyChooser::keyChooserChanged(int /*newIndex*/) {
 }
 
 /** Updates the keychoosers for the given key but emit no signal. */
-void CBookKeyChooser::updateKey(CSwordKey* key) {
+void CBookKeyChooser::updateKey(CSwordKey * key) {
     setKey(key, false);
 }
 
-void CBookKeyChooser::setKey(QString& newKey) {
+void CBookKeyChooser::setKey(const QString & newKey) {
     m_key->setKey(newKey);
     setKey(m_key);
 }
diff --git a/src/frontend/keychooser/cbookkeychooser.h b/src/frontend/keychooser/cbookkeychooser.h
index 3b32d48..c01e0e9 100644
--- a/src/frontend/keychooser/cbookkeychooser.h
+++ b/src/frontend/keychooser/cbookkeychooser.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -20,71 +22,79 @@ class CSwordBookModuleInfo;
 class CSwordKey;
 class CSwordTreeKey;
 
-namespace sword {
-class TreeKeyIdx;
-}
-
-/** The keychooser implementation for books.
-  * @author The BibleTime team
-  */
-class CBookKeyChooser : public CKeyChooser {
-        Q_OBJECT
-    public:
-        CBookKeyChooser(const QList<const CSwordModuleInfo*> &modules,
-                        BTHistory *history, CSwordKey *key = 0,
-                        QWidget *parent = 0);
-
-        /**
-          Reimplemented from CKeyChooser.
-        */
-        virtual void refreshContent();
-
-        /**
-        * Sets another module to this keychooser
-        */
-        virtual void setModules(const QList<const CSwordModuleInfo*> &modules,
-                                bool refresh = false);
-        /**
-        * Returns the key of this keychooser
-        */
-        virtual CSwordKey*  key();
-        /**
-        * Sets a new key to this keychooser
-        */
-        virtual void setKey(CSwordKey*);
-        /**
-        * Sets a new key to this keychooser
-        */
-        void setKey(CSwordKey*, const bool emitSignal);
-
-
-    public slots: // Public slots
-        /**
-        * Updates the keychoosers for the given key but emit no signal.
-        */
-        void updateKey(CSwordKey*);
-
-    protected: // Protected methods
-        /**
-        * Fills the combo given by depth with the items from the key having depth "depth".
-        * The parent sibling is given by key.
-        */
-        void setupCombo(const QString key, const int depth, const int currentItem);
-        /** No descriptions */
-        virtual void adjustFont();
-
-    protected slots:
-        /**
-        * A keychooser changed. Update and emit a signal if necessary.
-        */
-        void keyChooserChanged(int);
-        virtual void setKey(QString& newKey);
-
-    private:
-        QList<CKeyChooserWidget*> m_chooserWidgets;
-        QList<const CSwordBookModuleInfo*> m_modules;
-        CSwordTreeKey *m_key;
-        QHBoxLayout* m_layout;
+/**
+  \brief The keychooser implementation for books.
+*/
+class CBookKeyChooser: public CKeyChooser {
+
+    Q_OBJECT
+
+public:
+
+    CBookKeyChooser(const QList<const CSwordModuleInfo *> & modules,
+                    BTHistory * history,
+                    CSwordKey * key = 0,
+                    QWidget * parent = 0);
+
+    /**
+      Reimplemented from CKeyChooser.
+    */
+    virtual void refreshContent();
+
+    /**
+    * Sets another module to this keychooser
+    */
+    virtual void setModules(const QList<const CSwordModuleInfo *> & modules,
+                            bool refresh = false);
+    /**
+    * Returns the key of this keychooser
+    */
+    virtual CSwordKey * key();
+
+    /**
+    * Sets a new key to this keychooser
+    */
+    virtual void setKey(CSwordKey * key);
+
+    /**
+    * Sets a new key to this keychooser
+    */
+    void setKey(CSwordKey * key, const bool emitSignal);
+
+public slots: // Public slots
+
+    /**
+    * Updates the keychoosers for the given key but emit no signal.
+    */
+    void updateKey(CSwordKey * key);
+
+protected: /* Methods: */
+
+    /**
+    * Fills the combo given by depth with the items from the key having depth "depth".
+    * The parent sibling is given by key.
+    */
+    void setupCombo(const QString & key, const int depth, const int currentItem);
+
+    /** No descriptions */
+    virtual void adjustFont();
+
+protected slots:
+
+    /**
+    * A keychooser changed. Update and emit a signal if necessary.
+    */
+    void keyChooserChanged(int);
+
+    virtual void setKey(const QString & newKey);
+
+private: /* Fields: */
+
+    QList<CKeyChooserWidget *> m_chooserWidgets;
+    QList<const CSwordBookModuleInfo *> m_modules;
+    CSwordTreeKey * m_key;
+    QHBoxLayout * m_layout;
+
 };
 
 #endif
diff --git a/src/frontend/keychooser/cbooktreechooser.cpp b/src/frontend/keychooser/cbooktreechooser.cpp
index a41922e..96917d8 100644
--- a/src/frontend/keychooser/cbooktreechooser.cpp
+++ b/src/frontend/keychooser/cbooktreechooser.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -13,16 +13,19 @@
 #include <QHBoxLayout>
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/drivers/cswordbookmoduleinfo.h"
 #include "backend/keys/cswordtreekey.h"
 #include "frontend/keychooser/bthistory.h"
 
 
-CBookTreeChooser::CBookTreeChooser(const QList<const CSwordModuleInfo*> &modules,
-                                   BTHistory* historyPtr, CSwordKey *key, QWidget *parent)
-        : CKeyChooser(modules, historyPtr, key, parent),
-        m_key( dynamic_cast<CSwordTreeKey*>(key) ) {
+CBookTreeChooser::CBookTreeChooser(const QList<const CSwordModuleInfo *> & modules,
+                                   BTHistory * historyPtr,
+                                   CSwordKey * key,
+                                   QWidget * parent)
+    : CKeyChooser(modules, historyPtr, parent)
+    , m_key(dynamic_cast<CSwordTreeKey *>(key))
+{
 
     setModules(modules, false);
 
@@ -109,8 +112,7 @@ void CBookTreeChooser::setModules(const QList<const CSwordModuleInfo*> &modules,
 /** From ckeychooser. */
 void CBookTreeChooser::adjustFont() {
     //Make sure the entries are displayed correctly.
-    m_treeView->setFont( CBTConfig::get(m_modules.first()->language()).second );
-
+    m_treeView->setFont(btConfig().getFontForLanguage(*m_modules.first()->language()).second);
 }
 
 
@@ -183,7 +185,7 @@ void CBookTreeChooser::addKeyChildren(CSwordTreeKey* key, QTreeWidgetItem* item)
     }
 }
 
-void CBookTreeChooser::setKey(QString& newKey) {
+void CBookTreeChooser::setKey(const QString & newKey) {
     m_key->setKey(newKey);
     setKey(m_key);
 }
diff --git a/src/frontend/keychooser/cbooktreechooser.h b/src/frontend/keychooser/cbooktreechooser.h
index 409038e..17b5825 100644
--- a/src/frontend/keychooser/cbooktreechooser.h
+++ b/src/frontend/keychooser/cbooktreechooser.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -79,7 +81,7 @@ class CBookTreeChooser : public CKeyChooser {
 
     protected slots: // Protected slots
         void itemActivated( QTreeWidgetItem* item );
-        void setKey(QString& newKey);
+        void setKey(const QString & newKey);
 
     private:
         QList<const CSwordBookModuleInfo*> m_modules;
diff --git a/src/frontend/keychooser/ckeychooser.cpp b/src/frontend/keychooser/ckeychooser.cpp
index b46ee51..96b5638 100644
--- a/src/frontend/keychooser/ckeychooser.cpp
+++ b/src/frontend/keychooser/ckeychooser.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -21,48 +21,44 @@
 #include "frontend/keychooser/versekeychooser/cbiblekeychooser.h"
 
 
-CKeyChooser::CKeyChooser(const QList<const CSwordModuleInfo*> &, BTHistory* historyPtr,
-                         CSwordKey *, QWidget *parent)
-        : QWidget(parent),
-        m_history(historyPtr) {
-    bool ok = QObject::connect(history(), SIGNAL(historyMoved(QString&)), this, SLOT(setKey(QString&)));
+CKeyChooser::CKeyChooser(const QList<const CSwordModuleInfo *> &,
+                         BTHistory * historyPtr,
+                         QWidget * parent)
+    : QWidget(parent)
+    , m_history(historyPtr)
+{
+    bool ok = QObject::connect(history(), SIGNAL(historyMoved(QString)),
+                               this,      SLOT(setKey(const QString &)));
     Q_ASSERT(ok);
 }
 
-CKeyChooser* CKeyChooser::createInstance(
-        const QList<const CSwordModuleInfo*> &modules, BTHistory *historyPtr,
-        CSwordKey *key, QWidget *parent)
+CKeyChooser * CKeyChooser::createInstance(const QList<const CSwordModuleInfo *> & modules,
+                                          BTHistory * historyPtr,
+                                          CSwordKey * key,
+                                          QWidget * parent)
 {
-    if (!modules.count()) {
-        /**
-          \todo Verify and document that we need to return 0 here rather than
-                fail with an assertion.
-        */
-        return 0;
-    }
+    Q_ASSERT(!modules.empty());
+    Q_ASSERT(modules.first()->type() == CSwordModuleInfo::Commentary
+             || modules.first()->type() == CSwordModuleInfo::Bible
+             || modules.first()->type() == CSwordModuleInfo::Lexicon
+             || modules.first()->type() == CSwordModuleInfo::GenericBook);
+
+    switch (modules.first()->type()) {
 
-    CSwordModuleInfo::ModuleType typeOfModules = modules.first()->type();
-/*
-#ifdef BT_DEBUG
-    Q_FOREACH (const CSwordModuleInfo *module, modules) {
-        Q_ASSERT(module->type() == typeOfModules);
-    }
-#endif
-*/
-    switch (typeOfModules) {
         case CSwordModuleInfo::Commentary:
             /* Fall thru - Bibles and commentaries use the same key chooser */
+
         case CSwordModuleInfo::Bible:
             return new CBibleKeyChooser(modules, historyPtr, key, parent);
+
         case CSwordModuleInfo::Lexicon:
             return new CLexiconKeyChooser(modules, historyPtr, key, parent);
+
         case CSwordModuleInfo::GenericBook:
             return new CBookKeyChooser(modules, historyPtr, key, parent);
+
         default:
-            /**
-              \todo Verify and document that we need to return 0 here rather
-                    than fail with an assertion.
-            */
-            return 0;
+            abort();
+
     }
 }
diff --git a/src/frontend/keychooser/ckeychooser.h b/src/frontend/keychooser/ckeychooser.h
index 0ab9c5b..79706cc 100644
--- a/src/frontend/keychooser/ckeychooser.h
+++ b/src/frontend/keychooser/ckeychooser.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -23,83 +25,86 @@ class QAction;
  * Do not use directly, create a KeyChooser with
  * @ref #createInstance , this will create the proper one
  * of the classes that inherit from @ref CKeyChooser
- *
-  * @author The BibleTime team
-  */
-class CKeyChooser : public QWidget {
-        Q_OBJECT
-    public:
-
-        /**
-        * Creates a proper Instance, either
-        * @ref CLexiconKeyChooser or
-        * @ref CBibleKeyChooser
-        * @param info the @ref CModuleInfo to be represented by the KeyChooser
-        * @param key if not NULL, the @ref CKey the KeyChooser should be set to
-        * @param parent the parent of the widget to create
-        */
-        static CKeyChooser *createInstance(
-            const QList<const CSwordModuleInfo*> &modules,
-            BTHistory *history, CSwordKey *key, QWidget *parent);
-
-
-    public slots:
-        /**
-          Sets the CKey
-          \param key the key which the widget should be set to.
-        */
-        virtual void setKey(CSwordKey* key) = 0;
-
-        /**
-          Updates the CKey.
-          \param key the key which the widget should be set to.
-        */
-        virtual void updateKey(CSwordKey *key) = 0;
-
-        /**
-          \returns the current CKey.
-        */
-        virtual CSwordKey *key() = 0;
-
-        /**
-          Sets the module of this keychooser and refreshes the comboboxes
-        */
-        virtual void setModules(const QList<const CSwordModuleInfo*> &modules,
-                                bool refresh = true) = 0;
-
-        /**
-          Refreshes the content of the different key chooser parts.
-        */
-        virtual void refreshContent() = 0;
-
-        /**
-          \returns the history object of this keychooser.
-        */
-        inline BTHistory *history() const { return m_history; }
-
-    signals:
-
-        /**
-        * is emitted if the @ref CKey was changed by the user
-        */
-        void keyChanged(CSwordKey* newKey);
-
-    protected:
-
-        CKeyChooser(const QList<const CSwordModuleInfo*> &info,
-                    BTHistory *history, CSwordKey *key = 0,
-                    QWidget *parent = 0);
-
-        /**
-          Resets the appropriate font to for the modules.
-        */
-        virtual void adjustFont() = 0;
-
-    protected slots:
-        virtual void setKey(QString &newKey) = 0;
-
-    private:
-        BTHistory *m_history;
+ */
+class CKeyChooser: public QWidget {
+
+    Q_OBJECT
+
+public: /* Methods: */
+
+    /**
+      \returns the history object of this keychooser.
+    */
+    inline BTHistory * history() const { return m_history; }
+
+    /**
+    * Creates a proper Instance, either
+    * @ref CLexiconKeyChooser or
+    * @ref CBibleKeyChooser
+    * @param info the @ref CModuleInfo to be represented by the KeyChooser
+    * @param key if not NULL, the @ref CKey the KeyChooser should be set to
+    * @param parent the parent of the widget to create
+    */
+    static CKeyChooser * createInstance(const QList<const CSwordModuleInfo *> & modules,
+                                        BTHistory * history,
+                                        CSwordKey * key,
+                                        QWidget * parent);
+
+public slots:
+
+    /**
+      Sets the CKey
+      \param key the key which the widget should be set to.
+    */
+    virtual void setKey(CSwordKey * key) = 0;
+
+    /**
+      Updates the CKey.
+      \param key the key which the widget should be set to.
+    */
+    virtual void updateKey(CSwordKey * key) = 0;
+
+    /**
+      \returns the current CKey.
+    */
+    virtual CSwordKey * key() = 0;
+
+    /**
+      Sets the module of this keychooser and refreshes the comboboxes
+    */
+    virtual void setModules(const QList<const CSwordModuleInfo *> & modules,
+                            bool refresh = true) = 0;
+
+    /**
+      Refreshes the content of the different key chooser parts.
+    */
+    virtual void refreshContent() = 0;
+
+signals:
+
+    /**
+    * is emitted if the @ref CKey was changed by the user
+    */
+    void keyChanged(CSwordKey * newKey);
+
+protected: /* Methods: */
+
+    CKeyChooser(const QList<const CSwordModuleInfo *> & info,
+                BTHistory * history,
+                QWidget * parent = 0);
+
+    /**
+      Resets the appropriate font to for the modules.
+    */
+    virtual void adjustFont() = 0;
+
+protected slots:
+
+    virtual void setKey(const QString & newKey) = 0;
+
+private: /* Fields: */
+
+    BTHistory * const m_history;
 
 };
 
diff --git a/src/frontend/keychooser/ckeychooserwidget.cpp b/src/frontend/keychooser/ckeychooserwidget.cpp
index 36fc05b..ea3421e 100644
--- a/src/frontend/keychooser/ckeychooserwidget.cpp
+++ b/src/frontend/keychooser/ckeychooserwidget.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -19,58 +19,60 @@
 
 
 class BtKeyLineEdit : public QLineEdit {
-    public:
-        BtKeyLineEdit(QWidget* parent)
-                : QLineEdit(parent) {
-        }
-    protected:
-        void focusInEvent(QFocusEvent* event) {
-            Qt::FocusReason reason = event->reason();
-            if (reason == Qt::OtherFocusReason) {
-                selectAll();
-            }
-            QWidget::focusInEvent(event);
-        }
-};
 
+public: /* Methods: */
+
+    BtKeyLineEdit(QWidget * parent)
+        : QLineEdit(parent) {}
+
+protected: /* Methods: */
+
+    virtual void focusInEvent(QFocusEvent * event) {
+        const Qt::FocusReason reason = event->reason();
+        if (reason == Qt::OtherFocusReason)
+            selectAll();
+        QWidget::focusInEvent(event);
+    }
+
+};
 
 
-CKCComboBox::CKCComboBox()
-        : QComboBox() {
+CKCComboBox::CKCComboBox(QWidget * parent)
+    : QComboBox(parent)
+{
     setFocusPolicy(Qt::WheelFocus);
     setLineEdit(new BtKeyLineEdit(this));
-    if (lineEdit()) {
-        installEventFilter( lineEdit() );
-    }
+    if (lineEdit())
+        installEventFilter(lineEdit());
 }
 
-/** Reimplementation. */
-bool CKCComboBox::eventFilter( QObject *o, QEvent *e ) {
+bool CKCComboBox::eventFilter(QObject * o, QEvent * e) {
     if (e->type() == QEvent::FocusOut) {
-        QFocusEvent* f = static_cast<QFocusEvent*>(e);
+        QFocusEvent * const f = static_cast<QFocusEvent *>(e);
 
         if (o == lineEdit() && f->reason() == Qt::TabFocusReason) {
             int index = findText(currentText());
-            if (index == -1) {
-                index = 0;// return 0 if not found
-            }
-            setCurrentIndex( index );
-            emit focusOut( index );
-
+            if (index == -1)
+                index = 0; // return 0 if not found
+            setCurrentIndex(index);
+            emit focusOut(index);
             return false;
         }
-        else if (f->reason() == Qt::PopupFocusReason) {
+
+        if (f->reason() == Qt::PopupFocusReason)
             return false;
-        }
-        else if (f->reason() == Qt::ActiveWindowFocusReason) {
+
+        if (f->reason() == Qt::ActiveWindowFocusReason) {
             emit activated(currentText());
             return false;
         }
-        else if (f->reason() == Qt::MouseFocusReason) {
+
+        if (f->reason() == Qt::MouseFocusReason) {
             emit activated(currentText());
             return false;
         }
-        else if (o == this) {
+
+        if (o == this) {
             emit activated(currentText());
             return false;
         }
@@ -80,8 +82,8 @@ bool CKCComboBox::eventFilter( QObject *o, QEvent *e ) {
 }
 
 /** Scrolls in the list if the wheel of the mouse was used. */
-void CKCComboBox::wheelEvent( QWheelEvent* e ) {
-    return QComboBox::wheelEvent(e);
+void CKCComboBox::wheelEvent(QWheelEvent * e) {
+    return QComboBox::wheelEvent(e); /// \bug rest method won't get executed.
 
     const signed int change = (int)((float)e->delta() / (float)120);
     int current = currentIndex();
@@ -89,18 +91,17 @@ void CKCComboBox::wheelEvent( QWheelEvent* e ) {
     if ((current + change >= 0) && (current + change < count()) ) {
         setCurrentIndex(current + change);
         e->accept();
-        emit activated( currentIndex() );
-    }
-    else {
+        emit activated(currentIndex());
+    } else {
         e->ignore();
     }
 }
 
 //**********************************************************************************/
 
-CKeyChooserWidget::CKeyChooserWidget(int count, const bool useNextPrevSignals,  QWidget *parent ) : QWidget(parent) {
-    m_useNextPrevSignals = useNextPrevSignals;
-
+CKeyChooserWidget::CKeyChooserWidget(int count, QWidget * parent)
+    : QWidget(parent)
+{
     for (int index = 1; index <= count; index++) {
         m_list.append( QString::number(index) );
     }
@@ -108,15 +109,11 @@ CKeyChooserWidget::CKeyChooserWidget(int count, const bool useNextPrevSignals,
     reset(m_list, 0, false);
 }
 
-CKeyChooserWidget::CKeyChooserWidget(QStringList *list, const bool useNextPrevSignals, QWidget *parent ) : QWidget(parent) {
-    m_useNextPrevSignals = useNextPrevSignals;
-
-    if (list) {
-        m_list = *list; //deep copy the items of list
-    }
-    else {
-        m_list.clear();
-    }
+CKeyChooserWidget::CKeyChooserWidget(QStringList * list, QWidget * parent )
+    : QWidget(parent)
+{
+    if (list)
+        m_list = *list;
 
     init();
     reset(m_list, 0, false);
@@ -129,14 +126,13 @@ void CKeyChooserWidget::reset(const int count, int index, bool do_emit) {
     //    return;
 
     m_list.clear();
-    for (int i = 1; i <= count; i++) { /// \todo CHECK
-        m_list.append( QString::number(i) );
-    }
+    for (int i = 1; i <= count; i++) /// \todo CHECK
+        m_list.append(QString::number(i));
 
     reset(&m_list, index, do_emit);
 }
 
-void CKeyChooserWidget::reset(const QStringList &list, int index, bool do_emit) {
+void CKeyChooserWidget::reset(const QStringList & list, int index, bool do_emit) {
     //This prevents the widget from resetting during application load, which
     //produces undesirable behavior.
     //if (!updatesEnabled())
@@ -147,37 +143,34 @@ void CKeyChooserWidget::reset(const QStringList &list, int index, bool do_emit)
 }
 
 
-void CKeyChooserWidget::reset(const QStringList *list, int index, bool do_emit) {
+void CKeyChooserWidget::reset(const QStringList * list, int index, bool do_emit) {
     //if (isResetting || !updatesEnabled())
-    if (isResetting)
+    if (m_isResetting)
         return;
 
     //  qWarning("starting insert");
-    isResetting = true;
+    m_isResetting = true;
 
-    oldKey = QString::null;
+    m_oldKey = QString::null;
 
     //  m_comboBox->setUpdatesEnabled(false);
     //DON'T REMOVE THE HIDE: Otherwise QComboBox's sizeHint() function won't work properly
     m_comboBox->hide();
     m_comboBox->clear();
-    if (list) {
+    if (list)
         m_comboBox->insertItems(-1, *list);
-    }
 
-    if (!list || (list && !list->count())) { //nothing in the combobox
+    if (!list || (list && !list->count())) { // nothing in the combobox
         setEnabled(false);
-    }
-    else if (!isEnabled()) { //was disabled
+    } else if (!isEnabled()) { // was disabled
         setEnabled(true);
     }
 
-    if (list->count()) {
+    if (list->count())
         m_comboBox->setCurrentIndex(index);
-    }
-    if (do_emit) {
+
+    if (do_emit)
         emit changed(m_comboBox->currentIndex());
-    }
 
     m_comboBox->sizeHint(); //without this function call the combo box won't be properly sized!
     //DON'T REMOVE OR MOVE THE show()! Otherwise QComboBox's sizeHint() function won't work properly!
@@ -186,56 +179,56 @@ void CKeyChooserWidget::reset(const QStringList *list, int index, bool do_emit)
     //  m_comboBox->setFont( m_comboBox->font() );
     //  m_comboBox->setUpdatesEnabled(true);
 
-    isResetting = false;
+    m_isResetting = false;
     //  qWarning("inserted");
 }
 
 /** Initializes this widget. We need this function because we have more than one constructor. */
 void CKeyChooserWidget::init() {
-    oldKey = QString::null;
+    m_oldKey = QString::null;
 
     setFocusPolicy(Qt::WheelFocus);
 
-    m_comboBox = new CKCComboBox();
+    m_comboBox = new CKCComboBox(this);
     setFocusProxy(m_comboBox);
-    m_comboBox->setAutoCompletion( true );
+    m_comboBox->setAutoCompletion(true);
     m_comboBox->setEditable(true);
     m_comboBox->setInsertPolicy(QComboBox::NoInsert);
     m_comboBox->setFocusPolicy(Qt::WheelFocus);
 
-    m_mainLayout = new QHBoxLayout( this );
+    m_mainLayout = new QHBoxLayout(this);
     m_mainLayout->setSpacing(0);
     m_mainLayout->setContentsMargins(0, 0, 0, 0);
     m_mainLayout->addWidget(m_comboBox);
 
     m_scroller = new CScrollerWidgetSet(this);
 
-    m_mainLayout->addWidget( m_scroller );
+    m_mainLayout->addWidget(m_scroller);
     m_mainLayout->addSpacing(0);
 
     setTabOrder(m_comboBox, 0);
     setFocusProxy(m_comboBox);
 
-    connect(m_scroller, SIGNAL(scroller_pressed()), SLOT(lock()));
+    connect(m_scroller, SIGNAL(scroller_pressed()),  SLOT(lock()));
     connect(m_scroller, SIGNAL(scroller_released()), SLOT(unlock()));
-    connect(m_scroller, SIGNAL(change(int)), SLOT(changeCombo(int)) );
-
-    connect(m_comboBox, SIGNAL(activated(int)), SLOT(slotComboChanged(int)));
+    connect(m_scroller, SIGNAL(change(int)),         SLOT(changeCombo(int)));
+    connect(m_comboBox, SIGNAL(activated(int)),      SLOT(slotComboChanged(int)));
     //  connect(m_comboBox, SIGNAL(activated(const QString&)), SLOT(slotReturnPressed(const QString&)));
-    connect(m_comboBox->lineEdit(), SIGNAL(returnPressed()), SLOT(slotReturnPressed()));
+    connect(m_comboBox->lineEdit(), SIGNAL(returnPressed()),
+                                    SLOT(slotReturnPressed()));
     connect(m_comboBox, SIGNAL(focusOut(int)), SIGNAL(focusOut(int)));
 
     updatelock = false;
-    isResetting = false;
+    m_isResetting = false;
 }
 
 /** Is called when the return key was presed in the combobox. */
-void CKeyChooserWidget::slotReturnPressed( /*const QString& text*/) {
-    Q_ASSERT(comboBox()->lineEdit());
+void CKeyChooserWidget::slotReturnPressed() {
+    Q_ASSERT(m_comboBox->lineEdit());
 
-    QString text = comboBox()->lineEdit()->text();
-    for (int index = 0; index < comboBox()->count(); ++index) {
-        if (comboBox()->itemText(index) == text) {
+    const QString text(m_comboBox->lineEdit()->text());
+    for (int index = 0; index < m_comboBox->count(); ++index) {
+        if (m_comboBox->itemText(index) == text) {
 //            emit changed(index);
             emit focusOut(index); // a workaround because focusOut is not checked, the slot connected to changed to check
             break;
@@ -245,71 +238,74 @@ void CKeyChooserWidget::slotReturnPressed( /*const QString& text*/) {
 
 /** Is called when the current item of the combo box was changed. */
 void CKeyChooserWidget::slotComboChanged(int index) {
-    if (!updatesEnabled()) {
+    if (!updatesEnabled())
         return;
-    }
 
     setUpdatesEnabled(false);
 
-    const QString key = comboBox()->itemText( index );
-    if (oldKey.isNull() || (oldKey != key)) {
+    const QString key(m_comboBox->itemText(index));
+    if (m_oldKey.isNull() || (m_oldKey != key))
         emit changed(index);
-    }
 
-    oldKey = key;
+    m_oldKey = key;
 
     setUpdatesEnabled(true);
 }
 
 /** Sets the tooltips for the given entries using the parameters as text. */
-void CKeyChooserWidget::setToolTips( const QString comboTip, const QString nextEntryTip, const QString scrollButtonTip, const QString previousEntryTip) {
-    comboBox()->setToolTip(comboTip);
+void CKeyChooserWidget::setToolTips(const QString & comboTip,
+                                    const QString & nextEntryTip,
+                                    const QString & scrollButtonTip,
+                                    const QString & previousEntryTip)
+{
+    m_comboBox->setToolTip(comboTip);
     m_scroller->setToolTips(nextEntryTip, scrollButtonTip, previousEntryTip);
 }
 
 /** Sets the current item to the one with the given text */
-bool CKeyChooserWidget::setItem( const QString item ) {
+bool CKeyChooserWidget::setItem(const QString & item) {
     bool ret = false;
-    const int count = comboBox()->count();
+    const int count = m_comboBox->count();
     for (int i = 0; i < count; ++i) {
-        if (comboBox()->itemText(i) == item) {
-            comboBox()->setCurrentIndex(i);
+        if (m_comboBox->itemText(i) == item) {
+            m_comboBox->setCurrentIndex(i);
             ret = true;
             break;
         }
     }
     if (!ret)
-        comboBox()->setCurrentIndex(-1);
+        m_comboBox->setCurrentIndex(-1);
     return ret;
 }
 
 /* Handlers for the various scroller widgetset. */
 void CKeyChooserWidget::lock() {
     updatelock = true;
-    comboBox()->setEditable(false);
-    oldKey = comboBox()->currentText();
+    m_comboBox->setEditable(false);
+    m_oldKey = m_comboBox->currentText();
 }
 
 void CKeyChooserWidget::unlock() {
     updatelock = false;
-    comboBox()->setEditable(true);
-    comboBox()->setEditText(comboBox()->itemText(comboBox()->currentIndex()));
-    if (comboBox()->currentText() != oldKey) {
-        emit changed(comboBox()->currentIndex());
-    }
+    m_comboBox->setEditable(true);
+    m_comboBox->setEditText(m_comboBox->itemText(m_comboBox->currentIndex()));
+    if (m_comboBox->currentText() != m_oldKey)
+        emit changed(m_comboBox->currentIndex());
 }
 
 void CKeyChooserWidget::changeCombo(int n) {
-    const int old_index = comboBox()->currentIndex();
+    const int old_index = m_comboBox->currentIndex();
     int new_index = old_index + n;
 
     //index of highest Item
-    const int max = comboBox()->count() - 1;
-    if (new_index > max) new_index = max;
-    if (new_index < 0) new_index = 0;
+    const int max = m_comboBox->count() - 1;
+    if (new_index > max)
+        new_index = max;
+    if (new_index < 0)
+        new_index = 0;
 
     if (new_index != old_index) {
-        comboBox()->setCurrentIndex(new_index);
+        m_comboBox->setCurrentIndex(new_index);
         if (!updatelock)
             emit changed(new_index);
     }
diff --git a/src/frontend/keychooser/ckeychooserwidget.h b/src/frontend/keychooser/ckeychooserwidget.h
index 3121af8..a1fd31d 100644
--- a/src/frontend/keychooser/ckeychooserwidget.h
+++ b/src/frontend/keychooser/ckeychooserwidget.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -12,7 +14,6 @@
 
 #include <QComboBox>
 
-#include <QString>
 #include <QStringList>
 
 
@@ -28,30 +29,27 @@ class QEvent;
 * We use this class to control the focus move in the combobox
 * This class is used in the key chooser widgets
 */
-class CKCComboBox : public QComboBox {
-        Q_OBJECT
-    public:
-        CKCComboBox();
-        /**
-        * Returns the size this widget would like to have.
-        */
-        //  virtual QSize sizeHint() const;
-
-    protected:
-        /**
-        * Reimplementation.
-        */
-        virtual bool eventFilter( QObject *o, QEvent *e );
-        /**
-        * Scrolls in the list if the wheel of the mouse was used.
-        */
-        virtual void wheelEvent( QWheelEvent* e);
-
-    signals:
-        /**
-        * Emitted when the user moves the focus away from the combo by pressing tab
-        */
-        void focusOut(int itemIndex);
+class CKCComboBox: public QComboBox {
+
+    Q_OBJECT
+
+public: /* Methods: */
+
+    CKCComboBox(QWidget * parent = 0);
+
+protected: /* Methods: */
+
+    virtual bool eventFilter(QObject * o, QEvent * e);
+
+    virtual void wheelEvent(QWheelEvent * e);
+
+signals:
+
+    /**
+    * Emitted when the user moves the focus away from the combo by pressing tab
+    */
+    void focusOut(int itemIndex);
+
 };
 
 /**
@@ -61,114 +59,122 @@ class CKCComboBox : public QComboBox {
  *
   * @author The BibleTime team
   */
-class CKeyChooserWidget : public QWidget  {
-        Q_OBJECT
-
-    public:
-        CKeyChooserWidget(QStringList *list = 0,
-                          const bool useNextPrevSignals = false,
-                          QWidget *parent = 0);
-
-        CKeyChooserWidget(int count = 0, const bool useNextPrevSignals = false,
-                          QWidget *parent = 0);
-
-        /**
-        * This function does clear the combobox, then fill in
-        * the StringList, set the ComboBox' current item to index
-        * and if do_emit is true, it will emit @ref #changed
-        *
-        * @param list the stringlist to be inserted
-        * @param index the index that the combobox is to jump to
-        * @param do_emit should we emit @ref #changed(int)
-        */
-        void reset(const int count, int index, bool do_emit);
-        void reset(const QStringList &list, int index, bool do_emit);
-        void reset(const QStringList *list, int index, bool do_emit);
-
-        /**
-        * Initializes this widget. We need this function because
-        * we have more than one constructor.
-        */
-        virtual void init();
-        /**
-        *
-        */
-        //  virtual void adjustSize();
-        /**
-        * Sets the tooltips for the given entries using the parameters as text.
-        */
-        void setToolTips( const QString comboTip, const QString nextEntry, const QString scrollButton, const QString previousEntry);
-        /**
-        * Sets the current item to the one with the given text
-        */
-        bool setItem( const QString item);
-        /**
-        * Return the combobox of this key chooser widget.
-        */
-        QComboBox* comboBox() {
-            return m_comboBox;
-        };
-
-    public slots:
-        /**
-        * is called to lock the combobox
-        */
-        void lock()
-        ;
-        /**
-        * is called to unlock the combobox
-        */
-        void unlock();
-        /**
-        * is called to move the combobox to a certain index
-        * @param index the index to jump to
-        */
-        void changeCombo(int index);
-        void slotComboChanged(int index);
-
-    signals:
-        /**
-        * Is emitted if the widget changed, but
-        * only if it is not locked or being reset
-        *
-        * @param the current ComboBox index
-        */
-        void changed(int index);
-        /**
-        * Is emitted if the widget was left with a focus out event.
-        * @param index The new index of the ComboBox
-        */
-        void focusOut(int index);
-
-    protected:
-        /**
-        * indicates wheter we are resetting at the moment
-        */
-        bool isResetting;
-        /**
-        *
-        */
-        QString oldKey;
-
-    protected slots: // Protected slots
-        /**
-        * Is called when the return key was presed in the combobox.
-        */
-        void slotReturnPressed( /*const QString&*/ );
-
-
-    private:
-
-        QStringList m_list;
-        bool m_useNextPrevSignals;
-        bool updatelock;
-
-        /**
-        * Members should never be public!!
-        */
-        CKCComboBox* m_comboBox;
-        QHBoxLayout *m_mainLayout;
-        CScrollerWidgetSet * m_scroller;
+class CKeyChooserWidget: public QWidget  {
+
+    Q_OBJECT
+
+public: /* Methods: */
+
+    CKeyChooserWidget(QStringList * list = 0,
+                      QWidget * parent = 0);
+
+    CKeyChooserWidget(int count = 0,
+                      QWidget * parent = 0);
+
+    /**
+    * This function does clear the combobox, then fill in
+    * the StringList, set the ComboBox' current item to index
+    * and if do_emit is true, it will emit @ref #changed
+    *
+    * @param list the stringlist to be inserted
+    * @param index the index that the combobox is to jump to
+    * @param do_emit should we emit @ref #changed(int)
+    */
+    void reset(const int count, int index, bool do_emit);
+
+    void reset(const QStringList & list, int index, bool do_emit);
+
+    void reset(const QStringList * list, int index, bool do_emit);
+
+    /**
+    * Initializes this widget. We need this function because
+    * we have more than one constructor.
+    */
+    virtual void init();
+
+    /**
+    * Sets the tooltips for the given entries using the parameters as text.
+    */
+    void setToolTips(const QString & comboTip,
+                     const QString & nextEntry,
+                     const QString & scrollButton,
+                     const QString & previousEntry);
+
+    /**
+    * Sets the current item to the one with the given text
+    */
+    bool setItem(const QString & item);
+
+    /**
+    * Return the combobox of this key chooser widget.
+    */
+    QComboBox & comboBox() const {
+        Q_ASSERT(m_comboBox);
+        return *m_comboBox;
+    }
+
+public slots:
+
+    /**
+    * is called to lock the combobox
+    */
+    void lock();
+
+    /**
+    * is called to unlock the combobox
+    */
+    void unlock();
+
+    /**
+    * is called to move the combobox to a certain index
+    * @param index the index to jump to
+    */
+    void changeCombo(int index);
+
+    void slotComboChanged(int index);
+
+signals:
+
+    /**
+    * Is emitted if the widget changed, but
+    * only if it is not locked or being reset
+    *
+    * @param the current ComboBox index
+    */
+    void changed(int index);
+
+    /**
+    * Is emitted if the widget was left with a focus out event.
+    * @param index The new index of the ComboBox
+    */
+    void focusOut(int index);
+
+protected slots:
+
+    /**
+    * Is called when the return key was presed in the combobox.
+    */
+    void slotReturnPressed();
+
+private: /* Fields: */
+
+    QStringList m_list;
+    bool updatelock;
+
+    /**
+    * Members should never be public!!
+    */
+    CKCComboBox * m_comboBox;
+    QHBoxLayout * m_mainLayout;
+    CScrollerWidgetSet * m_scroller;
+
+    /**
+    * indicates wheter we are resetting at the moment
+    */
+    bool m_isResetting;
+
+    QString m_oldKey;
+
 };
 
 #endif
diff --git a/src/frontend/keychooser/clexiconkeychooser.cpp b/src/frontend/keychooser/clexiconkeychooser.cpp
index 42fb4e8..2c6545a 100644
--- a/src/frontend/keychooser/clexiconkeychooser.cpp
+++ b/src/frontend/keychooser/clexiconkeychooser.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -19,11 +19,12 @@
 #include "util/cresmgr.h"
 
 
-CLexiconKeyChooser::CLexiconKeyChooser(
-        const QList<const CSwordModuleInfo*> &modules,
-        BTHistory *historyPtr, CSwordKey *key, QWidget *parent)
-        : CKeyChooser(modules, historyPtr, key, parent),
-          m_key(dynamic_cast<CSwordLDKey*>(key))
+CLexiconKeyChooser::CLexiconKeyChooser(const QList<const CSwordModuleInfo *> & modules,
+                                       BTHistory * historyPtr,
+                                       CSwordKey * key,
+                                       QWidget * parent)
+    : CKeyChooser(modules, historyPtr, parent)
+    , m_key(dynamic_cast<CSwordLDKey *>(key))
 {
     setModules(modules, false);
 
@@ -34,12 +35,12 @@ CLexiconKeyChooser::CLexiconKeyChooser(
     m_layout->setDirection(QBoxLayout::LeftToRight);
     m_layout->setSizeConstraint(QLayout::SetNoConstraint);
 
-    m_widget = new CKeyChooserWidget(0, false, this);
+    m_widget = new CKeyChooserWidget(0, this);
     setFocusProxy(m_widget);
 
     //don't allow a too high width, try to keep as narrow as possible
     //to aid users with smaller screen resolutions
-    m_widget->comboBox()->setMaximumWidth(200);
+    m_widget->comboBox().setMaximumWidth(200);
 
     m_widget->setToolTips(
         tr("Entries of the current work"),
@@ -70,8 +71,8 @@ void CLexiconKeyChooser::updateKey(CSwordKey* key) {
     }
 
     QString newKey = m_key->key();
-    const int index = m_widget->comboBox()->findText(newKey);
-    m_widget->comboBox()->setCurrentIndex(index);
+    const int index = m_widget->comboBox().findText(newKey);
+    m_widget->comboBox().setCurrentIndex(index);
 }
 
 void CLexiconKeyChooser::setKey(CSwordKey* key) {
@@ -87,7 +88,7 @@ void CLexiconKeyChooser::setKey(CSwordKey* key) {
 
 void CLexiconKeyChooser::activated(int index) {
     //  qWarning("activated");
-    const QString text = m_widget->comboBox()->itemText(index);
+    const QString text = m_widget->comboBox().itemText(index);
 
     // To prevent from eternal loop, because activated() is emitted again
     if (m_key && m_key->key() != text) {
@@ -169,7 +170,7 @@ void CLexiconKeyChooser::setModules(const QList<const CSwordModuleInfo*> &module
     }
 }
 
-void CLexiconKeyChooser::setKey(QString& newKey) {
+void CLexiconKeyChooser::setKey(const QString & newKey) {
     m_key->setKey(newKey);
     setKey(m_key);
 }
diff --git a/src/frontend/keychooser/clexiconkeychooser.h b/src/frontend/keychooser/clexiconkeychooser.h
index e014448..5f14747 100644
--- a/src/frontend/keychooser/clexiconkeychooser.h
+++ b/src/frontend/keychooser/clexiconkeychooser.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -77,7 +79,7 @@ class CLexiconKeyChooser : public CKeyChooser {
         virtual void updateKey(CSwordKey* key);
 
     protected slots:
-        virtual void setKey(QString& newKey);
+        virtual void setKey(const QString & newKey);
 
 };
 
diff --git a/src/frontend/keychooser/cscrollbutton.cpp b/src/frontend/keychooser/cscrollbutton.cpp
index 9a92b5f..775d4db 100644
--- a/src/frontend/keychooser/cscrollbutton.cpp
+++ b/src/frontend/keychooser/cscrollbutton.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -24,10 +24,6 @@ CScrollButton::CScrollButton(QWidget *parent)
     setCursor(Qt::SplitVCursor);
 }
 
-CScrollButton::~CScrollButton() {
-    // Intentionally empty
-}
-
 void CScrollButton::mousePressEvent(QMouseEvent *e) {
     if (m_isLocked) return;
     if (e->button() != Qt::LeftButton) return;
diff --git a/src/frontend/keychooser/cscrollbutton.h b/src/frontend/keychooser/cscrollbutton.h
index 06d272d..2b3f662 100644
--- a/src/frontend/keychooser/cscrollbutton.h
+++ b/src/frontend/keychooser/cscrollbutton.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -25,7 +27,6 @@ class CScrollButton: public QToolButton {
         Q_OBJECT
     public:
         CScrollButton(QWidget *parent = 0);
-        virtual ~CScrollButton();
 
     signals:
         /**
diff --git a/src/frontend/keychooser/cscrollerwidgetset.cpp b/src/frontend/keychooser/cscrollerwidgetset.cpp
index 4ad8750..e169ae9 100644
--- a/src/frontend/keychooser/cscrollerwidgetset.cpp
+++ b/src/frontend/keychooser/cscrollerwidgetset.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,64 +16,69 @@
 #include "frontend/keychooser/cscrollbutton.h"
 
 
-const unsigned int WIDTH = 16;
-const unsigned int ARROW_HEIGHT = 12;
-const unsigned int MOVER_HEIGHT = 6;
+#define WIDTH (static_cast<unsigned int>(16))
+#define ARROW_HEIGHT (static_cast<unsigned int>(12))
+#define MOVER_HEIGHT (static_cast<unsigned int>(6))
 
-CScrollerWidgetSet::CScrollerWidgetSet(QWidget *parent) : QWidget(parent) {
+
+CScrollerWidgetSet::CScrollerWidgetSet(QWidget * parent)
+    : QWidget(parent)
+{
     m_layout = new QVBoxLayout(this);
     m_layout->setSpacing(0);
     m_layout->setContentsMargins(0, 0, 0, 0);
     m_layout->setAlignment(this, Qt::AlignHCenter | Qt::AlignCenter);
 
-    btn_up = new QToolButton(this);
-    btn_up->setArrowType(Qt::UpArrow);
+    m_buttonUp = new QToolButton(this);
+    m_buttonUp->setArrowType(Qt::UpArrow);
 
-    btn_up->setFixedSize(WIDTH, ARROW_HEIGHT);
-    btn_up->setFocusPolicy(Qt::NoFocus);
-    btn_up->setAutoRaise(true);
+    m_buttonUp->setFixedSize(WIDTH, ARROW_HEIGHT);
+    m_buttonUp->setFocusPolicy(Qt::NoFocus);
+    m_buttonUp->setAutoRaise(true);
 
-    btn_fx = new CScrollButton(this);
-    btn_fx->setFixedSize(WIDTH, MOVER_HEIGHT);
-    btn_fx->setFocusPolicy(Qt::NoFocus);
+    m_scrollButton = new CScrollButton(this);
+    m_scrollButton->setFixedSize(WIDTH, MOVER_HEIGHT);
+    m_scrollButton->setFocusPolicy(Qt::NoFocus);
 
-    btn_down = new QToolButton(this);
-    btn_down->setArrowType(Qt::DownArrow);
-    btn_down->setFixedSize(WIDTH, ARROW_HEIGHT);
-    btn_down->setFocusPolicy(Qt::NoFocus);
-    btn_down->setAutoRaise(true);
+    m_buttonDown = new QToolButton(this);
+    m_buttonDown->setArrowType(Qt::DownArrow);
+    m_buttonDown->setFixedSize(WIDTH, ARROW_HEIGHT);
+    m_buttonDown->setFocusPolicy(Qt::NoFocus);
+    m_buttonDown->setAutoRaise(true);
 
-    m_layout->addWidget( btn_up, 0 );
-    m_layout->addWidget( btn_fx, 0 );
-    m_layout->addWidget( btn_down, 0 );
+    m_layout->addWidget(m_buttonUp, 0);
+    m_layout->addWidget(m_scrollButton, 0);
+    m_layout->addWidget(m_buttonDown, 0);
     setMinimumWidth(WIDTH); // Kludge to add some spacing but seems to work.
 
-    connect(btn_fx, SIGNAL(lock()), SLOT(slotLock()));
-    connect(btn_fx, SIGNAL(unlock()), SLOT(slotUnlock()));
-    connect(btn_fx, SIGNAL(change_requested(int)), SLOT(slotScroller(int)));
-    connect(btn_up, SIGNAL(clicked()), SLOT(slotUpClick()));
-    connect(btn_down, SIGNAL(clicked()), SLOT(slotDownClick()));
+    connect(m_scrollButton, SIGNAL(lock()),                SLOT(slotLock()));
+    connect(m_scrollButton, SIGNAL(unlock()),              SLOT(slotUnlock()));
+    connect(m_scrollButton, SIGNAL(change_requested(int)), SLOT(slotScroller(int)));
+    connect(m_buttonUp,     SIGNAL(clicked()),             SLOT(slotUpClick()));
+    connect(m_buttonDown,   SIGNAL(clicked()),             SLOT(slotDownClick()));
 }
 
 /** Sets the tooltips for the given entries using the parameters as text. */
-void CScrollerWidgetSet::setToolTips( const QString nextEntryTip, const QString scrollButtonTip, const QString previousEntryTip) {
-    btn_fx->setToolTip(scrollButtonTip);
-    btn_down->setToolTip(nextEntryTip);
-    btn_up->setToolTip(previousEntryTip);
+void CScrollerWidgetSet::setToolTips(const QString & nextEntryTip,
+                                     const QString & scrollButtonTip,
+                                     const QString & previousEntryTip)
+{
+    m_scrollButton->setToolTip(scrollButtonTip);
+    m_buttonDown->setToolTip(nextEntryTip);
+    m_buttonUp->setToolTip(previousEntryTip);
 }
 
 
-void CScrollerWidgetSet::wheelEvent( QWheelEvent* e ) {
+void CScrollerWidgetSet::wheelEvent(QWheelEvent * e) {
     /**
     * The problem is, that wheel events do everytime have the delta value 120
     */
-    const int vchange = ((e->delta() > 0) ? (-1) : (1));
+    const int vchange = ((e->delta() > 0) ? -1 : 1);
 
-    if (vchange != 0) {//do not emit a change with value 0
+    if (vchange != 0) { // Do not emit a change with value 0
         emit change(vchange);
         e->accept();
-    }
-    else {
+    } else {
         e->ignore();
     }
 }
@@ -81,15 +86,19 @@ void CScrollerWidgetSet::wheelEvent( QWheelEvent* e ) {
 void CScrollerWidgetSet::slotLock() {
     emit scroller_pressed();
 }
+
 void CScrollerWidgetSet::slotUnlock() {
     emit scroller_released();
 }
+
 void CScrollerWidgetSet::slotScroller(int n) {
     emit change(n);
 }
+
 void CScrollerWidgetSet::slotUpClick() {
     slotScroller(-1);
 }
+
 void CScrollerWidgetSet::slotDownClick() {
     slotScroller(1);
 }
diff --git a/src/frontend/keychooser/cscrollerwidgetset.h b/src/frontend/keychooser/cscrollerwidgetset.h
index f2ae643..2894928 100644
--- a/src/frontend/keychooser/cscrollerwidgetset.h
+++ b/src/frontend/keychooser/cscrollerwidgetset.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -21,51 +23,53 @@ class QVBoxLayout;
 /**
  * This class implements the Scroller Widget-set, which
  * consists of two normal ref @QToolButton and a enhanced @ref CScrollButton
- *
-  * @author The BibleTime team
-  */
-class CScrollerWidgetSet : public QWidget {
-        Q_OBJECT
-
-    public:
-        CScrollerWidgetSet(QWidget *parent = 0);
-
-        /**
-        * Sets the tooltips for the given entries using the parameters as text.
-        */
-        void setToolTips( const QString nextEntry, const QString scrollButton, const QString previousEntry);
-
-    signals:
-        /**
-        * Is emitted to proceed to some other entry relative to the
-        * current, indicated by the int value.
-        * \param count offset to change to
-        */
-        void change(int count);
-
-        /**
-        * These emit when the scroll button is pressed or released
-        */
-        void scroller_pressed();
-        void scroller_released();
-
-    protected:
-
-        virtual void wheelEvent( QWheelEvent* e );
-
-        QToolButton* btn_up;
-        QToolButton* btn_down;
-        CScrollButton* btn_fx;
-
-    protected slots:
-        void slotLock();
-        void slotUnlock();
-        void slotUpClick();
-        void slotDownClick();
-        void slotScroller(int);
-
-    private:
-        QVBoxLayout *m_layout;
+ */
+class CScrollerWidgetSet: public QWidget {
+
+    Q_OBJECT
+
+public: /* Methods: */
+
+    CScrollerWidgetSet(QWidget * parent = 0);
+
+    /**
+    * Sets the tooltips for the given entries using the parameters as text.
+    */
+    void setToolTips(const QString & nextEntry,
+                     const QString & scrollButton,
+                     const QString & previousEntry);
+
+signals:
+
+    /**
+    * Is emitted to proceed to some other entry relative to the
+    * current, indicated by the int value.
+    * \param count offset to change to
+    */
+    void change(int count);
+
+    void scroller_pressed();
+
+    void scroller_released();
+
+protected: /* Methods: */
+
+    virtual void wheelEvent(QWheelEvent * e);
+
+protected slots:
+
+    void slotLock();
+    void slotUnlock();
+    void slotUpClick();
+    void slotDownClick();
+    void slotScroller(int);
+
+private: /* Fields: */
+
+    QVBoxLayout * m_layout;
+    QToolButton * m_buttonUp;
+    QToolButton * m_buttonDown;
+    CScrollButton * m_scrollButton;
 
 };
 
diff --git a/src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp b/src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp
index 5feb371..2ac2574 100644
--- a/src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp
+++ b/src/frontend/keychooser/versekeychooser/btbiblekeywidget.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -21,11 +21,12 @@
 #include <QStringList>
 #include <QToolButton>
 #include "backend/keys/cswordversekey.h"
+#include "bibletimeapp.h"
 #include "frontend/keychooser/cscrollerwidgetset.h"
 #include "frontend/keychooser/versekeychooser/btdropdownchooserbutton.h"
 #include "util/btsignal.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
+#include "util/geticon.h"
 
 
 class BtLineEdit : public QLineEdit {
@@ -52,16 +53,13 @@ BtBibleKeyWidget::BtBibleKeyWidget(const CSwordBibleModuleInfo *mod,
 {
     Q_UNUSED(name);
 
-    namespace DU = util::directory;
-
-
     updatelock = false;
     m_module = mod;
 
     setFocusPolicy(Qt::WheelFocus);
 
     QToolButton* clearRef = new QToolButton(this);
-    clearRef->setIcon(DU::getIcon("edit_clear_locationbar"));
+    clearRef->setIcon(util::getIcon("edit_clear_locationbar"));
     clearRef->setAutoRaise(true);
     clearRef->setStyleSheet("QToolButton{margin:0px;}");
     connect(clearRef, SIGNAL(clicked()), SLOT(slotClearRef()) );
@@ -138,7 +136,7 @@ BtBibleKeyWidget::BtBibleKeyWidget(const CSwordBibleModuleInfo *mod,
     connect(m_verseScroller, SIGNAL(change(int)), SLOT(slotStepVerse(int)));
     connect(m_verseScroller, SIGNAL(scroller_pressed()), SLOT(slotUpdateLock()));
     connect(m_verseScroller, SIGNAL(scroller_released()), SLOT(slotUpdateUnlock()));
-    bool ok = connect(m_key->signaler(), SIGNAL(changed()), this, SLOT(updateText()));
+    bool ok = connect(m_key->afterChangedSignaller(), SIGNAL(signal()), this, SLOT(updateText()));
     Q_ASSERT(ok);
 
     setKey(key);    // The order of these two functions is important.
@@ -287,7 +285,7 @@ void BtBibleKeyWidget::slotChangeVerse(int n) {
         emit beforeChange(m_key);
         m_key->emitBeforeChanged();
         m_key->setVerse(n);
-        m_key->emitChanged();
+        m_key->emitAfterChanged();
         setKey( m_key );
     }
     if (!updatelock) emit changed(m_key);
@@ -298,7 +296,7 @@ void BtBibleKeyWidget::slotChangeChapter(int n) {
         emit beforeChange(m_key);
         m_key->emitBeforeChanged();
         m_key->setChapter(n);
-        m_key->emitChanged();
+        m_key->emitAfterChanged();
         setKey( m_key );
     }
     if (!updatelock)
@@ -310,7 +308,7 @@ void BtBibleKeyWidget::slotChangeBook(QString bookname) {
         emit beforeChange(m_key);
         m_key->emitBeforeChanged();
         m_key->book( bookname );
-        m_key->emitChanged();
+        m_key->emitAfterChanged();
         setKey( m_key );
     }
     if (!updatelock)
diff --git a/src/frontend/keychooser/versekeychooser/btbiblekeywidget.h b/src/frontend/keychooser/versekeychooser/btbiblekeywidget.h
index 644bc75..7d94c94 100644
--- a/src/frontend/keychooser/versekeychooser/btbiblekeywidget.h
+++ b/src/frontend/keychooser/versekeychooser/btbiblekeywidget.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp b/src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp
index 8030aaf..70f800a 100644
--- a/src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp
+++ b/src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.h b/src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.h
index bdd56da..646b7ef 100644
--- a/src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.h
+++ b/src/frontend/keychooser/versekeychooser/btdropdownchooserbutton.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/keychooser/versekeychooser/btversekeymenu.cpp b/src/frontend/keychooser/versekeychooser/btversekeymenu.cpp
index ac94299..9a8d35e 100644
--- a/src/frontend/keychooser/versekeychooser/btversekeymenu.cpp
+++ b/src/frontend/keychooser/versekeychooser/btversekeymenu.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -25,13 +25,15 @@ BtVerseKeyMenu::BtVerseKeyMenu(QWidget* parent)
 
 void BtVerseKeyMenu::startFirstClickDelayTimer() {
     m_firstClickLock = true;
-    killTimer(m_timerId);
+    if (m_timerId)
+        killTimer(m_timerId);
     m_timerId = startTimer(300);
 }
 
 void BtVerseKeyMenu::timerEvent(QTimerEvent* e) {
     if (e->timerId() == m_timerId) {
-        killTimer(m_timerId);
+        if (m_timerId)
+            killTimer(m_timerId);
         m_firstClickLock = false;
     }
     else {
diff --git a/src/frontend/keychooser/versekeychooser/btversekeymenu.h b/src/frontend/keychooser/versekeychooser/btversekeymenu.h
index 343277c..18caab5 100644
--- a/src/frontend/keychooser/versekeychooser/btversekeymenu.h
+++ b/src/frontend/keychooser/versekeychooser/btversekeymenu.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/keychooser/versekeychooser/cbiblekeychooser.cpp b/src/frontend/keychooser/versekeychooser/cbiblekeychooser.cpp
index 358c9c4..e481020 100644
--- a/src/frontend/keychooser/versekeychooser/cbiblekeychooser.cpp
+++ b/src/frontend/keychooser/versekeychooser/cbiblekeychooser.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -20,11 +20,12 @@
 #include "util/cresmgr.h"
 
 
-CBibleKeyChooser::CBibleKeyChooser(
-        const QList<const CSwordModuleInfo*> &modules,
-        BTHistory *historyPtr, CSwordKey *key, QWidget *parent)
-        : CKeyChooser(modules, historyPtr, key, parent),
-          m_key(dynamic_cast<CSwordVerseKey*>(key))
+CBibleKeyChooser::CBibleKeyChooser(const QList<const CSwordModuleInfo *> & modules,
+                                   BTHistory * historyPtr,
+                                   CSwordKey * key,
+                                   QWidget * parent)
+    : CKeyChooser(modules, historyPtr, parent)
+    , m_key(dynamic_cast<CSwordVerseKey *>(key))
 {
     typedef CSwordBibleModuleInfo CSBMI;
 
@@ -126,7 +127,7 @@ void CBibleKeyChooser::updateKey(CSwordKey* /*key*/) {
 
 void CBibleKeyChooser::adjustFont() {}
 
-void CBibleKeyChooser::setKey(QString& newKey) {
+void CBibleKeyChooser::setKey(const QString & newKey) {
     m_key->setKey(newKey);
     setKey(m_key);
 }
diff --git a/src/frontend/keychooser/versekeychooser/cbiblekeychooser.h b/src/frontend/keychooser/versekeychooser/cbiblekeychooser.h
index d2c5363..91ad265 100644
--- a/src/frontend/keychooser/versekeychooser/cbiblekeychooser.h
+++ b/src/frontend/keychooser/versekeychooser/cbiblekeychooser.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -70,10 +72,8 @@ class CBibleKeyChooser : public CKeyChooser  {
         void refreshContent();
 
     protected slots:
-        /**
-          Reimplemented from CKeyChooser::setModules().
-        */
-        virtual void setKey(QString& newKey);
+
+        virtual void setKey(const QString & newKey);
 
     private:
         BtBibleKeyWidget* w_ref;
diff --git a/src/util/dialogutil.cpp b/src/frontend/messagedialog.cpp
index 661e314..f064f06 100644
--- a/src/util/dialogutil.cpp
+++ b/src/frontend/messagedialog.cpp
@@ -2,19 +2,20 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
 
-#include "util/dialogutil.h"
+#include "messagedialog.h"
 
-#include <QMessageBox>
+#include <QAction>
 #include <QDialogButtonBox>
+#include <QMessageBox>
 #include <QPushButton>
-#include <QDebug>
 
-namespace util {
+
+namespace message {
 
 namespace {
 
@@ -46,6 +47,13 @@ QMessageBox::StandardButton bt_messageBox(QMessageBox::Icon icon,
 
 } // anonymous namespace
 
+void setQActionCheckedNoTrigger(QAction * const action, const bool checked) {
+    Q_ASSERT(action);
+    const bool signalsWereBlocked = action->blockSignals(true);
+    action->setChecked(checked);
+    action->blockSignals(signalsWereBlocked);
+}
+
 void prepareDialogBox(QDialogButtonBox *box) {
     replaceText(box, QDialogButtonBox::Ok      , QPushButton::tr("OK"        , "Dialog Button"));
     replaceText(box, QDialogButtonBox::Open    , QPushButton::tr("Open"      , "Dialog Button"));
@@ -80,4 +88,4 @@ QMessageBox::StandardButton showQuestion(QWidget * parent, const QString & title
     return bt_messageBox(QMessageBox::Question, parent, title, text, buttons, defaultButton);
 }
 
-} // namespace util
+} // namespace message
diff --git a/src/util/dialogutil.h b/src/frontend/messagedialog.h
index ea597cb..3f1a34b 100644
--- a/src/util/dialogutil.h
+++ b/src/frontend/messagedialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -12,20 +14,28 @@
 
 #include <QMessageBox>
 
+class QAction;
 class QDialogButtonBox;
 
-namespace util {
+namespace message {
 
-/*
-* Translate standard buttons in a QDialogButtonBox. Check that all used buttons are translated
-* in the implementation.
+/**
+  Change the state of a QAction without triggering their signals.
+  \param action The QAction instance to set the state for.
+  \param[in] checked The new state.
+*/
+void setQActionCheckedNoTrigger(QAction * const action, const bool checked = true);
+
+/**
+  Translates standard buttons in a QDialogButtonBox.
 */
 void prepareDialogBox(QDialogButtonBox *box);
 
 /*
-* Use util::showWarning() etc. instead of QMessageBox static functions.
-* QMessageBox button texts are not translated trustworthily.
+  Use util::showWarning() etc. instead of QMessageBox static functions.
+  QMessageBox button texts are not translated trustworthily.
 */
+
 QMessageBox::StandardButton showWarning(QWidget * parent, const QString & title, const QString & text, QMessageBox::StandardButtons buttons = QMessageBox::Ok, QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
 
 QMessageBox::StandardButton showCritical(QWidget * parent, const QString & title, const QString & text, QMessageBox::StandardButtons buttons = QMessageBox::Ok, QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
@@ -34,6 +44,6 @@ QMessageBox::StandardButton showInformation(QWidget * parent, const QString & ti
 
 QMessageBox::StandardButton showQuestion(QWidget * parent, const QString & title, const QString & text, QMessageBox::StandardButtons buttons = QMessageBox::Ok, QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
 
-} // namespace util
+} // namespace message
 
 #endif
diff --git a/src/frontend/profile/cprofile.cpp b/src/frontend/profile/cprofile.cpp
deleted file mode 100644
index b1eca08..0000000
--- a/src/frontend/profile/cprofile.cpp
+++ /dev/null
@@ -1,380 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#include "frontend/profile/cprofile.h"
-
-#include <QDomDocument>
-#include <QFile>
-#include <QString>
-#include <QTextStream>
-#include "util/directory.h"
-
-
-#define CURRENT_SYNTAX_VERSION 3
-
-namespace Profile {
-
-CProfile::CProfile( const QString& file, const QString& name )
-        : m_name(name.isEmpty() ? QObject::tr("unknown") : name),
-        m_filename(file),
-        m_mdiArrangementMode((CMDIArea::MDIArrangementMode)0) { //0 is not a valid enum entry, means "unknown"
-    namespace DU = util::directory;
-
-    if (!m_filename.isEmpty() && name.isEmpty()) {
-        loadBasics();
-    }
-    else if (m_filename.isEmpty() && !name.isEmpty()) {
-        m_filename = name;
-        m_filename.replace(QRegExp("\\s=#."), "_");
-        m_filename = DU::getUserSessionsDir().absolutePath() + "/"  + m_filename + ".xml";
-        init(m_filename);
-    }
-    else {
-        qWarning("CProfile: empty file name!");
-    }
-}
-
-CProfile::~CProfile() {
-    qDeleteAll(m_profileWindows); //there's no autodelete feature in qt4
-    m_profileWindows.clear();  //delete all CProfileWindows objects
-}
-
-/** Loads the profile from the file given in the constructor. */
-QList<CProfileWindow*> CProfile::load() {
-    QFile file(m_filename);
-    if (!file.exists()) {
-        //qWarning() << "Standard profile not found at filename " << m_filename;
-        return QList<CProfileWindow*>();
-    }
-
-    QDomDocument doc;
-    if (file.open(QIODevice::ReadOnly)) {
-        QTextStream t( &file );
-        t.setCodec("UTF-8");
-        doc.setContent(t.readAll());
-        file.close();
-    }
-
-    QDomElement document = doc.documentElement();
-    if ( document.tagName() != "BibleTimeProfile" && document.tagName() != "BibleTime" ) { //BibleTime was used in syntax version 1.0
-        qWarning("CProfile::load: Missing BibleTime doc");
-        return m_profileWindows;
-    }
-    if (document.hasAttribute("name")) {
-        m_name = document.attribute("name");
-    }
-
-    //load settings of the main window
-    {
-        // see if there's a section with the name MAINWINDOW
-        QDomElement elem = document.firstChild().toElement();
-        QDomElement mainWindow;
-        while (!elem.isNull()) {
-            if (elem.tagName() == "MAINWINDOW") {
-                mainWindow = elem;
-                break; //found the element
-            }
-            elem = elem.nextSibling().toElement();
-        }
-        if (!mainWindow.isNull()) { //was found
-
-            QByteArray bgeometry;
-            bgeometry += mainWindow.attribute("geometry");
-            setMainwindowGeometry(QByteArray::fromHex(bgeometry));
-
-            QByteArray bstate;
-            bstate += mainWindow.attribute("state");
-            setMainwindowState(QByteArray::fromHex(bstate));
-
-            QDomElement mdi_element = mainWindow.namedItem("MDI").toElement();
-            if (!mdi_element.isNull()) {
-                if (mdi_element.hasAttribute("ArrangementMode")) {
-                    this->setMDIArrangementMode((CMDIArea::MDIArrangementMode)mdi_element.attribute("ArrangementMode").toInt());
-                }
-            }
-        }
-    }
-
-    m_profileWindows.clear();
-    QDomElement elem = document.firstChild().toElement();
-    while (!elem.isNull()) {
-        CProfileWindow* p = 0;
-        if (elem.tagName() == "BIBLE") {
-            p = new CProfileWindow(CSwordModuleInfo::Bible);
-        }
-        else if (elem.tagName() == "COMMENTARY") {
-            p = new CProfileWindow(CSwordModuleInfo::Commentary);
-        }
-        else if (elem.tagName() == "LEXICON") {
-            p = new CProfileWindow(CSwordModuleInfo::Lexicon);
-        }
-        else if (elem.tagName() == "BOOK") {
-            p = new CProfileWindow(CSwordModuleInfo::GenericBook);
-        }
-
-        if (p) {
-            m_profileWindows.append(p);
-
-            if (elem.hasAttribute("windowSettings")) {
-                p->windowSettings = elem.attribute("windowSettings").toInt();
-            }
-            if (elem.hasAttribute("writeWindowType")) {
-                p->writeWindowType = elem.attribute("writeWindowType").toInt();
-            }
-            if (elem.hasAttribute("hasFocus")) {
-                p->hasFocus = elem.attribute("hasFocus").toInt();
-            }
-
-            QRect rect;
-
-            QDomElement object = elem.namedItem("GEOMETRY").toElement();
-            if (!object.isNull()) {
-                if (object.hasAttribute("x")) {
-                    rect.setX(object.attribute("x").toInt());
-                }
-                if (object.hasAttribute("y")) {
-                    rect.setY(object.attribute("y").toInt());
-                }
-                if (object.hasAttribute("width")) {
-                    rect.setWidth(object.attribute("width").toInt());
-                }
-                if (object.hasAttribute("height")) {
-                    rect.setHeight(object.attribute("height").toInt());
-                }
-                if (object.hasAttribute("isMaximized")) {
-                    p->maximized = object.attribute("isMaximized").toInt();
-                }
-            }
-            p->windowGeometry = rect;
-
-            object = elem.namedItem("MODULES").toElement();
-            if (!object.isNull()) {
-                if (object.hasAttribute("list")) {
-                    const QString sep = object.hasAttribute("separator") ? object.attribute("separator") : "|";
-                    p->modules = object.attribute("list").split(sep);
-                }
-            }
-
-            object = elem.namedItem("KEY").toElement();
-            if (!object.isNull()) {
-                if (object.hasAttribute("name"))
-                    p->key = object.attribute("name");
-            }
-
-            object = elem.namedItem("SCROLLBARS").toElement();
-            if (!object.isNull()) {
-                p->scrollbarPosH = object.hasAttribute("horizontal")
-                                   ? object.attribute("horizontal").toInt()
-                                   : 0;
-                p->scrollbarPosV = object.hasAttribute("vertical")
-                                   ? object.attribute("vertical").toInt()
-                                   : 0;
-            }
-        }
-        elem = elem.nextSibling().toElement();
-    }
-
-    // Are any windows maximized?
-    bool maximized = false;
-    for (int i = 0; i < m_profileWindows.count(); i++) {
-        if (m_profileWindows.at(i)->maximized)
-            maximized = true;
-    }
-    // Set all windows the same for maximized
-    for (int i = 0; i < m_profileWindows.count(); i++) {
-        m_profileWindows.at(i)->maximized = maximized;
-    }
-
-    return m_profileWindows;
-}
-
-/** Saves the profile to the file given in the constructor. */
-bool CProfile::save(QList<CProfileWindow*> windows) {
-    /** Save the settings using a XML file
-    * Save the CProfileWindow objects using a XML file which name is in m_filename
-    */
-    bool ret = false;
-    QDomDocument doc("DOC");
-    doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
-
-    QDomElement content = doc.createElement("BibleTimeProfile");
-    content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION);
-    content.setAttribute("name", m_name);
-    doc.appendChild(content);
-
-    //save mainwindow settings
-    {
-        QDomElement mainWindow = doc.createElement("MAINWINDOW");
-
-        QString sgeometry = QString(getMainwindowGeometry().toHex());
-        mainWindow.setAttribute("geometry", sgeometry);
-
-        QString sstate = QString(getMainwindowState().toHex());
-        mainWindow.setAttribute("state", sstate);
-
-        QDomElement mdi = doc.createElement("MDI");
-        mainWindow.appendChild(mdi);
-        mdi.setAttribute("ArrangementMode", static_cast<int>(this->getMDIArrangementMode()));
-
-        content.appendChild(mainWindow);
-    }
-
-    //for (CProfileWindow* p = windows.first(); p; p = windows.next()) {
-    foreach(CProfileWindow* p, windows) {
-        QDomElement window;
-        switch (p->type) {
-            case CSwordModuleInfo::Bible:
-                window = doc.createElement("BIBLE");
-                break;
-            case CSwordModuleInfo::Commentary:
-                window = doc.createElement("COMMENTARY");
-                break;
-            case CSwordModuleInfo::Lexicon:
-                window = doc.createElement("LEXICON");
-                break;
-            case CSwordModuleInfo::GenericBook:
-                window = doc.createElement("BOOK");
-                break;
-            default:
-                break;
-        }
-        if (window.isNull())
-            break;
-        window.setAttribute("windowSettings", p->windowSettings);
-        window.setAttribute("writeWindowType", p->writeWindowType);
-        window.setAttribute("hasFocus", p->hasFocus);
-
-        //save geomtery
-        const QRect & r = p->windowGeometry;
-        QDomElement geometry = doc.createElement("GEOMETRY");
-        geometry.setAttribute("x", r.x());
-        geometry.setAttribute("y", r.y());
-        geometry.setAttribute("width", r.width());
-        geometry.setAttribute("height", r.height());
-        geometry.setAttribute("isMaximized", static_cast<int>(p->maximized));
-        window.appendChild( geometry );
-
-        QDomElement modules = doc.createElement("MODULES");
-        modules.setAttribute("separator", "|");
-        modules.setAttribute("list", p->modules.join("|"));
-        window.appendChild( modules );
-
-        QDomElement key = doc.createElement("KEY");
-        key.setAttribute("name", p->key);
-        window.appendChild( key );
-
-        QDomElement scrollbars = doc.createElement("SCROLLBARS");
-        scrollbars.setAttribute("horizontal", p->scrollbarPosH);
-        scrollbars.setAttribute("vertical", p->scrollbarPosV);
-        window.appendChild( scrollbars );
-
-        content.appendChild( window );
-    }
-
-    QFile file(m_filename);
-    if ( file.open(QIODevice::WriteOnly) ) {
-        ret = true;
-        QTextStream t( &file );
-        t.setCodec("UTF-8");
-        t << doc.toString();
-        file.close();
-    }
-    else
-        ret = false;
-
-    return ret;
-}
-
-/** Saves the profile to the file given in the constructor. */
-bool CProfile::save() {
-    return save(m_profileWindows);
-}
-
-/** Initializes the XML for the first time (use to create a new profile) */
-void CProfile::init(const QString file) {
-    const QString oldFile = m_filename;
-    m_filename = file;
-    save(QList<CProfileWindow*>());
-    m_filename = oldFile;
-}
-
-/** Changes the name of this profile. */
-void CProfile::setName( const QString& newName ) {
-    m_name = newName;
-    saveBasics(); //save chanegd name
-}
-
-/** Loads the basic settings requires for proper operation. */
-void CProfile::loadBasics() {
-    QFile file(m_filename);
-    if (!file.exists())
-        return;
-
-    QDomDocument doc;
-    if (file.open(QIODevice::ReadOnly)) {
-        QTextStream t( &file );
-        t.setCodec("UTF-8");
-        doc.setContent(t.readAll());
-        file.close();
-    }
-    QDomElement document = doc.documentElement();
-    if (document.hasAttribute("name"))
-        m_name = document.attribute("name");
-}
-
-void CProfile::saveBasics() {
-    QFile file(m_filename);
-    if (!file.exists())
-        return;
-
-    QDomDocument doc;
-    if (file.open(QIODevice::ReadOnly)) {
-        QTextStream t(&file);
-        t.setCodec("UTF-8");
-        doc.setContent(t.readAll());
-        file.close();
-    }
-
-    QDomElement document = doc.documentElement();
-    document.setAttribute("name", m_name);
-
-    if (file.open(QIODevice::WriteOnly)) {
-        QTextStream t( &file );
-        t.setCodec("UTF-8");
-        t << doc.toString();
-        file.close();
-    }
-}
-
-void CProfile::setMDIArrangementMode(const CMDIArea::MDIArrangementMode newArrangementMode) {
-    m_mdiArrangementMode = newArrangementMode;
-}
-
-CMDIArea::MDIArrangementMode CProfile::getMDIArrangementMode(void) {
-    return m_mdiArrangementMode;
-}
-
-void CProfile::setMainwindowGeometry(const QByteArray& geometry) {
-    m_mainwindowGeometry = geometry;
-}
-
-QByteArray CProfile::getMainwindowGeometry() {
-    return m_mainwindowGeometry;
-}
-
-void CProfile::setMainwindowState(const QByteArray& state) {
-    m_mainwindowState = state;
-}
-
-QByteArray CProfile::getMainwindowState() {
-    return m_mainwindowState;
-}
-
-
-} //end of namespace Profile
diff --git a/src/frontend/profile/cprofile.h b/src/frontend/profile/cprofile.h
deleted file mode 100644
index 654160e..0000000
--- a/src/frontend/profile/cprofile.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#ifndef CPROFILE_H
-#define CPROFILE_H
-
-#include <QByteArray>
-#include <QList>
-#include "frontend/cmdiarea.h"
-#include "frontend/profile/cprofilewindow.h"
-
-
-namespace Profile {
-
-/** Manages one profile file. Provides functions to save and restore settings of the available display windows.
-  * @author The BibleTime team
-  */
-class CProfile {
-    public:
-        CProfile(const QString& fileName, const QString& name = QString::null);
-        ~CProfile();
-
-        /**
-        * Saves the profile to the file given in the constructor.
-        * @param windows The list of windows available in the profile.
-        */
-        bool save( QList<CProfileWindow*> windows );
-        /**
-        * Saves the profile to the file given in the constructor.
-        */
-        bool save();
-        /**
-        * Loads the profile from the file given in the constructor.
-        * @return The list of profiled window which exist in the profile.
-        */
-        QList<CProfileWindow*> load();
-        /**
-        * Returns the name of this profile.
-        */
-        inline const QString &name() const {
-            return m_name;
-        }
-        /**
-        * Returns the filename used for this profile.
-        */
-        inline const QString &filename() const {
-            return m_filename;
-        }
-        /**
-        * Initializes the XML for the first time (use to create a new profile)
-        */
-        void init(const QString);
-        /**
-        * Chnages the name of this profile.
-        */
-        void setName( const QString& );
-        /**
-        * Returns true if the main window was maximized as the profile was saved.
-        */
-        bool maximized() const;
-        /**
-        * Set the parameter to true if the main window is maximized.
-        */
-        void setMaximized( const bool maximized );
-        /**
-        * Sets the MDI arrangement mode
-        */
-        void setMDIArrangementMode(const CMDIArea::MDIArrangementMode);
-        /**
-        * Returns mdi arrangement mode
-        */
-        CMDIArea::MDIArrangementMode getMDIArrangementMode(void);
-        /**
-        * set mainwindow saveGeometry - size and position of window
-        */
-        void setMainwindowGeometry(const QByteArray& geometry);
-        /**
-         * Return mainwindow saveGeometry - size and position of window
-        */
-        QByteArray getMainwindowGeometry();
-        /**
-        * set mainwindow saveState - position of docking windows and toolbar
-        */
-        void setMainwindowState(const QByteArray& state);
-        /**
-         * Return mainwindow saveState - position of docking windows and toolbar
-        */
-        QByteArray getMainwindowState();
-
-    private:
-        /**
-        * Loads the basic settings requires for proper operation.
-        */
-        void loadBasics();
-        void saveBasics();
-
-        QList<CProfileWindow*> m_profileWindows;
-        QString m_name;
-        QString m_filename;
-        CMDIArea::MDIArrangementMode m_mdiArrangementMode;
-        QByteArray m_mainwindowGeometry;
-        QByteArray m_mainwindowState;
-};
-
-} //end of namespace Profile
-
-#endif
diff --git a/src/frontend/profile/cprofilemgr.cpp b/src/frontend/profile/cprofilemgr.cpp
deleted file mode 100644
index 4b8bcc3..0000000
--- a/src/frontend/profile/cprofilemgr.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#include "frontend/profile/cprofilemgr.h"
-
-#include <QDir>
-#include <QFile>
-#include <QList>
-#include "util/directory.h"
-
-
-namespace Profile {
-
-CProfileMgr::CProfileMgr() : m_startupProfile(0) {
-    namespace DU = util::directory;
-
-    //m_profiles.setAutoDelete(true);
-
-    m_profilePath = DU::getUserSessionsDir().absolutePath() + "/";
-
-    QDir d( m_profilePath );
-    QStringList files = d.entryList(QStringList("*.xml"));
-    for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) {
-        if ((*it) != "_startup_.xml") {
-            m_profiles.append(new CProfile(m_profilePath + *it));
-        }
-        else {
-            m_startupProfile = new CProfile(m_profilePath + *it);
-        }
-    }
-}
-
-CProfileMgr::~CProfileMgr() {
-    qDeleteAll(m_profiles);
-    m_profiles.clear();
-    delete m_startupProfile;
-}
-
-/** Creates a new profile with the name "name" (first parameter).  @return The profile object */
-CProfile *CProfileMgr::create(const QString &name) {
-    CProfile* p = new CProfile(QString::null, name);
-    m_profiles.append(p);
-
-    return p;
-}
-
-/** Removes the profile from the list and from the directory containg the profile files. */
-bool CProfileMgr::remove( CProfile* p ) {
-    bool ret = false;
-    QFile f( p->filename() );
-    if (f.exists())
-        f.remove();
-
-    int i = m_profiles.indexOf(p);
-    if (i != -1)
-        delete m_profiles.takeAt(i);
-
-    ret = true;
-    return ret;
-}
-
-bool CProfileMgr::remove( const QString& profile) {
-    bool ret = false;
-    QListIterator<CProfile*> it(m_profiles);
-    while (it.hasNext()) {
-        CProfile* p = it.next();
-        if (p->name() == profile) {
-            remove(p);
-            ret =  true;
-        }
-    }
-    return ret;
-}
-
-/** Returns the profile with the desired name. If there's no such profile 0 is returned. */
-CProfile * CProfileMgr::profile(const QString & name) const {
-    Q_FOREACH (CProfile * const p, m_profiles) {
-        if (p && p->name() == name)
-            return p;
-    }
-    return 0;
-}
-
-/** Returns the startup profile if it exists, otherwise return 0. */
-CProfile* CProfileMgr::startupProfile() {
-    if (!m_startupProfile) {
-        m_startupProfile = new CProfile(QString::null, "_startup_");
-    }
-
-    return m_startupProfile;
-}
-
-/** Refreshes the profiles available on disk. Use this function to update the list of profiles after another instance of CProfileMgr created a new profile. */
-void CProfileMgr::refresh() {
-    qDeleteAll(m_profiles);
-    m_profiles.clear(); //delete all profiles
-    QDir d( m_profilePath );
-    QStringList files = d.entryList(QStringList("*.xml"));
-    for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) {
-        CProfile p(m_profilePath + *it);
-        if (p.name() == "_startup_") { //new startup profile
-            if  (!m_startupProfile) { //don't put this in the if clause above,it doesn't work!
-                m_startupProfile = new CProfile(m_profilePath + *it);
-            }
-        }
-        else if (!profile(p.name())) { //don't have it already
-            m_profiles.append(new CProfile(m_profilePath + *it));
-        }
-    }
-}
-
-} //end of namespace Profile
diff --git a/src/frontend/profile/cprofilemgr.h b/src/frontend/profile/cprofilemgr.h
deleted file mode 100644
index 00bb321..0000000
--- a/src/frontend/profile/cprofilemgr.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#ifndef CPROFILEMGR_H
-#define CPROFILEMGR_H
-
-#include <QList>
-#include <QString>
-#include "frontend/profile/cprofile.h"
-
-
-namespace Profile {
-/** The manager for profiles.
- * Provides functions to create, delete, save and load profiles.
- * @author The BibleTime team
- */
-class CProfileMgr {
-    public:
-        CProfileMgr();
-        ~CProfileMgr();
-
-        /** Creates a new profile with the name "name" (first parameter).
-        * @return The profile object
-        */
-        CProfile *create(const QString &name);
-        /**
-        * @return a list of available profiles
-        */
-        inline const QList<CProfile*> &profiles() const {
-            return m_profiles;
-        }
-        /**
-        * Removes the profile from the list and from the directory containg the profile files.
-        */
-        bool remove( CProfile* p );
-        /**
-        * Removes the profile from the list and from the directory containg the profile files.
-        */
-        bool remove( const QString& );
-        /**
-        * Returns the profile with the desired name. If there's no such profile 0 is returned.
-        */
-        CProfile * profile(const QString & profileName) const;
-        /**
-        * Returns the startup profile if it exists, otherwise return 0.
-        */
-        CProfile* startupProfile();
-        /**
-        * Refreshes the profiles available on disk. Use this function to update the list of profiles after another instance of CProfileMgr created a new profile.
-        */
-        void refresh();
-
-    protected:
-        QList<CProfile*> m_profiles;
-        QString m_profilePath;
-        CProfile* m_startupProfile;
-};
-
-} //end of namespace Profile
-
-#endif
diff --git a/src/frontend/profile/cprofilewindow.cpp b/src/frontend/profile/cprofilewindow.cpp
deleted file mode 100644
index 682c99a..0000000
--- a/src/frontend/profile/cprofilewindow.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#include "frontend/profile/cprofilewindow.h"
-
-
-namespace Profile {
-
-CProfileWindow::CProfileWindow(CSwordModuleInfo::ModuleType t)
-    : type(t)
-    , windowGeometry()
-    , modules()
-    , key(QString::null)
-    , scrollbarPosH(0)
-    , scrollbarPosV(0)
-    , maximized(false)
-    , hasFocus(false)
-    , windowSettings(0)
-    , writeWindowType(0)
-{
-    // Intentionally empty
-}
-
-} //end of namespace Profile
diff --git a/src/frontend/profile/cprofilewindow.h b/src/frontend/profile/cprofilewindow.h
deleted file mode 100644
index 78d2b71..0000000
--- a/src/frontend/profile/cprofilewindow.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*********
-*
-* This file is part of BibleTime's source code, http://www.bibletime.info/.
-*
-* Copyright 1999-2011 by the BibleTime developers.
-* The BibleTime source code is licensed under the GNU General Public License version 2.0.
-*
-**********/
-
-#ifndef CPROFILEWINDOW_H
-#define CPROFILEWINDOW_H
-
-#include <QRect>
-#include <QString>
-#include <QStringList>
-#include "backend/drivers/cswordmoduleinfo.h"
-
-
-class CSwordModuleInfo;
-
-namespace Profile {
-
-/** Contains the settings for one window saved in the profile.
-  * @author The BibleTime team
-  */
-struct CProfileWindow {
-
-    CProfileWindow(CSwordModuleInfo::ModuleType type = CSwordModuleInfo::Unknown);
-
-    CSwordModuleInfo::ModuleType type;
-    QRect windowGeometry;
-    QStringList modules;
-    QString key;
-    int scrollbarPosH;
-    int scrollbarPosV;
-    bool maximized;
-    bool hasFocus;
-    int windowSettings;
-    int writeWindowType;
-
-};
-
-} //end of namespace Profile
-
-#endif
diff --git a/src/frontend/searchdialog/analysis/csearchanalysisdialog.cpp b/src/frontend/searchdialog/analysis/csearchanalysisdialog.cpp
index ece0ced..10e4566 100644
--- a/src/frontend/searchdialog/analysis/csearchanalysisdialog.cpp
+++ b/src/frontend/searchdialog/analysis/csearchanalysisdialog.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -18,7 +18,7 @@
 #include "backend/drivers/cswordmoduleinfo.h"
 #include "frontend/searchdialog/analysis/csearchanalysisscene.h"
 #include "frontend/searchdialog/analysis/csearchanalysisview.h"
-#include "util/dialogutil.h"
+#include "frontend/messagedialog.h"
 
 
 namespace Search {
@@ -59,7 +59,7 @@ void CSearchAnalysisDialog::initView() {
     m_buttonBox->setStandardButtons(QDialogButtonBox::Close);
     m_buttonBox->addButton(QDialogButtonBox::Save);
     //tr("Save as HTML"),
-    util::prepareDialogBox(m_buttonBox);
+    message::prepareDialogBox(m_buttonBox);
     vboxLayout->addWidget(m_buttonBox);
 
     bool ok = QObject::connect(m_buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
diff --git a/src/frontend/searchdialog/analysis/csearchanalysisdialog.h b/src/frontend/searchdialog/analysis/csearchanalysisdialog.h
index b4edcad..454e105 100644
--- a/src/frontend/searchdialog/analysis/csearchanalysisdialog.h
+++ b/src/frontend/searchdialog/analysis/csearchanalysisdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/searchdialog/analysis/csearchanalysisitem.cpp b/src/frontend/searchdialog/analysis/csearchanalysisitem.cpp
index 23b2962..c516184 100644
--- a/src/frontend/searchdialog/analysis/csearchanalysisitem.cpp
+++ b/src/frontend/searchdialog/analysis/csearchanalysisitem.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -17,6 +17,7 @@
 #include <QRect>
 #include "backend/drivers/cswordmoduleinfo.h"
 #include "frontend/searchdialog/analysis/csearchanalysisscene.h"
+#include "util/htmlescape.h"
 
 
 namespace Search {
@@ -61,17 +62,6 @@ CSearchAnalysisItem::~CSearchAnalysisItem() {
     delete m_bufferPixmap;
 }
 
-/** Sets the resultcount of this item for the given module */
-void CSearchAnalysisItem::setCountForModule( const int moduleIndex, const int count) {
-    m_resultCountArray[moduleIndex] = count;
-}
-
-/** Returns the resultcount of this item for the given module */
-int CSearchAnalysisItem::getCountForModule( const int moduleIndex) {
-    return m_resultCountArray[moduleIndex];
-}
-
-
 bool CSearchAnalysisItem::hasHitsInAnyModule() {
     foreach (const int hits, m_resultCountArray) {
         if (hits) return true;
@@ -142,33 +132,36 @@ int CSearchAnalysisItem::width() {
 /** Returns the tooltip for this item. */
 const QString CSearchAnalysisItem::getToolTip() {
     typedef CSwordModuleSearch::Results::const_iterator RCI;
+    using util::htmlEscape;
 
-    QString toolTipString = QString("<center><b>%1</b></center><hr/>").arg(m_bookName);
-    toolTipString += "<table cellspacing=\"0\" cellpadding=\"3\" width=\"100%\" height=\"100%\" align=\"center\">";
+    QString toolTipString("<center><b>");
+    toolTipString.append(htmlEscape(m_bookName)).append("</b></center><hr/>")
+                 .append("<table cellspacing=\"0\" cellpadding=\"3\" width=\"10"
+                         "0%\" height=\"100%\" align=\"center\">");
 
     /// \todo Fix that loop
     int i = 0;
-    for (RCI it = m_results.begin(); it != m_results.end(); it++) {
-        const CSwordModuleInfo *info = it.key();
-
-        /// \warning This is a workaround for sword constness
-        sword::ListKey &results = const_cast<sword::ListKey &>(it.value());
-
-        const QColor c = CSearchAnalysisScene::getColor(i);
-
-        toolTipString.append(
-            QString("<tr bgcolor=\"white\"><td><b><font color=\"%1\">%2</font></b></td><td>%3 (%4%)</td></tr>")
-            .arg(c.name())
-            .arg(info ? info->name() : QString::null)
-            .arg( m_resultCountArray[i] )
-            .arg( (info && m_resultCountArray[i]) ? ((double)m_resultCountArray[i] / (double)results.Count())*(double)100 : 0.0, 0, 'g', 2)
-        );
+    for (RCI it = m_results.begin(); it != m_results.end(); ++it) {
+        const CSwordModuleInfo * const info = it.key();
+
+        const int count = it.value().getCount();
+        const double percent = (info && count)
+                             ? ((static_cast<double>(m_resultCountArray.at(i))
+                                 * static_cast<double>(100.0))
+                                / static_cast<double>(count))
+                             : 0.0;
+        toolTipString.append("<tr bgcolor=\"white\"><td><b><font color=\"")
+                     .append(CSearchAnalysisScene::getColor(i).name()).append("\">")
+                     .append(info ? info->name() : QString::null)
+                     .append("</font></b></td><td>")
+                     .append(m_resultCountArray.at(i))
+                     .append(" (")
+                     .append(QString::number(percent, 'g', 2))
+                     .append("%)</td></tr>");
         ++i;
     }
 
-    toolTipString += "</table>";
-
-    return toolTipString;
+    return toolTipString.append("</table>");
 }
 
 }
diff --git a/src/frontend/searchdialog/analysis/csearchanalysisitem.h b/src/frontend/searchdialog/analysis/csearchanalysisitem.h
index 7db96a9..ec2cd03 100644
--- a/src/frontend/searchdialog/analysis/csearchanalysisitem.h
+++ b/src/frontend/searchdialog/analysis/csearchanalysisitem.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -27,15 +29,21 @@ class CSearchAnalysisItem : public QGraphicsRectItem {
                             const CSwordModuleSearch::Results &results);
 
         ~CSearchAnalysisItem();
+
         /**
-        * Sets the resultcount of this item
+          Sets the resultcount of this item.
         */
-        void setCountForModule( const int moduleIndex, const int count);
+        inline void setCountForModule(const int moduleIndex, const int count) {
+            m_resultCountArray[moduleIndex] = count;
+        }
 
         /**
-        * Returns the resultcount of this item
+          Returns the resultcount of this item.
         */
-        int getCountForModule( const int moduleIndex);
+        inline int getCountForModule(const int moduleIndex) const {
+            return m_resultCountArray[moduleIndex];
+        }
+
         /**
         * Does one of the modules contain hits?
         */
diff --git a/src/frontend/searchdialog/analysis/csearchanalysislegenditem.cpp b/src/frontend/searchdialog/analysis/csearchanalysislegenditem.cpp
index c5b9d02..e630846 100644
--- a/src/frontend/searchdialog/analysis/csearchanalysislegenditem.cpp
+++ b/src/frontend/searchdialog/analysis/csearchanalysislegenditem.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/searchdialog/analysis/csearchanalysislegenditem.h b/src/frontend/searchdialog/analysis/csearchanalysislegenditem.h
index 232fe64..f199aaf 100644
--- a/src/frontend/searchdialog/analysis/csearchanalysislegenditem.h
+++ b/src/frontend/searchdialog/analysis/csearchanalysislegenditem.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/searchdialog/analysis/csearchanalysisscene.cpp b/src/frontend/searchdialog/analysis/csearchanalysisscene.cpp
index a039e19..9b375e8 100644
--- a/src/frontend/searchdialog/analysis/csearchanalysisscene.cpp
+++ b/src/frontend/searchdialog/analysis/csearchanalysisscene.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -13,10 +13,12 @@
 #include <QFileDialog>
 #include <QHashIterator>
 #include <QTextCodec>
+#include <QTextDocument>
 #include "backend/keys/cswordversekey.h"
 #include "frontend/searchdialog/analysis/csearchanalysisitem.h"
 #include "frontend/searchdialog/analysis/csearchanalysislegenditem.h"
 #include "frontend/searchdialog/csearchdialog.h"
+#include "util/htmlescape.h"
 #include "util/tool.h"
 
 
@@ -88,7 +90,7 @@ void CSearchAnalysisScene::analyse(
     bool ok = true;
     while (ok && analysisItem) {
         moduleIndex = 0;
-        for (RCI it = m_results.begin(); it != m_results.end(); it++) {
+        for (RCI it = m_results.begin(); it != m_results.end(); ++it) {
             qApp->processEvents( QEventLoop::AllEvents );
             if (!m_lastPosList.contains(it.key())) {
                 m_lastPosList.insert(it.key(), 0);
@@ -120,7 +122,7 @@ void CSearchAnalysisScene::setResults(
     typedef CSwordModuleSearch::Results::const_iterator RCI;
 
     m_results.clear();
-    for (RCI it = results.begin(); it != results.end(); it++) {
+    for (RCI it = results.begin(); it != results.end(); ++it) {
         const CSwordModuleInfo *m = it.key();
         if ( (m->type() == CSwordModuleInfo::Bible) || (m->type() == CSwordModuleInfo::Commentary) ) { //a Bible or an commentary
             m_results.insert(m, it.value());
@@ -205,13 +207,12 @@ QColor CSearchAnalysisScene::getColor(int index) {
 unsigned int CSearchAnalysisScene::getCount(const QString &book,
                                             const CSwordModuleInfo* module)
 {
-    /// \warning This is a workaround for sword constness
-    sword::ListKey result = m_results[module];
+    const sword::ListKey & result = m_results[module];
 
     const int length = book.length();
     unsigned int i = m_lastPosList[module];
     unsigned int count = 0;
-    const unsigned int resultCount = result.Count();
+    const unsigned int resultCount = result.getCount();
     while (i < resultCount) {
         if (strncmp(book.toUtf8(), (const char *) *result.getElement(i), length))
             break;
@@ -223,67 +224,86 @@ unsigned int CSearchAnalysisScene::getCount(const QString &book,
 }
 
 void CSearchAnalysisScene::saveAsHTML() {
-    typedef CSwordModuleSearch::Results::const_iterator RCI;
-
-    const QString fileName = QFileDialog::getSaveFileName(0, tr("Save Search Analysis"), QString::null, tr("HTML files (*.html;*.HTML;*.HTM;*.htm)") );
-    if (fileName.isEmpty()) return;
-
-    int count = 0;
-    QString countStr = "";
-    QString m_searchAnalysisHTML = "";
-    QString tableTitle = "";
-    QString tableTotals = "";
-    QString VerseRange = "";
-    const QString txtCSS = QString("<style type=\"text/css\">\ntd {border:1px solid black;}\nth {font-size: 130%; text-align:left; vertical-align:top;}\n</style>\n");
-    const QString metaEncoding = QString("<META http-equiv=Content-Type content=\"text/html; charset=utf-8\">");
-    CSwordVerseKey key(0);
+    using util::htmlEscape;
 
-    key.setKey("Genesis 1:1");
-
-    CSearchAnalysisItem* analysisItem = m_itemList.value( key.book() );
-
-    QString text = "<html>\n<head>\n<title>" + tr("BibleTime Search Analysis") + "</title>\n" + txtCSS + metaEncoding + "</head>\n<body>\n";
-    text += "<table>\n<tr><th>" + tr("Search text :") + "</th><th>" + CSearchDialog::getSearchDialog()->searchText() + "</th></tr>\n";
-
-    tableTitle = "<tr><th align=\"left\">" + tr("Book") + "</th>";
-    tableTotals = "<tr><td align=\"left\">" + tr("Total hits") + "</td>";
-
-    for (RCI it = m_results.begin(); it != m_results.end(); it++) {
-        const CSwordModuleInfo *mod = it.key();
-        tableTitle += QString("<th align=\"left\">") + mod->name() + QString("</th>");
+    typedef CSwordModuleSearch::Results::const_iterator RCI;
 
-        /// \warning This is a workaround for sword constness
-        sword::ListKey searchResult = it.value();
-        countStr.setNum(searchResult.Count());
+    const QString fileName = QFileDialog::getSaveFileName(0,
+                                                          tr("Save Search Analysis"),
+                                                          QString::null,
+                                                          tr("XHTML files (*.html *.HTML *.HTM *.htm);;All files (*)"));
+    if (fileName.isEmpty())
+        return;
 
-        tableTotals += QString("<td align=\"right\">") + countStr + QString("</td>");
+    QString text("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+                 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" "
+                 "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"
+                 "<html xmlns=\"http://www.w3.org/1999/xhtml\"><head><title>");
+    {
+        const QString title(tr("BibleTime Search Analysis"));
+        text += title;
+        text += "</title>"
+                "<style type=\"text/css\">"
+                    "body{background-color:#fff;color:#000}"
+                    "table{border-collapse:collapse}"
+                    "td{border:1px solid #333}"
+                    "th{font-size:130%;text-align:left;vertical-align:top}"
+                    "td,th{text-align:left;padding:0.2em 0.5em}"
+                    ".r{text-align:right}"
+                "</style>"
+                "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>"
+            "</head><body><h1>";
+        text += title;
     }
-    tableTitle += QString("</tr>\n");
-    tableTotals += QString("</tr>\n");
-
-    m_searchAnalysisHTML = "";
-    bool ok = true;
-    while (ok) {
-        m_searchAnalysisHTML += QString("<tr><td>") + key.book() + QString("</td>");
-        analysisItem = m_itemList.value( key.book() );
+    text += "</h1><p><span style=\"font-weight:bold\">";
+    text += tr("Search text:");
+    text += "</span>&nbsp;";
+    text += htmlEscape(CSearchDialog::getSearchDialog()->searchText());
+    text += "</p><table><caption>";
+    text += tr("Results by work and book");
+    text += "</caption><tr><th>";
+    text += tr("Book");
+    text += "</th>";
+
+    for (RCI it = m_results.begin(); it != m_results.end(); ++it) {
+        text += "<th>";
+        text += htmlEscape(it.key()->name());
+        text += "</th>";
+    }
+    text += "</tr>";
 
-        int moduleIndex = 0;
-        for (RCI it = m_results.begin(); it != m_results.end(); it++) {
-            count = analysisItem->getCountForModule(moduleIndex);
-            countStr.setNum(count);
-            m_searchAnalysisHTML += QString("<td align=\"right\">") + countStr + QString("</td>");
+    CSwordVerseKey key(0);
+    key.setKey("Genesis 1:1");
 
-            ++moduleIndex;
+    do {
+        text += "<tr><td>";
+        const QString keyBook(key.book());
+        text += htmlEscape(keyBook);
+        text += "</td>";
+
+        int mi = 0; // Module index
+        for (RCI it = m_results.begin(); it != m_results.end(); ++it, ++mi) {
+            text += "<td class=\"r\">";
+            text += QString::number(m_itemList.value(keyBook)->getCountForModule(mi));
+            text += "</td>";
         }
-        m_searchAnalysisHTML += QString("</tr>\n");
-        ok = key.next(CSwordVerseKey::UseBook);
+        text += "</tr>";
+    } while (key.next(CSwordVerseKey::UseBook));
+    text += "<tr><th class=\"r\">";
+    text += tr("Total hits");
+    text += "</th>";
+
+    for (RCI it = m_results.begin(); it != m_results.end(); ++it) {
+        text += "<td class=\"r\">";
+        text += QString::number(it.value().getCount());
+        text += "</td>";
     }
 
-    text += QString("<table>\n") + tableTitle + tableTotals + m_searchAnalysisHTML + QString("</table>\n");
-    text += QString("<center>") + tr("Created by <a href=\"http://www.bibletime.info/\">BibleTime</a>") + QString("</center>");
-    text += QString("</body></html>");
+    text += "</tr></table><p style=\"text-align:center;font-size:x-small\">";
+    text += tr("Created by <a href=\"http://www.bibletime.info/\">BibleTime</a>");
+    text += "</p></body></html>";
 
-    util::tool::savePlainFile(fileName, text, false, QTextCodec::codecForName("UTF8"));
+    util::tool::savePlainFile(fileName, text, true, QTextCodec::codecForName("UTF8"));
 }
 
 void CSearchAnalysisScene::resizeHeight(int height) {
@@ -291,4 +311,4 @@ void CSearchAnalysisScene::resizeHeight(int height) {
     slotResized();
 }
 
-}
+} // namespace Search {
diff --git a/src/frontend/searchdialog/analysis/csearchanalysisscene.h b/src/frontend/searchdialog/analysis/csearchanalysisscene.h
index f8bb966..d1927d5 100644
--- a/src/frontend/searchdialog/analysis/csearchanalysisscene.h
+++ b/src/frontend/searchdialog/analysis/csearchanalysisscene.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/searchdialog/analysis/csearchanalysisview.cpp b/src/frontend/searchdialog/analysis/csearchanalysisview.cpp
index d177f63..277c1a3 100644
--- a/src/frontend/searchdialog/analysis/csearchanalysisview.cpp
+++ b/src/frontend/searchdialog/analysis/csearchanalysisview.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/searchdialog/analysis/csearchanalysisview.h b/src/frontend/searchdialog/analysis/csearchanalysisview.h
index 19d53c1..4b072f3 100644
--- a/src/frontend/searchdialog/analysis/csearchanalysisview.h
+++ b/src/frontend/searchdialog/analysis/csearchanalysisview.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/searchdialog/btsearchmodulechooserdialog.cpp b/src/frontend/searchdialog/btsearchmodulechooserdialog.cpp
index 1d5f556..a5bfd2c 100644
--- a/src/frontend/searchdialog/btsearchmodulechooserdialog.cpp
+++ b/src/frontend/searchdialog/btsearchmodulechooserdialog.cpp
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -43,10 +43,6 @@ BtSearchModuleChooserDialog::BtSearchModuleChooserDialog(QWidget *parent,
     retranslateUi();
 }
 
-BtSearchModuleChooserDialog::~BtSearchModuleChooserDialog() {
-    // Intentionally empty
-}
-
 void BtSearchModuleChooserDialog::retranslateUi() {
     setWindowTitle(tr("Works to Search in"));
     util::tool::initExplanationLabel(label(), QString::null,
diff --git a/src/frontend/searchdialog/btsearchmodulechooserdialog.h b/src/frontend/searchdialog/btsearchmodulechooserdialog.h
index 103682c..79802b5 100644
--- a/src/frontend/searchdialog/btsearchmodulechooserdialog.h
+++ b/src/frontend/searchdialog/btsearchmodulechooserdialog.h
@@ -4,7 +4,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License
 * version 2.0.
 *
@@ -26,7 +26,6 @@ class BtSearchModuleChooserDialog: public BtModuleChooserDialog {
     public:
         BtSearchModuleChooserDialog(QWidget *parent = 0,
                                     Qt::WindowFlags flags = 0);
-        ~BtSearchModuleChooserDialog();
 
         inline void setCheckedModules(const QSet<CSwordModuleInfo*> &modules) {
             bookshelfWidget()->treeModel()->setCheckedModules(modules);
diff --git a/src/frontend/searchdialog/btsearchoptionsarea.cpp b/src/frontend/searchdialog/btsearchoptionsarea.cpp
index 902666b..d850344 100644
--- a/src/frontend/searchdialog/btsearchoptionsarea.cpp
+++ b/src/frontend/searchdialog/btsearchoptionsarea.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,20 +16,25 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
-#include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
 #include "backend/bookshelfmodel/btbookshelftreemodel.h"
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
+#include "backend/managers/cswordbackend.h"
 #include "backend/drivers/cswordmoduleinfo.h"
+#include "bibletimeapp.h"
 #include "frontend/searchdialog/btsearchmodulechooserdialog.h"
 #include "frontend/searchdialog/btsearchsyntaxhelpdialog.h"
 #include "frontend/searchdialog/crangechooserdialog.h"
 #include "util/cresmgr.h"
+#include "util/geticon.h"
 #include "util/tool.h"
-#include "util/directory.h"
 
 
+namespace {
+const QString SearchTypeKey = "GUI/SearchDialog/searchType";
+} // anonymous namespace
+
 namespace Search {
 
 BtSearchOptionsArea::BtSearchOptionsArea(QWidget *parent )
@@ -57,10 +62,6 @@ BtSearchOptionsArea::SearchType BtSearchOptionsArea::searchType() {
     return BtSearchOptionsArea::FullType;
 }
 
-QPushButton* BtSearchOptionsArea::searchButton() const {
-    return m_searchButton;
-}
-
 void BtSearchOptionsArea::setSearchText(const QString& text) {
     bool found = false;
     int i = 0;
@@ -82,8 +83,6 @@ void BtSearchOptionsArea::setSearchText(const QString& text) {
 }
 
 void BtSearchOptionsArea::initView() {
-    namespace DU = util::directory;
-
     QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
     this->setSizePolicy(sizePolicy);
     hboxLayout = new QHBoxLayout(this);
@@ -103,17 +102,17 @@ void BtSearchOptionsArea::initView() {
 
     m_searchButton = new QPushButton(this);
     m_searchButton->setText(tr("&Search"));
-    m_searchButton->setIcon(DU::getIcon(CResMgr::searchdialog::icon));
+    m_searchButton->setIcon(util::getIcon(CResMgr::searchdialog::icon));
     m_searchButton->setToolTip(tr("Start to search the text in the chosen works"));
     gridLayout->addWidget(m_searchButton, 0, 2);
 
     m_chooseModulesButton = new QPushButton(tr("Ch&oose..."), searchGroupBox);
-    m_chooseModulesButton->setIcon(DU::getIcon(CResMgr::searchdialog::chooseworks_icon));
+    m_chooseModulesButton->setIcon(util::getIcon(CResMgr::searchdialog::chooseworks_icon));
     m_chooseModulesButton->setToolTip( tr("Choose works for the search"));
     gridLayout->addWidget(m_chooseModulesButton, 2, 2);
 
     m_chooseRangeButton = new QPushButton(tr("S&etup..."), searchGroupBox);
-    m_chooseRangeButton->setIcon(DU::getIcon(CResMgr::searchdialog::setupscope_icon));
+    m_chooseRangeButton->setIcon(util::getIcon(CResMgr::searchdialog::setupscope_icon));
     m_chooseRangeButton->setToolTip(tr("Configure predefined scopes for search"));
     gridLayout->addWidget(m_chooseRangeButton, 3, 2);
 
@@ -243,7 +242,7 @@ void BtSearchOptionsArea::setModules(const QList<const CSwordModuleInfo*> &modul
     for (int i = 0; i < m_modulesCombo->count(); ++i) {
         historyList.append(m_modulesCombo->itemText(i));
     }
-    CBTConfig::set(CBTConfig::searchModulesHistory, historyList);
+    btConfig().setValue("history/searchModuleHistory", historyList);
     emit sigSetSearchButtonStatus(!modules.isEmpty());
 }
 
@@ -284,7 +283,7 @@ void BtSearchOptionsArea::reset() {
 }
 
 void BtSearchOptionsArea::saveSettings() {
-    CBTConfig::set(CBTConfig::searchTexts, m_searchTextCombo->historyItems());
+    btConfig().setValue("properties/searchTexts", m_searchTextCombo->historyItems());
     SearchType t = FullType;
     if (m_typeAndButton->isChecked()) {
         t = AndType;
@@ -292,25 +291,25 @@ void BtSearchOptionsArea::saveSettings() {
     if (m_typeOrButton->isChecked()) {
         t = OrType;
     }
-    CBTConfig::set(CBTConfig::searchType, t);
+    btConfig().setValue(SearchTypeKey, t);
 }
 
 void BtSearchOptionsArea::readSettings() {
-    QStringList texts = CBTConfig::get(CBTConfig::searchTexts);
+    const QStringList texts = btConfig().value<QStringList>("properties/searchTexts", QStringList());
     //for some reason the slot was called when setting the upmost item
     disconnect(m_searchTextCombo, SIGNAL(editTextChanged(const QString&)), this, SLOT(slotValidateText(const QString&)));
-    for (int i = 0; i < texts.size(); i++) {
-        if (texts.at(i).size() > 0)
-            m_searchTextCombo->addItem(texts.at(i));
+    Q_FOREACH (const QString & text, texts) {
+        if (text.size() > 0)
+            m_searchTextCombo->addItem(text);
     }
     connect(m_searchTextCombo, SIGNAL(editTextChanged(const QString&)), this, SLOT(slotValidateText(const QString&)));
 
-    m_modulesCombo->insertItems(0, CBTConfig::get(CBTConfig::searchModulesHistory));
+    m_modulesCombo->insertItems(0, btConfig().value<QStringList>("history/searchModuleHistory", QStringList()));
     for (int i = 0; i < m_modulesCombo->count(); ++i) {
         m_modulesCombo->setItemData(i, m_modulesCombo->itemText(i), Qt::ToolTipRole);
     }
 
-    int stype = CBTConfig::get(CBTConfig::searchType);
+    int stype = btConfig().value<int>(SearchTypeKey, AndType);
     switch (stype) {
         case AndType:
             m_typeAndButton->setChecked(true);
@@ -336,8 +335,8 @@ void BtSearchOptionsArea::setupRanges() {
 }
 
 void BtSearchOptionsArea::syntaxHelp() {
-    // The dialog is deleted on close:
-    BtSearchSyntaxHelpDialog *dlg = new BtSearchSyntaxHelpDialog(this);
+    BtSearchSyntaxHelpDialog * dlg = new BtSearchSyntaxHelpDialog(this);
+    dlg->setAttribute(Qt::WA_DeleteOnClose);
     dlg->show();
 }
 
@@ -349,23 +348,22 @@ void BtSearchOptionsArea::refreshRanges() {
     //m_rangeChooserCombo->insertItem(tr("Last search result"));
 
     //insert the user-defined ranges
-    m_rangeChooserCombo->insertItems(1, CBTConfig::get(CBTConfig::searchScopes).keys());
-
+    m_rangeChooserCombo->insertItems(1, btConfig().getSearchScopesForCurrentLocale().keys());
 }
 
 sword::ListKey BtSearchOptionsArea::searchScope() {
     if (m_rangeChooserCombo->currentIndex() > 0) { //is not "no scope"
-        CBTConfig::StringMap map = CBTConfig::get(CBTConfig::searchScopes);
+        BtConfig::StringMap map = btConfig().getSearchScopesForCurrentLocale();
         QString scope = map[ m_rangeChooserCombo->currentText() ];
         if (!scope.isEmpty()) {
-            return sword::VerseKey().ParseVerseList( (const char*)scope.toUtf8(), "Genesis 1:1", true);
+            return sword::VerseKey().parseVerseList( (const char*)scope.toUtf8(), "Genesis 1:1", true);
         }
     }
     return sword::ListKey();
 }
 
 bool BtSearchOptionsArea::hasSearchScope() {
-    return (searchScope().Count() > 0);
+    return (searchScope().getCount() > 0);
 }
 
 void BtSearchOptionsArea::addToHistory(const QString& text) {
@@ -419,7 +417,7 @@ void BtSearchOptionsArea::slotValidateText(const QString& /*newText*/) {
 } // namespace Search
 
 QDataStream &operator<<(QDataStream &out, const Search::BtSearchOptionsArea::SearchType &searchType) {
-    out << (qint8) searchType;
+    out << static_cast<qint8>(searchType);
     return out;
 }
 
diff --git a/src/frontend/searchdialog/btsearchoptionsarea.h b/src/frontend/searchdialog/btsearchoptionsarea.h
index 375b5e7..a6483ac 100644
--- a/src/frontend/searchdialog/btsearchoptionsarea.h
+++ b/src/frontend/searchdialog/btsearchoptionsarea.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -56,7 +58,7 @@ class BtSearchOptionsArea : public QWidget {
 
         SearchType searchType();
 
-        QPushButton* searchButton() const;
+        inline QPushButton * searchButton() const { return m_searchButton; }
 
         /**
           Returns the list of used modules.
diff --git a/src/frontend/searchdialog/btsearchresultarea.cpp b/src/frontend/searchdialog/btsearchresultarea.cpp
index 262ff23..6a82a4f 100644
--- a/src/frontend/searchdialog/btsearchresultarea.cpp
+++ b/src/frontend/searchdialog/btsearchresultarea.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -10,7 +10,6 @@
 #include "frontend/searchdialog/btsearchresultarea.h"
 
 #include <QApplication>
-#include <QDebug>
 #include <QFrame>
 #include <QMenu>
 #include <QProgressDialog>
@@ -22,13 +21,19 @@
 #include <QWidget>
 #include "backend/keys/cswordversekey.h"
 #include "backend/rendering/cdisplayrendering.h"
-#include "frontend/display/cdisplay.h"
+#include "backend/config/btconfig.h"
+#include "frontend/display/bthtmlreaddisplay.h"
 #include "frontend/searchdialog/cmoduleresultview.h"
 #include "frontend/searchdialog/csearchdialog.h"
 #include "frontend/searchdialog/csearchresultview.h"
 #include "util/tool.h"
 
 
+namespace {
+const QString MainSplitterSizesKey = "GUI/SearchDialog/SearchResultsArea/mainSplitterSizes";
+const QString ResultSplitterSizesKey = "GUI/SearchDialog/SearchResultsArea/resultSplitterSizes";
+} // anonymous namespace
+
 namespace Search {
 
 BtSearchResultArea::BtSearchResultArea(QWidget *parent)
@@ -76,7 +81,7 @@ void BtSearchResultArea::initView() {
 
     QVBoxLayout* frameLayout = new QVBoxLayout(m_displayFrame);
     frameLayout->setContentsMargins(0, 0, 0, 0);
-    m_previewDisplay = CDisplay::createReadInstance(0, m_displayFrame);
+    m_previewDisplay = new BtHtmlReadDisplay(0, m_displayFrame);
     m_previewDisplay->view()->setToolTip(tr("Text of the selected search result item"));
     frameLayout->addWidget(m_previewDisplay->view());
 
@@ -143,10 +148,10 @@ void BtSearchResultArea::updatePreview(const QString& key) {
         //for bibles render 5 context verses
         if (module->type() == CSwordModuleInfo::Bible) {
             CSwordVerseKey vk(module);
-            vk.Headings(1);
+            vk.setIntros(true);
             vk.setKey(key);
 
-            ((sword::VerseKey*)(module->module()->getKey()))->Headings(1); //HACK: enable headings for VerseKeys
+            ((sword::VerseKey*)(module->module()->getKey()))->setIntros(true); //HACK: enable headings for VerseKeys
 
             //first go back and then go forward the keys to be in context
             vk.previous(CSwordVerseKey::UseVerse);
@@ -174,10 +179,10 @@ void BtSearchResultArea::updatePreview(const QString& key) {
         //for commentaries only one verse, but with heading
         else if (module->type() == CSwordModuleInfo::Commentary) {
             CSwordVerseKey vk(module);
-            vk.Headings(1);
+            vk.setIntros(true);
             vk.setKey(key);
 
-            ((sword::VerseKey*)(module->module()->getKey()))->Headings(1); //HACK: enable headings for VerseKeys
+            ((sword::VerseKey*)(module->module()->getKey()))->setIntros(true); //HACK: enable headings for VerseKeys
 
             //include Headings in display, they are indexed and searched too
             if (vk.getVerse() == 1) {
@@ -198,295 +203,11 @@ void BtSearchResultArea::updatePreview(const QString& key) {
             text = render.renderSingleKey(key, modules, settings);
         }
 
-        m_previewDisplay->setText( highlightSearchedText(text, searchedText) );
+        m_previewDisplay->setText( CSwordModuleSearch::highlightSearchedText(text, searchedText) );
         m_previewDisplay->moveToAnchor( CDisplayRendering::keyToHTMLAnchor(key) );
     }
 }
 
-QStringList BtSearchResultArea::queryParser(const QString& queryString) {
-    QString token;
-    QStringList tokenList;
-    int cnt, pos;
-
-    token = "";
-    cnt = 0;
-    while (cnt < queryString.length()) {
-        // add to token
-        if ((queryString[cnt]).isLetterOrNumber() || (queryString[cnt] == '*')) {
-            token = token + queryString[cnt];
-            cnt++;
-        }
-        else if ((queryString[cnt]).isLetterOrNumber() || (queryString[cnt] == '?')) {
-            token = token + queryString[cnt];
-            cnt++;
-        }
-        // token break
-        else if (queryString[cnt] == ' ') {
-            token = token.simplified();
-            if ((token != "*") && (token != ""))
-                tokenList.append(token);
-            token = "";
-            cnt++;
-        }
-        // clucene appears to ignore quoted strings in the sence
-        // that it treats all the words within quoted strings as
-        // regular tokens and not as a single token.
-        else if (queryString[cnt] == '"') {
-            cnt++;
-        }
-        // wild card - treat as a special token break
-        //else if (queryString[cnt] == '*') {
-        //    token = token + queryString[cnt];
-        //    token = token.simplified();
-        //    if ((token != "*") && (token != ""))
-        //        tokenList.append(token);
-        //    // start next token with wildcard (kin*m -> kin* *m)
-        //    token = "*";
-        //    cnt++;
-        //}
-        // the ! token is also a token break
-        else if (queryString[cnt] == '!') {
-            // store away current token
-            token = token.simplified();
-            if ((token != "*") && (token != ""))
-                tokenList.append(token);
-            // add the ! token
-            tokenList.append("!");
-            token = "";
-            cnt++;
-        }
-        // the - token is also a token break
-        else if (queryString[cnt] == '-') {
-            // store away current token
-            token = token.simplified();
-            if ((token != "*") && (token != ""))
-                tokenList.append(token);
-            // add the ! token
-            tokenList.append("-");
-            token = "";
-            cnt++;
-        }
-        // the + token is also a token break
-        else if (queryString[cnt] == '+') {
-            // store away current token
-            token = token.simplified();
-            if ((token != "*") && (token != ""))
-                tokenList.append(token);
-            // add the + token
-            tokenList.append("+");
-            token = "";
-            cnt++;
-        }
-        // the || token is also a token break
-        else if ((queryString[cnt] == '|') && (queryString[cnt+1] == '|')) {
-            // store away current token
-            token = token.simplified();
-            if ((token != "*") && (token != ""))
-                tokenList.append(token);
-            // add the || token
-            tokenList.append("||");
-            token = "";
-            cnt += 2;
-        }
-        // the && token is also a token break
-        else if ((queryString[cnt] == '&') && (queryString[cnt+1] == '&')) {
-            // store away current token
-            token = token.simplified();
-            if ((token != "*") && (token != ""))
-                tokenList.append(token);
-            // add the || token
-            tokenList.append("&&");
-            token = "";
-            cnt += 2;
-        }
-        else cnt++;
-    }
-    token = token.simplified();
-    if ((token != "*") && (token != ""))
-        tokenList.append(token);
-
-    cnt = 0;
-    QStringList::iterator it;
-    for ( it = tokenList.begin(); it != tokenList.end(); it++ ) {
-        //-----------------------------------------------------------
-        // remove all the NOT(!) tokens - these do not need to be
-        // highlighted in the highlighter
-        //-----------------------------------------------------------
-        if (((*it) == "!") || ((*it) == "NOT") || ((*it) == "-")) {
-            it = tokenList.erase(it);
-            if (it == tokenList.end())
-                break;
-            it = tokenList.erase(it);
-            if (it == tokenList.end())
-                break;
-            it--;
-        }
-        //-----------------------------------------------------------
-        // remove all the operator tokens - these do not need to be
-        // highlighted in the highlighter
-        //-----------------------------------------------------------
-        else if ( ((*it) == "||")  || ((*it) == "OR") || ((*it) == "+") ||
-                  ((*it) == "AND") || ((*it) == "&&") ) {
-            it = tokenList.erase(it);
-            if (it == tokenList.end())
-                break;
-            it--;
-        }
-        // if the token contains a ^ then trim the remainder of the
-        // token from the ^
-        //What??? error: invalid conversion from ‘const void*’ to ‘int’
-        // and how come "contains" returns bool but is used as int?
-        //else if ( (pos = (*it).contains("^")) >= 0 ) {
-        else if ( (pos = (*it).indexOf("^") ) >= 0 ) {
-            (*it) = (*it).left(pos - 1);
-        }
-        // if the token contains a ~ then trim the remainder of the
-        // token from the ~
-        else if ( (pos = (*it).indexOf("~") ) >= 0 ) {
-            (*it) = (*it).left(pos - 2) + "*";
-        }
-    }
-    return(tokenList);
-}
-
-QString BtSearchResultArea::highlightSearchedText(const QString& content, const QString& searchedText) {
-    QString ret = content;
-
-    const Qt::CaseSensitivity cs = Qt::CaseInsensitive;
-
-    //   int index = 0;
-    int index = ret.indexOf("<body", 0);
-    int matchLen = 0;
-    int length = searchedText.length();
-
-    // Highlighting constants -
-    // \todo We need to make the highlight color configurable.
-    const QString rep1("<span style=\"background-color:#FFFF66;\">");
-    const QString rep2("</span>");
-    const unsigned int repLength = rep1.length() + rep1.length();
-    const QString rep3("style=\"background-color:#FFFF66;\" ");
-    const unsigned int rep3Length = rep3.length();
-
-
-    QString newSearchText;
-
-    newSearchText = searchedText;
-
-    // find the strongs search lemma and highlight it
-    // search the searched text for "strong:" until it is not found anymore
-    QStringList list;
-
-    // split the search string - some possibilities are "\\s|\\|", "\\s|\\+", or "\\s|\\|\\+"
-    // \todo find all possible seperators
-    QString regExp = "\\s";
-    list = searchedText.split(QRegExp(regExp));
-    foreach (QString newSearchText, list) {
-        int sstIndex; // strong search text index for finding "strong:"
-        int idx1, idx2;
-        QString sNumber, lemmaText;
-
-        sstIndex = newSearchText.indexOf("strong:");
-        if (sstIndex == -1)
-            continue;
-
-        // set the start index to the start of <body>
-        int strongIndex = index;
-
-        // Get the strongs number from the search text.
-        // First, find the first space after "strong:"
-        sstIndex = sstIndex + 7;
-        // get the strongs number -> the text following "strong:" to the end of the string.
-        sNumber = newSearchText.mid(sstIndex, -1);
-        // find all the "lemma=" inside the the content
-        while ((strongIndex = ret.indexOf("lemma=", strongIndex, cs)) != -1) {
-            // get the strongs number after the lemma and compare it with the
-            // strongs number we are looking for
-            idx1 = ret.indexOf("\"", strongIndex) + 1;
-            idx2 = ret.indexOf("\"", idx1 + 1);
-            lemmaText = ret.mid(idx1, idx2 - idx1);
-
-            // this is interesting because we could have a strongs number like: G3218|G300
-            // To handle this we will use some extra cpu cycles and do a partial match against
-            // the lemmaText
-            if (lemmaText.contains(sNumber)) {
-                // strongs number is found now we need to highlight it
-                // I believe the easiest way is to insert rep3 just before "lemma="
-                ret = ret.insert(strongIndex, rep3);
-                strongIndex += rep3Length;
-            }
-            strongIndex += 6; // 6 is the length of "lemma="
-        }
-    }
-    //---------------------------------------------------------------------
-    // now that the strong: stuff is out of the way continue with
-    // other search options
-    //---------------------------------------------------------------------
-
-    // try to figure out how to use the lucene query parser
-
-    //using namespace lucene::queryParser;
-    //using namespace lucene::search;
-    //using namespace lucene::analysis;
-    //using namespace lucene::util;
-
-    //wchar_t *buf;
-    //char buf8[1000];
-    //standard::WhitespaceAnalyzer analyzer;
-    //lucene_utf8towcs(m_wcharBuffer, searchedText.utf8(), MAX_CONV_SIZE);
-    //QSharedPointer<Query> q( QueryParser::parse(m_wcharBuffer, _T("content"), &analyzer) );
-    //StringReader reader(m_wcharBuffer);
-    //TokenStream* tokenStream = analyzer.tokenStream( _T("field"), &reader);
-    //Token token;
-    //while(tokenStream->next(&token) != 0) {
-    //    lucene_wcstoutf8(buf8, token.termText(), 1000);
-    //    printf("%s\n", buf8);
-    //}
-
-    //===========================================================
-    // since I could not figure out the lucene query parser, I
-    // made a simple parser.
-    //===========================================================
-    QStringList words = queryParser(newSearchText);
-    qDebug() << "btsearchresultarea.cpp: " << __LINE__ << ": " <<  words << '\n';
-    foreach (QString word, words) { //search for every word in the list
-        QRegExp findExp;
-        if (word.contains("*")) {
-            length = word.length() - 1;
-            word.replace('*', "\\S*"); //match within a word
-            findExp = QRegExp(word);
-            findExp.setMinimal(true);
-        }
-        else if (word.contains("?")) {
-            length = word.length() - 1;
-            word.replace('?', "\\S?"); //match within a word
-            findExp = QRegExp(word);
-            findExp.setMinimal(true);
-        }
-        else {
-            length = word.length();
-            findExp = QRegExp("\\b" + word + "\\b");
-        }
-
-        //       index = 0; //for every word start at the beginning
-        index = ret.indexOf("<body", 0);
-        findExp.setCaseSensitivity(cs);
-        //while ( (index = ret.find(findExp, index)) != -1 ) { //while we found the word
-        while ( (index = findExp.indexIn(ret, index)) != -1 ) { //while we found the word
-            matchLen = findExp.matchedLength();
-            if (!util::tool::inHTMLTag(index, ret)) {
-                length = matchLen;
-                ret = ret.insert( index + length, rep2 );
-                ret = ret.insert( index, rep1 );
-                index += repLength;
-            }
-            index += length;
-        }
-    }
-    qDebug() << "btsearchresultarea.cpp: " << __LINE__ << ": " <<  words << '\n';
-    //qWarning("\n\n\n%s", ret.latin1());
-    return ret;
-}
-
 /** Initializes the signal slot conections of the child widgets, */
 void BtSearchResultArea::initConnections() {
     connect(m_resultListBox, SIGNAL(keySelected(const QString&)), this, SLOT(updatePreview(const QString&)));
@@ -506,26 +227,28 @@ void BtSearchResultArea::initConnections() {
 * Load the settings from the resource file
 */
 void BtSearchResultArea::loadDialogSettings() {
-    QList<int> mainSplitterSizes = CBTConfig::get(CBTConfig::searchMainSplitterSizes);
-    if (mainSplitterSizes.count() > 0) {
+    QList<int> mainSplitterSizes = btConfig().value< QList<int> >(MainSplitterSizesKey, QList<int>());
+    if (mainSplitterSizes.count() > 0)
         m_mainSplitter->setSizes(mainSplitterSizes);
-    }
-    else {
+    else
+    {
         int w = this->size().width();
         int w2 = m_moduleListBox->sizeHint().width();
         mainSplitterSizes << w2 << w - w2;
         m_mainSplitter->setSizes(mainSplitterSizes);
     }
-    QList<int> resultSplitterSizes = CBTConfig::get(CBTConfig::searchResultSplitterSizes);
-    if (resultSplitterSizes.count() > 0) m_resultListSplitter->setSizes(resultSplitterSizes);
+
+    QList<int> resultSplitterSizes = btConfig().value< QList<int> >(ResultSplitterSizesKey, QList<int>());
+    if (resultSplitterSizes.count() > 0)
+        m_resultListSplitter->setSizes(resultSplitterSizes);
 }
 
 /**
 * Save the settings to the resource file
 */
 void BtSearchResultArea::saveDialogSettings() const {
-    CBTConfig::set(CBTConfig::searchMainSplitterSizes, m_mainSplitter->sizes());
-    CBTConfig::set(CBTConfig::searchResultSplitterSizes, m_resultListSplitter->sizes());
+    btConfig().setValue(MainSplitterSizesKey, m_mainSplitter->sizes());
+    btConfig().setValue(ResultSplitterSizesKey, m_resultListSplitter->sizes());
 }
 
 /******************************************************************************
@@ -533,15 +256,12 @@ void BtSearchResultArea::saveDialogSettings() const {
 ******************************************************************************/
 
 StrongsResultList::StrongsResultList(const CSwordModuleInfo *module,
-                                     const sword::ListKey &results,
+                                     const sword::ListKey & result,
                                      const QString &strongsNumber)
 {
     using namespace Rendering;
 
-    /// \warning This is a workaround for Sword constness
-    sword::ListKey result = results;
-
-    int count = result.Count();
+    int count = result.getCount();
     if (!count)
         return;
 
diff --git a/src/frontend/searchdialog/btsearchresultarea.h b/src/frontend/searchdialog/btsearchresultarea.h
index bd75a02..e7a167d 100644
--- a/src/frontend/searchdialog/btsearchresultarea.h
+++ b/src/frontend/searchdialog/btsearchresultarea.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -134,16 +136,6 @@ class BtSearchResultArea : public QWidget {
         void initConnections();
 
         /**
-        * This function breakes the queryString into clucene tokens
-        */
-        QStringList queryParser(const QString& queryString);
-
-        /**
-        * This function highlights the searched text in the content using the search type given by search flags
-        */
-        QString highlightSearchedText(const QString& content, const QString& searchedText);
-
-        /**
         * Load the settings from the resource file
         */
         void loadDialogSettings();
diff --git a/src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp b/src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp
index a1debc3..f1acddc 100644
--- a/src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp
+++ b/src/frontend/searchdialog/btsearchsyntaxhelpdialog.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -13,7 +13,7 @@
 #include <QDialogButtonBox>
 #include <QVBoxLayout>
 #include <QWebView>
-#include "util/dialogutil.h"
+#include "frontend/messagedialog.h"
 #include "util/directory.h"
 
 
@@ -22,7 +22,6 @@ namespace Search {
 BtSearchSyntaxHelpDialog::BtSearchSyntaxHelpDialog(QWidget *parent, Qt::WindowFlags wflags)
     : QDialog(parent, wflags)
 {
-    setAttribute(Qt::WA_DeleteOnClose);
     resize(550, 340);
 
     QVBoxLayout *l = new QVBoxLayout;
@@ -42,10 +41,6 @@ BtSearchSyntaxHelpDialog::BtSearchSyntaxHelpDialog(QWidget *parent, Qt::WindowFl
     retranslateUi();
 }
 
-BtSearchSyntaxHelpDialog::~BtSearchSyntaxHelpDialog() {
-    // Intentionally empty
-}
-
 void BtSearchSyntaxHelpDialog::retranslateUi() {
     namespace DU = util::directory;
 
@@ -219,7 +214,7 @@ void BtSearchSyntaxHelpDialog::retranslateUi() {
 
     m_webView->setHtml(html, QUrl::fromLocalFile(DU::getIconDir().path()));
 
-    util::prepareDialogBox(m_buttons);
+    message::prepareDialogBox(m_buttons);
 }
 
 void BtSearchSyntaxHelpDialog::linkClicked(const QUrl &url) {
diff --git a/src/frontend/searchdialog/btsearchsyntaxhelpdialog.h b/src/frontend/searchdialog/btsearchsyntaxhelpdialog.h
index 89cc805..74b74b5 100644
--- a/src/frontend/searchdialog/btsearchsyntaxhelpdialog.h
+++ b/src/frontend/searchdialog/btsearchsyntaxhelpdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -22,7 +24,6 @@ class BtSearchSyntaxHelpDialog: public QDialog {
         Q_OBJECT
     public:
         BtSearchSyntaxHelpDialog(QWidget *parent = 0, Qt::WindowFlags wflags = Qt::Dialog);
-        ~BtSearchSyntaxHelpDialog();
 
     protected:
         void retranslateUi();
diff --git a/src/frontend/searchdialog/chistorycombobox.cpp b/src/frontend/searchdialog/chistorycombobox.cpp
index cf77627..231bd65 100644
--- a/src/frontend/searchdialog/chistorycombobox.cpp
+++ b/src/frontend/searchdialog/chistorycombobox.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/searchdialog/chistorycombobox.h b/src/frontend/searchdialog/chistorycombobox.h
index dffbcd8..922b042 100644
--- a/src/frontend/searchdialog/chistorycombobox.h
+++ b/src/frontend/searchdialog/chistorycombobox.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/searchdialog/cmoduleresultview.cpp b/src/frontend/searchdialog/cmoduleresultview.cpp
index ab4810b..5bbc32f 100644
--- a/src/frontend/searchdialog/cmoduleresultview.cpp
+++ b/src/frontend/searchdialog/cmoduleresultview.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -18,10 +18,12 @@
 #include <QtAlgorithms>
 
 #include "backend/drivers/cswordmoduleinfo.h"
+#include "bibletimeapp.h"
 #include "frontend/cexportmanager.h"
 #include "util/cresmgr.h"
+#include "util/geticon.h"
 #include "util/tool.h"
-#include "util/directory.h"
+#include "backend/config/btconfig.h"
 
 
 namespace Search {
@@ -43,8 +45,6 @@ CModuleResultView::~CModuleResultView() {
 
 /** Initializes this widget. */
 void CModuleResultView::initView() {
-    namespace DU = util::directory;
-
     // see also csearchresultview.cpp
     setToolTip(tr("Works chosen for the search and the number of the hits in each work"));
     setHeaderLabels( QStringList(tr("Work")) << tr("Hits") );
@@ -62,7 +62,7 @@ void CModuleResultView::initView() {
     m_popup = new QMenu(this);
 
     m_actions.copyMenu = new QMenu(tr("Copy..."), m_popup);
-    m_actions.copyMenu->setIcon(DU::getIcon( CResMgr::searchdialog::result::moduleList::copyMenu::icon) );
+    m_actions.copyMenu->setIcon(util::getIcon( CResMgr::searchdialog::result::moduleList::copyMenu::icon) );
     m_actions.copy.result = new QAction(tr("Reference only"), this);
     QObject::connect(m_actions.copy.result, SIGNAL(triggered()), this, SLOT(copyResult()) );
     m_actions.copyMenu->addAction(m_actions.copy.result);
@@ -72,7 +72,7 @@ void CModuleResultView::initView() {
     m_popup->addMenu(m_actions.copyMenu);
 
     m_actions.saveMenu = new QMenu(tr("Save..."), m_popup);
-    m_actions.saveMenu->setIcon(DU::getIcon( CResMgr::searchdialog::result::moduleList::saveMenu::icon) );
+    m_actions.saveMenu->setIcon(util::getIcon( CResMgr::searchdialog::result::moduleList::saveMenu::icon) );
     m_actions.save.result = new QAction(tr("Reference only"), this);
     QObject::connect(m_actions.save.result, SIGNAL(triggered()), this, SLOT(saveResult()) );
     m_actions.saveMenu->addAction(m_actions.save.result);
@@ -82,7 +82,7 @@ void CModuleResultView::initView() {
     m_popup->addMenu(m_actions.saveMenu);
 
     m_actions.printMenu = new QMenu(tr("Print..."), m_popup);
-    m_actions.printMenu->setIcon(DU::getIcon(CResMgr::searchdialog::result::moduleList::printMenu::icon));
+    m_actions.printMenu->setIcon(util::getIcon(CResMgr::searchdialog::result::moduleList::printMenu::icon));
     m_actions.print.result = new QAction(tr("Reference with text"), this);
     QObject::connect(m_actions.print.result, SIGNAL(triggered()), this, SLOT(printResult()) );
     m_actions.printMenu->addAction(m_actions.print.result);
@@ -96,48 +96,45 @@ void CModuleResultView::initConnections() {
             this, SLOT(executed(QTreeWidgetItem*, QTreeWidgetItem*)));
 }
 
-void CModuleResultView::setupTree(
-        const CSwordModuleSearch::Results &results,
-        const QString &searchedText)
+void CModuleResultView::setupTree(const CSwordModuleSearch::Results & results,
+                                  const QString & searchedText)
 {
+    /// \todo implement sorting in this method.
+
     clear();
 
     m_results = results;
 
-    /// \todo this class is for sorting
-    //util::CSortListViewItem* item = 0;
-    //util::CSortListViewItem* oldItem = 0;
-    QTreeWidgetItem* item = 0;
-
     qDeleteAll(m_strongsResults);
     m_strongsResults.clear();
 
     bool strongsAvailable = false;
 
-    Q_FOREACH(const CSwordModuleInfo *m, results.keys()) {
-        sword::ListKey result = results.value(m);
-
-        item = new QTreeWidgetItem(this, QStringList(m->name()) << QString::number(result.Count()) );
-        /// \todo item->setColumnSorting(1, util::CSortListViewItem::Number);
-
-        item->setIcon(0, util::tool::getIconForModule(m) );
-        //----------------------------------------------------------------------
-        // we need to make a decision here.  Either don't show any Strong's
-        // number translations, or show the first one in the search text, or
-        // figure out how to show them all.
-        // I choose option number 2 at this time.
-        //----------------------------------------------------------------------
-        int sstIndex, sTokenIndex; // strong search text index for finding "strong:"
-        if ((sstIndex = searchedText.indexOf("strong:", 0)) != -1) {
-            QString sNumber;
-            //--------------------------------------------------
-            // get the strongs number from the search text
-            //--------------------------------------------------
-            // first find the first space after "strong:"
-            //    this should indicate a change in search token
-            sstIndex = sstIndex + 7;
-            sTokenIndex = searchedText.indexOf(" ", sstIndex);
-            sNumber = searchedText.mid(sstIndex, sTokenIndex - sstIndex);
+    Q_FOREACH(const CSwordModuleInfo * m, results.keys()) {
+        /// \todo Remove this constructor hack once sword gets it right:
+        const int count = sword::ListKey(results.value(m)).getCount();
+        QTreeWidgetItem * item = new QTreeWidgetItem(this,
+                                                     QStringList(m->name())
+                                                       << QString::number(count));
+
+        item->setIcon(0, util::tool::getIconForModule(m));
+        /*
+          We need to make a decision here.  Either don't show any Strong's
+          number translations, or show the first one in the search text, or
+          figure out how to show them all. I choose option number 2 at this time.
+        */
+
+        // strong search text index for finding "strong:"
+        int sstIndex = searchedText.indexOf("strong:", 0);
+        if (sstIndex != -1) {
+            /*
+              Get the strongs number from the search text. First find the first
+              space after "strong:". This should indicate a change in search
+              token
+            */
+            sstIndex += 7;
+            const int sTokenIndex = searchedText.indexOf(" ", sstIndex);
+            const QString sNumber(searchedText.mid(sstIndex, sTokenIndex - sstIndex));
 
             setupStrongsResults(m, results[m], item, sNumber);
 
@@ -146,7 +143,7 @@ void CModuleResultView::setupTree(
         }
     };
 
-    //Allow to hide the module strongs if there are any available
+    // Allow to hide the module strongs if there are any available
     setRootIsDecorated( strongsAvailable );
 }
 
@@ -269,8 +266,8 @@ void CModuleResultView::printResult() {
     CSwordModuleInfo *m = activeModule();
     if (m != 0) {
         CExportManager mgr(true, tr("Printing search result"));
-        mgr.printKeyList(m_results[m], m, CBTConfig::getDisplayOptionDefaults(),
-                         CBTConfig::getFilterOptionDefaults());
+        mgr.printKeyList(m_results[m], m, btConfig().getDisplayOptions(),
+                         btConfig().getFilterOptions());
     };
 }
 
diff --git a/src/frontend/searchdialog/cmoduleresultview.h b/src/frontend/searchdialog/cmoduleresultview.h
index 526ac16..24571d9 100644
--- a/src/frontend/searchdialog/cmoduleresultview.h
+++ b/src/frontend/searchdialog/cmoduleresultview.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/searchdialog/crangechooserdialog.cpp b/src/frontend/searchdialog/crangechooserdialog.cpp
index 6a8c89d..efece49 100644
--- a/src/frontend/searchdialog/crangechooserdialog.cpp
+++ b/src/frontend/searchdialog/crangechooserdialog.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -19,8 +19,8 @@
 #include <QPushButton>
 #include <QTextEdit>
 #include <QVBoxLayout>
-#include "backend/config/cbtconfig.h"
-#include "util/dialogutil.h"
+#include "backend/config/btconfig.h"
+#include "frontend/messagedialog.h"
 
 // Sword includes:
 #include "versekey.h"
@@ -37,8 +37,8 @@ CRangeChooserDialog::CRangeChooserDialog(QWidget *parentDialog)
     retranslateUi();
 
     // Add the existing scopes
-    CBTConfig::StringMap map = CBTConfig::get(CBTConfig::searchScopes);
-    CBTConfig::StringMap::Iterator it;
+    BtConfig::StringMap map = btConfig().getSearchScopesForCurrentLocale();
+    BtConfig::StringMap::Iterator it;
     for (it = map.begin(); it != map.end(); ++it) {
         new RangeItem(it.key(), it.value(), m_rangeList);
     }
@@ -74,7 +74,7 @@ void CRangeChooserDialog::initView() {
     m_buttonBox->setStandardButtons(QDialogButtonBox::Ok
                                     | QDialogButtonBox::Cancel
                                     | QDialogButtonBox::RestoreDefaults);
-    util::prepareDialogBox(m_buttonBox);
+    message::prepareDialogBox(m_buttonBox);
 
     QHBoxLayout *rangeButtonsLayout = new QHBoxLayout();
     rangeButtonsLayout->addWidget(m_newRangeButton);
@@ -176,6 +176,7 @@ void CRangeChooserDialog::addNewRange() {
 void CRangeChooserDialog::selectedRangeChanged(QListWidgetItem * current,
                                                QListWidgetItem * previous)
 {
+    Q_UNUSED(current);
     if (previous) {
         Q_ASSERT(dynamic_cast<RangeItem*>(previous) != 0);
         saveCurrentToRange(static_cast<RangeItem*>(previous));
@@ -211,9 +212,9 @@ void CRangeChooserDialog::updateResultList() {
     //HACK: repair range to work with Sword 1.5.6
     const QString range = m_rangeEdit->toPlainText().replace(QRegExp("\\s{0,}-\\s{0,}"), "-");
 
-    sword::ListKey verses = VK().ParseVerseList(range.toUtf8().constData(),
+    sword::ListKey verses = VK().parseVerseList(range.toUtf8().constData(),
                                                 "Genesis 1:1", true);
-    for (int i = 0; i < verses.Count(); ++i) {
+    for (int i = 0; i < verses.getCount(); i++) {
         new QListWidgetItem(QString::fromUtf8(verses.getElement(i)->getRangeText()),
                             m_resultList);
     }
@@ -238,22 +239,23 @@ void CRangeChooserDialog::accept() {
 
     // Save the new sorted map of search scopes:
     m_rangeList->sortItems();
-    CBTConfig::StringMap map;
+    BtConfig::StringMap map;
     for (int i = 0; i < m_rangeList->count(); i++) {
         Q_ASSERT(dynamic_cast<RangeItem*>(m_rangeList->item(i)) != 0);
         const RangeItem * item = static_cast<RangeItem*>(m_rangeList->item(i));
         map[item->caption()] = item->range();
     }
-    CBTConfig::set(CBTConfig::searchScopes, map);
+    btConfig().setSearchScopesWithCurrentLocale(map);
 
     QDialog::accept();
 }
 
 void CRangeChooserDialog::restoreDefaults() {
-    typedef CBTConfig::StringMap::ConstIterator SMCI;
+    typedef BtConfig::StringMap::ConstIterator SMCI;
 
     m_rangeList->clear();
-    const CBTConfig::StringMap map = CBTConfig::getDefault(CBTConfig::searchScopes);
+    btConfig().deleteSearchScopesWithCurrentLocale();
+    const BtConfig::StringMap map = btConfig().getSearchScopesForCurrentLocale();
     for (SMCI it = map.begin(); it != map.end(); ++it) {
         new RangeItem(it.key(), it.value(), m_rangeList);
     };
diff --git a/src/frontend/searchdialog/crangechooserdialog.h b/src/frontend/searchdialog/crangechooserdialog.h
index db2ad30..a9cbaf4 100644
--- a/src/frontend/searchdialog/crangechooserdialog.h
+++ b/src/frontend/searchdialog/crangechooserdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/searchdialog/csearchdialog.cpp b/src/frontend/searchdialog/csearchdialog.cpp
index 8ce55d4..54981e3 100644
--- a/src/frontend/searchdialog/csearchdialog.cpp
+++ b/src/frontend/searchdialog/csearchdialog.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -20,18 +20,23 @@
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/cswordmodulesearch.h"
 #include "backend/keys/cswordkey.h"
 #include "backend/keys/cswordversekey.h"
+#include "bibletimeapp.h"
 #include "frontend/btmoduleindexdialog.h"
 #include "frontend/searchdialog/btsearchoptionsarea.h"
 #include "frontend/searchdialog/btsearchresultarea.h"
+#include "frontend/messagedialog.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
-#include "util/dialogutil.h"
+#include "util/geticon.h"
 
 
+namespace {
+const QString GeometryKey = "GUI/SearchDialog/geometry";
+} // anonymous namespace
+
 namespace Search {
 
 static CSearchDialog* m_staticDialog = 0;
@@ -78,9 +83,7 @@ CSearchDialog* CSearchDialog::getSearchDialog() {
 CSearchDialog::CSearchDialog(QWidget *parent)
         : QDialog(parent), /*m_searchButton(0),*/ m_closeButton(0),
         m_searchResultArea(0), m_searchOptionsArea(0) {
-    namespace DU = util::directory;
-
-    setWindowIcon(DU::getIcon(CResMgr::searchdialog::icon));
+    setWindowIcon(util::getIcon(CResMgr::searchdialog::icon));
     setWindowTitle(tr("Search"));
     setAttribute(Qt::WA_DeleteOnClose);
 
@@ -123,7 +126,7 @@ void CSearchDialog::startSearch() {
         moduleNames.append("</center><br>");
 
         // Ask the user about unindexed modules:
-        int result = util::showQuestion(
+        int result = message::showQuestion(
                 this, tr("Missing indices"),
                 tr("The following modules need to be indexed before they can be"
                    " searched in:") + moduleNames + tr("Indexing could take a l"
@@ -185,7 +188,7 @@ QString CSearchDialog::prepareSearchText(const QString& orig) {
         qDebug() << "After syntax characters removed:" << text;
         text.replace(andWords, "\"and\"");
         text.replace(orWords, "\"or\"");
-        qDebug() << "After andor repclaced:" << text;
+        qDebug() << "After \"and\" and \"or\" replaced:" << text;
         text.replace(" ", " AND ");
     }
     if (m_searchOptionsArea->searchType() == BtSearchOptionsArea::OrType) {
@@ -219,7 +222,6 @@ void CSearchDialog::setSearchText( const QString &searchText ) {
 
 /** Initializes this object. */
 void CSearchDialog::initView() {
-    namespace DU = util::directory;
 
     QVBoxLayout* verticalLayout = new QVBoxLayout(this);
     setLayout(verticalLayout);
@@ -244,7 +246,7 @@ void CSearchDialog::initView() {
 
     m_closeButton = new QPushButton(this);
     m_closeButton->setText(tr("&Close"));
-    m_closeButton->setIcon(DU::getIcon(CResMgr::searchdialog::close_icon));
+    m_closeButton->setIcon(util::getIcon(CResMgr::searchdialog::close_icon));
     horizontalLayout->addWidget(m_closeButton);
 
     verticalLayout->addLayout(horizontalLayout);
@@ -283,15 +285,11 @@ void CSearchDialog::closeButtonClicked() {
 }
 
 void CSearchDialog::loadDialogSettings() {
-    resize(CBTConfig::get(CBTConfig::searchDialogWidth), CBTConfig::get(CBTConfig::searchDialogHeight));
-    move(CBTConfig::get(CBTConfig::searchDialogX), CBTConfig::get(CBTConfig::searchDialogY));
+    restoreGeometry(btConfig().value<QByteArray>(GeometryKey, QByteArray()));
 }
 
 void CSearchDialog::saveDialogSettings() const {
-    CBTConfig::set(CBTConfig::searchDialogWidth, size().width());
-    CBTConfig::set(CBTConfig::searchDialogHeight, size().height());
-    CBTConfig::set(CBTConfig::searchDialogX, x());
-    CBTConfig::set(CBTConfig::searchDialogY, y());
+    btConfig().setValue(GeometryKey, saveGeometry());
 }
 
 
diff --git a/src/frontend/searchdialog/csearchdialog.h b/src/frontend/searchdialog/csearchdialog.h
index dd2fcd2..dde8537 100644
--- a/src/frontend/searchdialog/csearchdialog.h
+++ b/src/frontend/searchdialog/csearchdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/searchdialog/csearchresultview.cpp b/src/frontend/searchdialog/csearchresultview.cpp
index 7966e56..c08e5cc 100644
--- a/src/frontend/searchdialog/csearchresultview.cpp
+++ b/src/frontend/searchdialog/csearchresultview.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,10 +16,12 @@
 #include <QTreeWidgetItem>
 #include <QWidget>
 #include "backend/keys/cswordversekey.h"
+#include "bibletimeapp.h"
 #include "frontend/cdragdrop.h"
 #include "frontend/cexportmanager.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
+#include "util/geticon.h"
+#include "backend/config/btconfig.h"
 
 
 namespace Search {
@@ -33,8 +35,6 @@ CSearchResultView::CSearchResultView(QWidget* parent)
 
 /** Initializes the view of this widget. */
 void CSearchResultView::initView() {
-    namespace DU = util::directory;
-
     setToolTip(tr("Search result of the selected work"));
     setHeaderLabel(tr("Results"));
     setDragEnabled(true);
@@ -45,7 +45,7 @@ void CSearchResultView::initView() {
     m_popup = new QMenu(this);
 
     m_actions.copyMenu = new QMenu(tr("Copy..."), m_popup);
-    m_actions.copyMenu->setIcon(DU::getIcon(CResMgr::searchdialog::result::foundItems::copyMenu::icon));
+    m_actions.copyMenu->setIcon(util::getIcon(CResMgr::searchdialog::result::foundItems::copyMenu::icon));
 
     m_actions.copy.result = new QAction(tr("Reference only"), this);
     QObject::connect(m_actions.copy.result, SIGNAL(triggered()), this, SLOT(copyItems()) );
@@ -59,7 +59,7 @@ void CSearchResultView::initView() {
     m_popup->addMenu(m_actions.copyMenu);
 
     m_actions.saveMenu = new QMenu(tr("Save..."), m_popup);
-    m_actions.saveMenu->setIcon(DU::getIcon(CResMgr::searchdialog::result::foundItems::saveMenu::icon));
+    m_actions.saveMenu->setIcon(util::getIcon(CResMgr::searchdialog::result::foundItems::saveMenu::icon));
 
     m_actions.save.result = new QAction(tr("Reference only"), this);
     QObject::connect(m_actions.save.result, SIGNAL(triggered()), this, SLOT(saveItems()) );
@@ -71,7 +71,7 @@ void CSearchResultView::initView() {
     m_popup->addMenu(m_actions.saveMenu);
 
     m_actions.printMenu = new QMenu(tr("Print..."), m_popup);
-    m_actions.printMenu->setIcon(DU::getIcon(CResMgr::searchdialog::result::foundItems::printMenu::icon));
+    m_actions.printMenu->setIcon(util::getIcon(CResMgr::searchdialog::result::foundItems::printMenu::icon));
 
     m_actions.print.result = new QAction(tr("Reference with text"), this);
     QObject::connect(m_actions.print.result, SIGNAL(triggered()), this, SLOT(printItems()) );
@@ -91,16 +91,14 @@ void CSearchResultView::initConnections() {
 
 /** Setups the list with the given module. */
 void CSearchResultView::setupTree(const CSwordModuleInfo *m,
-                                  const sword::ListKey &results)
+                                  const sword::ListKey & result)
 {
     clear();
 
     if (!m) return;
 
     m_module = m;
-    /// \warning This is a workaround for Sword constness
-    sword::ListKey &result = const_cast<sword::ListKey&>(results);
-    const int count = result.Count();
+    const int count = result.getCount();
     if (!count) return;
 
     setUpdatesEnabled(false);
@@ -169,7 +167,7 @@ void CSearchResultView::printItems() {
     foreach (QTreeWidgetItem* k, items) {
         list.append( k->text(0) );
     }
-    mgr.printKeyList( list, module(), CBTConfig::getDisplayOptionDefaults(), CBTConfig::getFilterOptionDefaults() );
+    mgr.printKeyList( list, module(), btConfig().getDisplayOptions(), btConfig().getFilterOptions() );
 }
 
 void CSearchResultView::saveItems() {
diff --git a/src/frontend/searchdialog/csearchresultview.h b/src/frontend/searchdialog/csearchresultview.h
index 1d37cbd..76b6d38 100644
--- a/src/frontend/searchdialog/csearchresultview.h
+++ b/src/frontend/searchdialog/csearchresultview.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/settingsdialogs/btfontchooserwidget.cpp b/src/frontend/settingsdialogs/btfontchooserwidget.cpp
index 4d943c4..7fcf6b5 100644
--- a/src/frontend/settingsdialogs/btfontchooserwidget.cpp
+++ b/src/frontend/settingsdialogs/btfontchooserwidget.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/settingsdialogs/btfontchooserwidget.h b/src/frontend/settingsdialogs/btfontchooserwidget.h
index 9eb1f4d..eba5607 100644
--- a/src/frontend/settingsdialogs/btfontchooserwidget.h
+++ b/src/frontend/settingsdialogs/btfontchooserwidget.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/settingsdialogs/btfontsettings.cpp b/src/frontend/settingsdialogs/btfontsettings.cpp
index 77a8b0b..57a8aba 100644
--- a/src/frontend/settingsdialogs/btfontsettings.cpp
+++ b/src/frontend/settingsdialogs/btfontsettings.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,11 +16,13 @@
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QWidget>
+#include "backend/config/btconfig.h"
+#include "bibletimeapp.h"
 #include "frontend/settingsdialogs/btfontchooserwidget.h"
 #include "frontend/settingsdialogs/cconfigurationdialog.h"
 #include "util/cresmgr.h"
+#include "util/geticon.h"
 #include "util/tool.h"
-#include "util/directory.h"
 
 // Sword includes:
 #include <localemgr.h>
@@ -28,10 +30,8 @@
 
 
 BtFontSettingsPage::BtFontSettingsPage(CConfigurationDialog *parent)
-        : BtConfigDialog::Page(util::directory::getIcon(CResMgr::settings::fonts::icon), parent)
+        : BtConfigDialog::Page(util::getIcon(CResMgr::settings::fonts::icon), parent)
 {
-    namespace DU = util::directory;
-
     m_languageLabel = new QLabel(this);
     m_languageComboBox = new QComboBox(this);
     m_languageLabel->setBuddy(m_languageComboBox);
@@ -58,13 +58,13 @@ BtFontSettingsPage::BtFontSettingsPage(CConfigurationDialog *parent)
             ? &L::abbrev
             : &L::translatedName;
 
-        m_fontMap.insert((l->*f)(), CBTConfig::get(l));
+        m_fontMap.insert((l->*f)(), btConfig().getFontForLanguage(*l));
     }
 
     for (FontMap::ConstIterator it = m_fontMap.constBegin(); it != m_fontMap.constEnd(); ++it) {
         const QString &k = it.key();
         if (m_fontMap[k].first) { // show font icon
-            m_languageComboBox->addItem(DU::getIcon("fonts.svg"), k);
+            m_languageComboBox->addItem(util::getIcon("fonts.svg"), k);
         } else { // don't show icon for font
             m_languageComboBox->addItem(k);
         }
@@ -84,7 +84,7 @@ BtFontSettingsPage::BtFontSettingsPage(CConfigurationDialog *parent)
     connect(m_languageComboBox, SIGNAL(activated(const QString&)),
             this,               SLOT(newDisplayWindowFontAreaSelected(const QString&)));
 
-    const CBTConfig::FontSettingsPair &v = m_fontMap.value(m_languageComboBox->currentText());
+    const BtConfig::FontSettingsPair &v = m_fontMap.value(m_languageComboBox->currentText());
     m_fontChooser->setFont(v.second);
     useOwnFontClicked(v.first);
     m_languageCheckBox->setChecked(v.first);
@@ -116,12 +116,12 @@ void BtFontSettingsPage::save() const {
             // We possibly use a language, for which we have only the abbrevation
             if (!lang->abbrev().isEmpty()) {
                 // Create a temp language:
-                CLanguageMgr::Language l(k, k, k);
-                CBTConfig::set(&l, it.value());
+                const CLanguageMgr::Language l(k, k, k);
+                btConfig().setFontForLanguage(l, it.value());
             }
         }
         else {
-            CBTConfig::set(lang, it.value());
+            btConfig().setFontForLanguage(*lang, it.value());
         }
     }
 }
@@ -129,23 +129,21 @@ void BtFontSettingsPage::save() const {
 void BtFontSettingsPage::newDisplayWindowFontSelected(const QFont &newFont) {
     const QString languageName = m_languageComboBox->currentText();
     m_fontMap.insert(languageName,
-                     CBTConfig::FontSettingsPair(m_fontMap[languageName].first, newFont));
+                     BtConfig::FontSettingsPair(m_fontMap[languageName].first, newFont));
 }
 
 void BtFontSettingsPage::newDisplayWindowFontAreaSelected(const QString &usage) {
-    const CBTConfig::FontSettingsPair &p = m_fontMap[usage];
+    const BtConfig::FontSettingsPair &p = m_fontMap[usage];
     useOwnFontClicked(p.first);
     m_languageCheckBox->setChecked(p.first);
     m_fontChooser->setFont(p.second);
 }
 
 void BtFontSettingsPage::useOwnFontClicked(bool isOn) {
-    namespace DU = util::directory;
-
     m_fontChooser->setEnabled(isOn);
     m_fontMap[m_languageComboBox->currentText()].first = isOn;
     m_languageComboBox->setItemIcon(m_languageComboBox->currentIndex(),
-                                    isOn ? DU::getIcon("fonts.svg") : QIcon());
+                                    isOn ? util::getIcon("fonts.svg") : QIcon());
 }
 
 void BtFontSettingsPage::retranslateUi() {
diff --git a/src/frontend/settingsdialogs/btfontsettings.h b/src/frontend/settingsdialogs/btfontsettings.h
index 659cd75..70d0d20 100644
--- a/src/frontend/settingsdialogs/btfontsettings.h
+++ b/src/frontend/settingsdialogs/btfontsettings.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -14,7 +16,7 @@
 
 #include <QMap>
 #include <QWidget>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 
 
 class BtFontChooserWidget;
@@ -30,7 +32,7 @@ class BtFontSettingsPage: public BtConfigDialog::Page {
 
     private: /* Types: */
 
-        typedef QMap<QString, CBTConfig::FontSettingsPair> FontMap;
+        typedef QMap<QString, BtConfig::FontSettingsPair> FontMap;
 
     public: /* Methods: */
 
diff --git a/src/frontend/settingsdialogs/btlanguagesettings.cpp b/src/frontend/settingsdialogs/btlanguagesettings.cpp
index be2dd17..37e53c8 100644
--- a/src/frontend/settingsdialogs/btlanguagesettings.cpp
+++ b/src/frontend/settingsdialogs/btlanguagesettings.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -14,11 +14,12 @@
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QWidget>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
+#include "bibletimeapp.h"
 #include "frontend/settingsdialogs/cconfigurationdialog.h"
 #include "util/cresmgr.h"
+#include "util/geticon.h"
 #include "util/tool.h"
-#include "util/directory.h"
 
 // Sword includes:
 #include <localemgr.h>
@@ -29,7 +30,7 @@ typedef std::list<sword::SWBuf>::const_iterator SBLCI;
 
 
 BtLanguageSettingsPage::BtLanguageSettingsPage(CConfigurationDialog *parent)
-        : BtConfigDialog::Page(util::directory::getIcon(CResMgr::settings::languages::icon), parent)
+        : BtConfigDialog::Page(util::getIcon(CResMgr::settings::languages::icon), parent)
 {
     m_swordLocaleCombo = new QComboBox(this);
     m_languageNamesLabel = new QLabel(this);
@@ -44,7 +45,7 @@ BtLanguageSettingsPage::BtLanguageSettingsPage(CConfigurationDialog *parent)
 }
 
 void BtLanguageSettingsPage::save() {
-    CBTConfig::set(CBTConfig::language, m_swordLocaleCombo->itemData(m_swordLocaleCombo->currentIndex()).toString());
+    btConfig().setValue("language", m_swordLocaleCombo->itemData(m_swordLocaleCombo->currentIndex()));
 }
 
 void BtLanguageSettingsPage::resetLanguage() {
@@ -67,14 +68,14 @@ void BtLanguageSettingsPage::resetLanguage() {
             }
         }
     }
-    CBTConfig::set(CBTConfig::language, best);
+    btConfig().setValue("language", best);
 }
 
 QVector<QString> BtLanguageSettingsPage::bookNameAbbreviationsTryVector() {
     QVector<QString> atv;
     atv.reserve(4);
     {
-        QString settingsLanguage = CBTConfig::get(CBTConfig::language);
+        QString settingsLanguage = btConfig().value<QString>("language");
         if (!settingsLanguage.isEmpty())
             atv.append(settingsLanguage);
     }
@@ -132,5 +133,7 @@ void BtLanguageSettingsPage::retranslateUi() {
     setHeaderText(tr("Languages"));
 
     m_languageNamesLabel->setText(tr("Language for names of Bible books:"));
-    m_swordLocaleCombo->setToolTip(tr("The languages which can be used for the biblical booknames"));
+    const QString toolTip(tr("The languages which can be used for the biblical book names. Translations are provided by the Sword library."));
+    m_languageNamesLabel->setToolTip(toolTip);
+    m_swordLocaleCombo->setToolTip(toolTip);
 }
diff --git a/src/frontend/settingsdialogs/btlanguagesettings.h b/src/frontend/settingsdialogs/btlanguagesettings.h
index 7c3b0c9..89caaf2 100644
--- a/src/frontend/settingsdialogs/btlanguagesettings.h
+++ b/src/frontend/settingsdialogs/btlanguagesettings.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/settingsdialogs/btshortcutsdialog.cpp b/src/frontend/settingsdialogs/btshortcutsdialog.cpp
index a5d856d..10601f6 100644
--- a/src/frontend/settingsdialogs/btshortcutsdialog.cpp
+++ b/src/frontend/settingsdialogs/btshortcutsdialog.cpp
@@ -2,13 +2,13 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
 
 #include "frontend/settingsdialogs/btshortcutsdialog.h"
-#include "util/dialogutil.h"
+#include "frontend/messagedialog.h"
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
@@ -56,7 +56,7 @@ BtShortcutsDialog::BtShortcutsDialog(QWidget* parent)
     gridLayout->addWidget(m_alternateLabel, 1, 1);
 
     QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-    util::prepareDialogBox(buttons);
+    message::prepareDialogBox(buttons);
     vLayout->addWidget(buttons);
 
     connect(buttons, SIGNAL(accepted()), this, SLOT(accept()));
diff --git a/src/frontend/settingsdialogs/btshortcutsdialog.h b/src/frontend/settingsdialogs/btshortcutsdialog.h
index f475ebd..722cef9 100644
--- a/src/frontend/settingsdialogs/btshortcutsdialog.h
+++ b/src/frontend/settingsdialogs/btshortcutsdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/settingsdialogs/btshortcutseditor.cpp b/src/frontend/settingsdialogs/btshortcutseditor.cpp
index 618e5ed..2e943eb 100644
--- a/src/frontend/settingsdialogs/btshortcutseditor.cpp
+++ b/src/frontend/settingsdialogs/btshortcutseditor.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/settingsdialogs/btshortcutseditor.h b/src/frontend/settingsdialogs/btshortcutseditor.h
index f9a812a..d58ac08 100644
--- a/src/frontend/settingsdialogs/btshortcutseditor.h
+++ b/src/frontend/settingsdialogs/btshortcutseditor.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/settingsdialogs/btstandardworkstab.cpp b/src/frontend/settingsdialogs/btstandardworkstab.cpp
new file mode 100644
index 0000000..9cef549
--- /dev/null
+++ b/src/frontend/settingsdialogs/btstandardworkstab.cpp
@@ -0,0 +1,203 @@
+/*********
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#include "frontend/settingsdialogs/btstandardworkstab.h"
+
+#include <QCheckBox>
+#include <QComboBox>
+#include <QFormLayout>
+#include <QLabel>
+#include <QVBoxLayout>
+#include "backend/config/btconfig.h"
+#include "backend/managers/cswordbackend.h"
+#include "frontend/settingsdialogs/cswordsettings.h"
+#include "util/tool.h"
+
+
+BtStandardWorksTab::BtStandardWorksTab(CSwordSettingsPage *parent)
+    : QWidget(parent)
+{
+    typedef QList<CSwordModuleInfo*>::const_iterator MLCI;
+
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
+    mainLayout->setMargin(5);
+    mainLayout->setSpacing(2);
+
+    m_explanationLabel = new QLabel(this);
+    m_explanationLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+    m_explanationLabel->setMaximumHeight(50);
+    m_explanationLabel->setMinimumWidth(300);
+    mainLayout->addWidget(m_explanationLabel);
+
+    QFormLayout *formLayout = new QFormLayout;
+    formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
+
+#define STANDARD_WORKS_TAB_ADD_ROW(name) \
+    if (true) { \
+        m_ ## name ## Label = new QLabel(this); \
+        m_ ## name ## Combo = new QComboBox(this); \
+        formLayout->addRow(m_ ## name ## Label, m_ ## name ## Combo); \
+    } else (void) 0
+
+    STANDARD_WORKS_TAB_ADD_ROW(standardBible);
+    STANDARD_WORKS_TAB_ADD_ROW(standardCommentary);
+    STANDARD_WORKS_TAB_ADD_ROW(standardLexicon);
+    STANDARD_WORKS_TAB_ADD_ROW(standardDailyDevotional);
+    STANDARD_WORKS_TAB_ADD_ROW(standardHebrewStrongsLexicon);
+    STANDARD_WORKS_TAB_ADD_ROW(standardGreekStrongsLexicon);
+    STANDARD_WORKS_TAB_ADD_ROW(standardHebrewMorphLexicon);
+    STANDARD_WORKS_TAB_ADD_ROW(standardGreekMorphLexicon);
+
+    mainLayout->addLayout(formLayout);
+    mainLayout->addStretch();
+
+    //fill the comboboxes with the right modules
+
+    const QList<CSwordModuleInfo*> &modules(CSwordBackend::instance()->moduleList());
+    QString modDescript;
+    for (MLCI it(modules.begin()); it != modules.end(); it++) {
+        modDescript = (*it)->config(CSwordModuleInfo::Description);
+
+        switch ((*it)->type()) {
+            case CSwordModuleInfo::Bible:
+                m_standardBibleCombo->addItem(modDescript);
+                break;
+            case CSwordModuleInfo::Commentary:
+                m_standardCommentaryCombo->addItem(modDescript);
+                break;
+            case CSwordModuleInfo::Lexicon: {
+                bool inserted = false;
+                if ((*it)->has(CSwordModuleInfo::HebrewDef)) {
+                    m_standardHebrewStrongsLexiconCombo->addItem(modDescript);
+                    inserted = true;
+                }
+                if ((*it)->has(CSwordModuleInfo::GreekDef)) {
+                    m_standardGreekStrongsLexiconCombo->addItem(modDescript);
+                    inserted = true;
+                }
+                if ((*it)->has(CSwordModuleInfo::HebrewParse)) {
+                    m_standardHebrewMorphLexiconCombo->addItem(modDescript);
+                    inserted = true;
+                }
+                if ((*it)->has(CSwordModuleInfo::GreekParse)) {
+                    m_standardGreekMorphLexiconCombo->addItem(modDescript);
+                    inserted = true;
+                }
+                if ((*it)->category() == CSwordModuleInfo::DailyDevotional) {
+                    m_standardDailyDevotionalCombo->addItem(modDescript);
+                    inserted = true;
+                }
+
+                if (!inserted) {    //daily dvotionals, striong lexicons etc. are not very useful for word lookups
+                    m_standardLexiconCombo->addItem(modDescript);
+                }
+                break;
+            }
+            default://unknown type
+                break;
+        } //switch
+    } //for
+
+    //using two lists and one loop is better than six loops with almost the same code :)
+    QList<QComboBox*> comboList;
+    QStringList moduleList;
+
+    // fill combobox and modulelist
+        const CSwordModuleInfo*  m;
+
+#define STANDARD_WORKS_COMBO_ADD(name) \
+    comboList.append(m_ ## name ## Combo); \
+    m = btConfig().getDefaultSwordModuleByType(#name); \
+    moduleList << (m != 0 ? m->config(CSwordModuleInfo::Description) : QString::null);
+
+        STANDARD_WORKS_COMBO_ADD(standardBible);
+        STANDARD_WORKS_COMBO_ADD(standardCommentary);
+        STANDARD_WORKS_COMBO_ADD(standardLexicon);
+        STANDARD_WORKS_COMBO_ADD(standardDailyDevotional);
+        STANDARD_WORKS_COMBO_ADD(standardHebrewStrongsLexicon);
+        STANDARD_WORKS_COMBO_ADD(standardGreekStrongsLexicon);
+        STANDARD_WORKS_COMBO_ADD(standardHebrewMorphLexicon);
+        STANDARD_WORKS_COMBO_ADD(standardGreekMorphLexicon);
+
+    QString module = QString::null;
+    int item = 0;
+    int count = 0;
+    QListIterator<QComboBox*> it(comboList);
+    while (it.hasNext()) {
+        //for (QComboBox* combo = comboList.first(); combo; combo = comboList.next() )
+        QComboBox* combo = it.next();
+        module = moduleList[comboList.indexOf(combo)];
+        count = combo->count();
+
+        for (item = 0; item < count; item++) {
+            if (combo->itemText(item) == module ) {
+                combo->setCurrentIndex(item);
+                break;
+            }
+        }
+    }
+
+    retranslateUi();
+}
+
+#define STANDARD_WORKS_SET_DEFAULT(name) \
+    btConfig().setDefaultSwordModuleByType(\
+        #name, \
+        CSwordBackend::instance()->findModuleByDescription(m_ ## name ## Combo->currentText()) \
+    );
+
+void BtStandardWorksTab::save() {
+    STANDARD_WORKS_SET_DEFAULT(standardBible);
+    STANDARD_WORKS_SET_DEFAULT(standardCommentary);
+    STANDARD_WORKS_SET_DEFAULT(standardLexicon);
+    STANDARD_WORKS_SET_DEFAULT(standardDailyDevotional);
+    STANDARD_WORKS_SET_DEFAULT(standardHebrewStrongsLexicon);
+    STANDARD_WORKS_SET_DEFAULT(standardGreekStrongsLexicon);
+    STANDARD_WORKS_SET_DEFAULT(standardHebrewMorphLexicon);
+    STANDARD_WORKS_SET_DEFAULT(standardGreekMorphLexicon);
+}
+
+void BtStandardWorksTab::retranslateUi() {
+    util::tool::initExplanationLabel(
+        m_explanationLabel, "",
+        tr("Standard works are used when no particular work is specified, for example "
+           "when a hyperlink into a Bible or lexicon was clicked."));
+
+    m_standardBibleLabel->setText(tr("Bible:"));
+    m_standardBibleCombo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+    m_standardBibleCombo->setToolTip(tr("The standard Bible is used when a hyperlink into a Bible is clicked"));
+
+    m_standardCommentaryLabel->setText(tr("Commentary:"));
+    m_standardCommentaryCombo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+    m_standardCommentaryCombo->setToolTip(tr("The standard commentary is used when a hyperlink into a commentary is clicked"));
+
+    m_standardLexiconLabel->setText(tr("Lexicon:"));
+    m_standardLexiconCombo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+    m_standardLexiconCombo->setToolTip(tr("The standard lexicon is used when a hyperlink into a lexicon is clicked"));
+
+    m_standardDailyDevotionalLabel->setText(tr("Daily devotional:"));
+    m_standardDailyDevotionalCombo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+    m_standardDailyDevotionalCombo->setToolTip(tr("The standard devotional will be used to display a short start up devotional"));
+
+    m_standardHebrewStrongsLexiconLabel->setText(tr("Hebrew Strong's lexicon:"));
+    m_standardHebrewStrongsLexiconCombo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+    m_standardHebrewStrongsLexiconCombo->setToolTip(tr("The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked"));
+
+    m_standardGreekStrongsLexiconLabel->setText(tr("Greek Strong's lexicon:"));
+    m_standardGreekStrongsLexiconCombo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+    m_standardGreekStrongsLexiconCombo->setToolTip(tr("The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked"));
+
+    m_standardHebrewMorphLexiconLabel->setText(tr("Hebrew morphological lexicon:"));
+    m_standardHebrewMorphLexiconCombo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+    m_standardHebrewMorphLexiconCombo->setToolTip(tr("The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked"));
+
+    m_standardGreekMorphLexiconLabel->setText(tr("Greek morphological lexicon:"));
+    m_standardGreekMorphLexiconCombo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+    m_standardGreekMorphLexiconCombo->setToolTip(tr("The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked"));
+}
diff --git a/src/frontend/settingsdialogs/btstandardworkstab.h b/src/frontend/settingsdialogs/btstandardworkstab.h
new file mode 100644
index 0000000..0b91b4c
--- /dev/null
+++ b/src/frontend/settingsdialogs/btstandardworkstab.h
@@ -0,0 +1,55 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#ifndef BTSTANDARDWORKSTAB_H
+#define BTSTANDARDWORKSTAB_H
+
+#include <QWidget>
+
+
+class CSwordSettingsPage;
+class QCheckBox;
+class QComboBox;
+class QLabel;
+
+class BtStandardWorksTab: public QWidget {
+
+    Q_OBJECT
+
+    public: /* Methods: */
+
+        BtStandardWorksTab(CSwordSettingsPage * parent);
+
+        void save();
+
+    protected: /* Methods: */
+
+        void retranslateUi();
+
+    private: /* Fields: */
+
+        QLabel * m_explanationLabel;
+
+#define STANDARD_WORKS_TAB_FIELD(name) \
+        QLabel * m_ ## name ## Label; \
+        QComboBox * m_ ## name ## Combo
+
+        STANDARD_WORKS_TAB_FIELD(standardBible);
+        STANDARD_WORKS_TAB_FIELD(standardCommentary);
+        STANDARD_WORKS_TAB_FIELD(standardLexicon);
+        STANDARD_WORKS_TAB_FIELD(standardDailyDevotional);
+        STANDARD_WORKS_TAB_FIELD(standardHebrewStrongsLexicon);
+        STANDARD_WORKS_TAB_FIELD(standardGreekStrongsLexicon);
+        STANDARD_WORKS_TAB_FIELD(standardHebrewMorphLexicon);
+        STANDARD_WORKS_TAB_FIELD(standardGreekMorphLexicon);
+};
+
+#endif /* BTSTANDARDWORKSTAB_H */
diff --git a/src/frontend/settingsdialogs/bttextfilterstab.cpp b/src/frontend/settingsdialogs/bttextfilterstab.cpp
new file mode 100644
index 0000000..e8da038
--- /dev/null
+++ b/src/frontend/settingsdialogs/bttextfilterstab.cpp
@@ -0,0 +1,87 @@
+/*********
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#include "frontend/settingsdialogs/bttextfilterstab.h"
+
+#include <QCheckBox>
+#include <QLabel>
+#include <QVBoxLayout>
+#include "backend/config/btconfig.h"
+#include "frontend/settingsdialogs/cswordsettings.h"
+#include "util/tool.h"
+
+
+#define TEXT_FILTERS_TAB_ADD_ROW(name,def) \
+        m_ ## name ## Check = new QCheckBox(this); \
+        m_ ## name ## Check->setChecked(btConfig().sessionValue<bool>(#name,(def))); \
+        layout->addWidget(m_ ## name ## Check);
+
+BtTextFiltersTab::BtTextFiltersTab(CSwordSettingsPage *parent)
+    : QWidget(parent)
+{
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    layout->setMargin(5);
+    layout->setSpacing(2);
+
+    m_explanationLabel = new QLabel(this);
+    m_explanationLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+    m_explanationLabel->setMaximumHeight(50);
+    layout->addWidget(m_explanationLabel);
+
+    btConfig().beginGroup("presentation");
+        TEXT_FILTERS_TAB_ADD_ROW(lineBreaks, false);
+        TEXT_FILTERS_TAB_ADD_ROW(verseNumbers, false);
+        TEXT_FILTERS_TAB_ADD_ROW(headings, true);
+        TEXT_FILTERS_TAB_ADD_ROW(hebrewPoints, true);
+        TEXT_FILTERS_TAB_ADD_ROW(hebrewCantillation, true);
+        TEXT_FILTERS_TAB_ADD_ROW(morphSegmentation, true);
+        TEXT_FILTERS_TAB_ADD_ROW(greekAccents, true);
+        TEXT_FILTERS_TAB_ADD_ROW(textualVariants, false);
+        TEXT_FILTERS_TAB_ADD_ROW(scriptureReferences, true);
+    btConfig().endGroup();
+
+    layout->addStretch(4);
+
+    retranslateUi();
+}
+
+#define TEXT_FILTERS_TAB_SAVE(name) \
+    btConfig().setSessionValue(#name, m_ ## name ## Check->isChecked())
+
+void BtTextFiltersTab::save() {
+    btConfig().beginGroup("presentation");
+        TEXT_FILTERS_TAB_SAVE(lineBreaks);
+        TEXT_FILTERS_TAB_SAVE(verseNumbers);
+        TEXT_FILTERS_TAB_SAVE(headings);
+        TEXT_FILTERS_TAB_SAVE(hebrewPoints);
+        TEXT_FILTERS_TAB_SAVE(hebrewCantillation);
+        TEXT_FILTERS_TAB_SAVE(morphSegmentation);
+        TEXT_FILTERS_TAB_SAVE(greekAccents);
+        TEXT_FILTERS_TAB_SAVE(textualVariants);
+        TEXT_FILTERS_TAB_SAVE(scriptureReferences);
+    btConfig().endGroup();
+}
+
+
+void BtTextFiltersTab::retranslateUi() {
+    util::tool::initExplanationLabel(m_explanationLabel, "",
+          tr("Filters control the appearance of text. Here you can specify "
+             "default settings for all filters. You can override these "
+             "settings in each display window."));
+
+    m_lineBreaksCheck->setText(tr("Insert line break after each verse"));
+    m_verseNumbersCheck->setText(tr("Show verse numbers"));
+    m_headingsCheck->setText(tr("Show section headings"));
+    m_scriptureReferencesCheck->setText(tr("Show scripture cross-references"));
+    m_greekAccentsCheck->setText(tr("Show Greek accents"));
+    m_hebrewPointsCheck->setText(tr("Show Hebrew vowel points"));
+    m_hebrewCantillationCheck->setText(tr("Show Hebrew cantillation marks"));
+    m_morphSegmentationCheck->setText(tr("Show morph segmentation"));
+    m_textualVariantsCheck->setText(tr("Use textual variants"));
+}
diff --git a/src/frontend/settingsdialogs/bttextfilterstab.h b/src/frontend/settingsdialogs/bttextfilterstab.h
new file mode 100644
index 0000000..3f6e904
--- /dev/null
+++ b/src/frontend/settingsdialogs/bttextfilterstab.h
@@ -0,0 +1,54 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#ifndef BTTEXTFILTERSTAB_H
+#define BTTEXTFILTERSTAB_H
+
+#include <QWidget>
+
+class CSwordSettingsPage;
+class QCheckBox;
+class QLabel;
+
+
+class BtTextFiltersTab: public QWidget {
+
+    Q_OBJECT
+
+    public: /* Methods: */
+
+        BtTextFiltersTab(CSwordSettingsPage * parent);
+
+        void save();
+
+    protected: /* Methods: */
+
+        void retranslateUi();
+
+    private: /* Fields: */
+
+        QLabel * m_explanationLabel;
+
+#define TEXT_FILTERS_TAB_FIELD(name) QCheckBox * m_ ## name ## Check
+
+        TEXT_FILTERS_TAB_FIELD(lineBreaks);
+        TEXT_FILTERS_TAB_FIELD(verseNumbers);
+        TEXT_FILTERS_TAB_FIELD(headings);
+        TEXT_FILTERS_TAB_FIELD(hebrewPoints);
+        TEXT_FILTERS_TAB_FIELD(hebrewCantillation);
+        TEXT_FILTERS_TAB_FIELD(morphSegmentation);
+        TEXT_FILTERS_TAB_FIELD(greekAccents);
+        TEXT_FILTERS_TAB_FIELD(textualVariants);
+        TEXT_FILTERS_TAB_FIELD(scriptureReferences);
+
+};
+
+#endif /* BTTEXTFILTERSTAB_H */
diff --git a/src/frontend/settingsdialogs/cacceleratorsettings.cpp b/src/frontend/settingsdialogs/cacceleratorsettings.cpp
index 177ea2f..d85bf51 100644
--- a/src/frontend/settingsdialogs/cacceleratorsettings.cpp
+++ b/src/frontend/settingsdialogs/cacceleratorsettings.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -13,25 +13,25 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QList>
-#include <QMessageBox>
 #include <QStackedWidget>
 #include <QVBoxLayout>
 #include <QWidget>
 #include "bibletime.h"
-#include "backend/config/cbtconfig.h"
+#include "bibletimeapp.h"
 #include "frontend/displaywindow/btactioncollection.h"
 #include "frontend/displaywindow/cbiblereadwindow.h"
 #include "frontend/displaywindow/cbookreadwindow.h"
 #include "frontend/displaywindow/ccommentaryreadwindow.h"
 #include "frontend/displaywindow/clexiconreadwindow.h"
 #include "frontend/displaywindow/creadwindow.h"
+#include "frontend/messagedialog.h"
 #include "frontend/settingsdialogs/cconfigurationdialog.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
+#include "util/geticon.h"
 
 
 CAcceleratorSettingsPage::CAcceleratorSettingsPage(CConfigurationDialog *parent)
-        : BtConfigDialog::Page(util::directory::getIcon(CResMgr::settings::keys::icon), parent)
+        : BtConfigDialog::Page(util::getIcon(CResMgr::settings::keys::icon), parent)
 {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
 
@@ -48,21 +48,16 @@ CAcceleratorSettingsPage::CAcceleratorSettingsPage(CConfigurationDialog *parent)
                       SLOT(slotKeyChooserTypeChanged(const QString&)) );
     Q_ASSERT(ok);
 
+    // m_*.title strings are empty here, they are filled and added to the stacked widget in the retranslateUi() function
     m_keyChooserStack = new QStackedWidget(this);
-
-    m_typeChooser->addItem(m_application.title);
-    m_typeChooser->addItem(m_general.title);
-    m_typeChooser->addItem(m_bible.title);
-    m_typeChooser->addItem(m_commentary.title);
-    m_typeChooser->addItem(m_lexicon.title);
-    m_typeChooser->addItem(m_book.title);
+    retranslateUi();
 
     // create shortcuteditors
 
     // ------ Application -------------- //
     m_application.actionCollection = new BtActionCollection(this);
     BibleTime::insertKeyboardActions( m_application.actionCollection);
-    CBTConfig::setupAccelSettings(CBTConfig::application, m_application.actionCollection);
+    m_application.actionCollection->readShortcuts("Application shortcuts");
     m_application.keyChooser = new BtShortcutsEditor(m_application.actionCollection, m_keyChooserStack);
     m_keyChooserStack->addWidget(m_application.keyChooser);
     ok = connect(m_application.keyChooser, SIGNAL(keyChangeRequest(BtShortcutsEditor*, const QString&)),
@@ -72,7 +67,7 @@ CAcceleratorSettingsPage::CAcceleratorSettingsPage(CConfigurationDialog *parent)
     // ----- All display windows ------ //
     m_general.actionCollection = new BtActionCollection(this);
     CDisplayWindow::insertKeyboardActions( m_general.actionCollection);
-    CBTConfig::setupAccelSettings(CBTConfig::allWindows, m_general.actionCollection);
+    m_general.actionCollection->readShortcuts("Displaywindow shortcuts");
     m_general.keyChooser = new BtShortcutsEditor(m_general.actionCollection, m_keyChooserStack);
     m_keyChooserStack->addWidget(m_general.keyChooser);
     ok = connect(m_general.keyChooser, SIGNAL(keyChangeRequest(BtShortcutsEditor*, const QString&)),
@@ -82,7 +77,7 @@ CAcceleratorSettingsPage::CAcceleratorSettingsPage(CConfigurationDialog *parent)
     // ----- Bible windows ------ //
     m_bible.actionCollection = new BtActionCollection(this);
     CBibleReadWindow::insertKeyboardActions( m_bible.actionCollection);
-    CBTConfig::setupAccelSettings(CBTConfig::bibleWindow, m_bible.actionCollection);
+    m_bible.actionCollection->readShortcuts("Bible shortcuts");
     m_bible.keyChooser = new BtShortcutsEditor(m_bible.actionCollection, m_keyChooserStack);
     m_keyChooserStack->addWidget(m_bible.keyChooser);
     ok = connect(m_bible.keyChooser, SIGNAL(keyChangeRequest(BtShortcutsEditor*, const QString&)),
@@ -92,7 +87,7 @@ CAcceleratorSettingsPage::CAcceleratorSettingsPage(CConfigurationDialog *parent)
     // ----- Commentary windows ------ //
     m_commentary.actionCollection = new BtActionCollection(this);
     CCommentaryReadWindow::insertKeyboardActions( m_commentary.actionCollection);
-    CBTConfig::setupAccelSettings(CBTConfig::commentaryWindow,    m_commentary.actionCollection);
+    m_commentary.actionCollection->readShortcuts("Commentary shortcuts");
     m_commentary.keyChooser = new BtShortcutsEditor(m_commentary.actionCollection, m_keyChooserStack);
     m_keyChooserStack->addWidget(m_commentary.keyChooser);
     ok = connect(m_commentary.keyChooser, SIGNAL(keyChangeRequest(BtShortcutsEditor*, const QString&)),
@@ -102,8 +97,8 @@ CAcceleratorSettingsPage::CAcceleratorSettingsPage(CConfigurationDialog *parent)
     // ----- Lexicon windows ------ //
     m_lexicon.actionCollection = new BtActionCollection(this);
     CLexiconReadWindow::insertKeyboardActions(  m_lexicon.actionCollection );
-    CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, m_lexicon.actionCollection);
-    m_lexicon.keyChooser = new BtShortcutsEditor(m_lexicon.actionCollection, m_keyChooserStack                                         );
+    m_lexicon.actionCollection->readShortcuts("Lexicon shortcuts");
+    m_lexicon.keyChooser = new BtShortcutsEditor(m_lexicon.actionCollection, m_keyChooserStack);
     m_keyChooserStack->addWidget(m_lexicon.keyChooser);
     ok = connect(m_lexicon.keyChooser, SIGNAL(keyChangeRequest(BtShortcutsEditor*, const QString&)),
                  this, SLOT(completeKeyChangeRequest(BtShortcutsEditor*, const QString&)));
@@ -112,7 +107,7 @@ CAcceleratorSettingsPage::CAcceleratorSettingsPage(CConfigurationDialog *parent)
     // ----- Book windows ------ //
     m_book.actionCollection = new BtActionCollection(this);
     CBookReadWindow::insertKeyboardActions( m_book.actionCollection);
-    CBTConfig::setupAccelSettings(CBTConfig::bookWindow, m_book.actionCollection);
+    m_book.actionCollection->readShortcuts("Book shortcuts");
     m_book.keyChooser = new BtShortcutsEditor(m_book.actionCollection, m_keyChooserStack);
     m_keyChooserStack->addWidget(m_book.keyChooser);
     ok = connect(m_book.keyChooser, SIGNAL(keyChangeRequest(BtShortcutsEditor*, const QString&)),
@@ -157,17 +152,12 @@ void CAcceleratorSettingsPage::completeKeyChangeRequest(BtShortcutsEditor* short
     QString conflicts = findConflictsWithKeys(keys, list);
     if (!conflicts.isEmpty()) {
         QString message = QObject::tr("This shortcut conflicts with the shortcut for the following actions:");
-        message.append("\n");
+        message.append("<br/><br/>");
         message.append(conflicts);
 
-        QMessageBox msgBox(this);
-        msgBox.setIcon(QMessageBox::Question);
-        msgBox.setText(message);
-        msgBox.setInformativeText(QObject::tr("Do you want to clear the conflicting shortcuts and continue?"));
-        msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-        msgBox.setDefaultButton(QMessageBox::Yes);
-        int ret = msgBox.exec();
-        if ( ret == QMessageBox::Yes) {
+        if (message::showQuestion(this,
+            QObject::tr("Do you want to clear the conflicting shortcuts and continue?"),
+            message, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) {
             clearConflictsWithKeys(keys, list);
             shortcutsEditor->changeShortcutInDialog(keys);
         }
@@ -244,12 +234,12 @@ void CAcceleratorSettingsPage::save() {
     if (m_book.keyChooser)
         m_book.keyChooser->commitChanges();
 
-    CBTConfig::saveAccelSettings(CBTConfig::application, m_application.actionCollection);        //application
-    CBTConfig::saveAccelSettings(CBTConfig::allWindows, m_general.actionCollection);            //read display windows
-    CBTConfig::saveAccelSettings(CBTConfig::bibleWindow, m_bible.actionCollection);                //bible
-    CBTConfig::saveAccelSettings(CBTConfig::commentaryWindow, m_commentary.actionCollection);    //commentary
-    CBTConfig::saveAccelSettings(CBTConfig::lexiconWindow, m_lexicon.actionCollection);            //lexicon
-    CBTConfig::saveAccelSettings(CBTConfig::bookWindow,    m_book.actionCollection);                //book
+    m_application.actionCollection->writeShortcuts("Application shortcuts"); //application
+    m_general.actionCollection->writeShortcuts("Displaywindow shortcuts"); //read display windows
+    m_bible.actionCollection->writeShortcuts("Bible shortcuts"); //bible
+    m_commentary.actionCollection->writeShortcuts("Commentary shortcuts"); //commentary
+    m_lexicon.actionCollection->writeShortcuts("Lexicon shortcuts"); //lexicon
+    m_book.actionCollection->writeShortcuts("Book shortcuts"); //book
 }
 
 void CAcceleratorSettingsPage::slotKeyChooserTypeChanged(const QString& title) {
diff --git a/src/frontend/settingsdialogs/cacceleratorsettings.h b/src/frontend/settingsdialogs/cacceleratorsettings.h
index 1bd4173..49408d5 100644
--- a/src/frontend/settingsdialogs/cacceleratorsettings.h
+++ b/src/frontend/settingsdialogs/cacceleratorsettings.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/settingsdialogs/cconfigurationdialog.cpp b/src/frontend/settingsdialogs/cconfigurationdialog.cpp
index 4c5bf1b..951880b 100644
--- a/src/frontend/settingsdialogs/cconfigurationdialog.cpp
+++ b/src/frontend/settingsdialogs/cconfigurationdialog.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -14,16 +14,21 @@
 #include <QLayout>
 #include <QPushButton>
 #include <QWidget>
+#include "backend/config/btconfig.h"
 #include "frontend/settingsdialogs/cacceleratorsettings.h"
 #include "frontend/settingsdialogs/cdisplaysettings.h"
 #include "frontend/settingsdialogs/btfontsettings.h"
 #include "frontend/settingsdialogs/btlanguagesettings.h"
 #include "frontend/settingsdialogs/cswordsettings.h"
+#include "frontend/messagedialog.h"
 #include "util/cresmgr.h"
 #include "util/directory.h"
-#include "util/dialogutil.h"
 
 
+namespace {
+const QString GeometryKey = "GUI/SettingsDialog/geometry";
+} // anonymous namespace
+
 CConfigurationDialog::CConfigurationDialog(QWidget * parent, BtActionCollection* actionCollection )
         : BtConfigDialog(parent),
         m_actionCollection(actionCollection),
@@ -61,7 +66,7 @@ CConfigurationDialog::CConfigurationDialog(QWidget * parent, BtActionCollection*
     m_bbox->addButton(QDialogButtonBox::Ok);
     m_bbox->addButton(QDialogButtonBox::Apply);
     m_bbox->addButton(QDialogButtonBox::Cancel);
-    util::prepareDialogBox(m_bbox);
+    message::prepareDialogBox(m_bbox);
     setButtonBox(m_bbox);
     bool ok = connect(m_bbox, SIGNAL(clicked(QAbstractButton *)), SLOT(slotButtonClicked(QAbstractButton *)));
     Q_ASSERT(ok);
@@ -99,13 +104,9 @@ void CConfigurationDialog::slotButtonClicked(QAbstractButton* button) {
 }
 
 void CConfigurationDialog::loadDialogSettings() {
-    resize(CBTConfig::get(CBTConfig::configDialogWidth), CBTConfig::get(CBTConfig::configDialogHeight));
-    move(CBTConfig::get(CBTConfig::configDialogPosX), CBTConfig::get(CBTConfig::configDialogPosY));
+    restoreGeometry(btConfig().value<QByteArray>(GeometryKey, QByteArray()));
 }
 
 void CConfigurationDialog::saveDialogSettings() const {
-    CBTConfig::set(CBTConfig::configDialogWidth, size().width());
-    CBTConfig::set(CBTConfig::configDialogHeight, size().height());
-    CBTConfig::set(CBTConfig::configDialogPosX, x());
-    CBTConfig::set(CBTConfig::configDialogPosY, y());
+    btConfig().setValue(GeometryKey, saveGeometry());
 }
diff --git a/src/frontend/settingsdialogs/cconfigurationdialog.h b/src/frontend/settingsdialogs/cconfigurationdialog.h
index d38b4e4..fbd4944 100644
--- a/src/frontend/settingsdialogs/cconfigurationdialog.h
+++ b/src/frontend/settingsdialogs/cconfigurationdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/settingsdialogs/cdisplaysettings.cpp b/src/frontend/settingsdialogs/cdisplaysettings.cpp
index 6af4547..5b690f6 100644
--- a/src/frontend/settingsdialogs/cdisplaysettings.cpp
+++ b/src/frontend/settingsdialogs/cdisplaysettings.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -14,12 +14,13 @@
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QWebView>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/managers/cdisplaytemplatemgr.h"
 #include "backend/rendering/cdisplayrendering.h"
+#include "bibletimeapp.h"
 #include "frontend/settingsdialogs/cconfigurationdialog.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
+#include "util/geticon.h"
 #include "util/tool.h"
 
 
@@ -46,13 +47,13 @@ QSize CWebViewerWidget::sizeHint () const {
 
 /** Initializes the startup section of the OD. */
 CDisplaySettingsPage::CDisplaySettingsPage(CConfigurationDialog *parent)
-        : BtConfigDialog::Page(util::directory::getIcon(CResMgr::settings::startup::icon), parent)
+        : BtConfigDialog::Page(util::getIcon(CResMgr::settings::startup::icon), parent)
 {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
 
     { //startup logo
         m_showLogoCheck = new QCheckBox(this);
-        m_showLogoCheck->setChecked(CBTConfig::get(CBTConfig::logo));
+        m_showLogoCheck->setChecked(btConfig().value<bool>("GUI/showSplashScreen", true));
         mainLayout->addWidget(m_showLogoCheck);
     }
     mainLayout->addSpacing(20);
@@ -161,14 +162,14 @@ void CDisplaySettingsPage::updateStylePreview() {
 
     /// \todo Remove the following hack:
     const QString oldStyleName = CDisplayTemplateMgr::activeTemplateName();
-    CBTConfig::set(CBTConfig::displayStyle, styleName);
+    btConfig().setValue("GUI/activeTemplateName", styleName);
     CDisplayRendering render;
     m_stylePreviewViewer->setHtml( render.renderKeyTree(tree));
 
-    CBTConfig::set(CBTConfig::displayStyle, oldStyleName);
+    btConfig().setValue("GUI/activeTemplateName", oldStyleName);
 }
 
 void CDisplaySettingsPage::save() {
-    CBTConfig::set(CBTConfig::logo, m_showLogoCheck->isChecked());
-    CBTConfig::set(CBTConfig::displayStyle, m_styleChooserCombo->currentText());
+    btConfig().setValue("GUI/showSplashScreen", m_showLogoCheck->isChecked() );
+    btConfig().setValue("GUI/activeTemplateName", m_styleChooserCombo->currentText());
 }
diff --git a/src/frontend/settingsdialogs/cdisplaysettings.h b/src/frontend/settingsdialogs/cdisplaysettings.h
index b18a26f..834c846 100644
--- a/src/frontend/settingsdialogs/cdisplaysettings.h
+++ b/src/frontend/settingsdialogs/cdisplaysettings.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/frontend/settingsdialogs/clistwidget.cpp b/src/frontend/settingsdialogs/clistwidget.cpp
index 3a2a4c7..9504009 100644
--- a/src/frontend/settingsdialogs/clistwidget.cpp
+++ b/src/frontend/settingsdialogs/clistwidget.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -17,10 +17,6 @@ CListWidget::CListWidget(QWidget* parent)
     // Intentionally empty
 }
 
-CListWidget::~CListWidget() {
-    // Intentionally empty
-}
-
 QSize CListWidget::sizeHint () const {
     return QSize(100, 120);
 }
diff --git a/src/frontend/settingsdialogs/clistwidget.h b/src/frontend/settingsdialogs/clistwidget.h
index ecd5f98..393754c 100644
--- a/src/frontend/settingsdialogs/clistwidget.h
+++ b/src/frontend/settingsdialogs/clistwidget.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -17,7 +19,7 @@ class CListWidget : public QListWidget {
         Q_OBJECT
     public:
         CListWidget(QWidget* parent = 0);
-        ~CListWidget();
+
         virtual QSize sizeHint () const;
         void setCharWidth(int width);
 };
diff --git a/src/frontend/settingsdialogs/cswordsettings.cpp b/src/frontend/settingsdialogs/cswordsettings.cpp
index 60c0e7c..f8f0ebf 100644
--- a/src/frontend/settingsdialogs/cswordsettings.cpp
+++ b/src/frontend/settingsdialogs/cswordsettings.cpp
@@ -2,322 +2,36 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
 
 #include "frontend/settingsdialogs/cswordsettings.h"
 
-#include <QCheckBox>
-#include <QComboBox>
-#include <QFormLayout>
-#include <QLabel>
-#include <QList>
-#include <QString>
-#include <QStringList>
-#include <QTabWidget>
 #include <QVBoxLayout>
-#include <QWidget>
-#include "backend/config/cbtconfig.h"
+#include "bibletimeapp.h"
+#include "frontend/settingsdialogs/btstandardworkstab.h"
+#include "frontend/settingsdialogs/bttextfilterstab.h"
 #include "frontend/settingsdialogs/cconfigurationdialog.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
-#include "util/tool.h"
+#include "util/geticon.h"
 
 
-/*******************************************************************************
-  StandardWorksTab
-*******************************************************************************/
-
-StandardWorksTab::StandardWorksTab(CSwordSettingsPage *parent)
-    : QWidget(parent)
-{
-    typedef QList<CSwordModuleInfo*>::const_iterator MLCI;
-
-    QVBoxLayout *mainLayout = new QVBoxLayout(this);
-    mainLayout->setMargin(5);
-    mainLayout->setSpacing(2);
-
-    m_explanationLabel = new QLabel(this);
-    m_explanationLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
-    m_explanationLabel->setMaximumHeight(50);
-    m_explanationLabel->setMinimumWidth(300);
-    mainLayout->addWidget(m_explanationLabel);
-
-    QFormLayout *formLayout = new QFormLayout;
-
-#define STANDARD_WORKS_TAB_ADD_ROW(name) \
-    if (true) { \
-        m_ ## name ## Label = new QLabel(this); \
-        m_ ## name ## Combo = new QComboBox(this); \
-        formLayout->addRow(m_ ## name ## Label, m_ ## name ## Combo); \
-    } else (void) 0
-
-    STANDARD_WORKS_TAB_ADD_ROW(standardBible);
-    STANDARD_WORKS_TAB_ADD_ROW(standardCommentary);
-    STANDARD_WORKS_TAB_ADD_ROW(standardLexicon);
-    STANDARD_WORKS_TAB_ADD_ROW(standardDailyDevotional);
-    STANDARD_WORKS_TAB_ADD_ROW(standardHebrewStrongsLexicon);
-    STANDARD_WORKS_TAB_ADD_ROW(standardGreekStrongsLexicon);
-    STANDARD_WORKS_TAB_ADD_ROW(standardHebrewMorphLexicon);
-    STANDARD_WORKS_TAB_ADD_ROW(standardGreekMorphLexicon);
-
-    mainLayout->addLayout(formLayout);
-    mainLayout->addStretch();
-
-    //fill the comboboxes with the right modules
-
-    const QList<CSwordModuleInfo*> &modules(CSwordBackend::instance()->moduleList());
-    QString modDescript;
-    for (MLCI it(modules.begin()); it != modules.end(); it++) {
-        modDescript = (*it)->config(CSwordModuleInfo::Description);
-
-        switch ((*it)->type()) {
-            case CSwordModuleInfo::Bible:
-                m_standardBibleCombo->addItem(modDescript);
-                break;
-            case CSwordModuleInfo::Commentary:
-                m_standardCommentaryCombo->addItem(modDescript);
-                break;
-            case CSwordModuleInfo::Lexicon: {
-                bool inserted = false;
-                if ((*it)->has(CSwordModuleInfo::HebrewDef)) {
-                    m_standardHebrewStrongsLexiconCombo->addItem(modDescript);
-                    inserted = true;
-                }
-                if ((*it)->has(CSwordModuleInfo::GreekDef)) {
-                    m_standardGreekStrongsLexiconCombo->addItem(modDescript);
-                    inserted = true;
-                }
-                if ((*it)->has(CSwordModuleInfo::HebrewParse)) {
-                    m_standardHebrewMorphLexiconCombo->addItem(modDescript);
-                    inserted = true;
-                }
-                if ((*it)->has(CSwordModuleInfo::GreekParse)) {
-                    m_standardGreekMorphLexiconCombo->addItem(modDescript);
-                    inserted = true;
-                }
-                if ((*it)->category() == CSwordModuleInfo::DailyDevotional) {
-                    m_standardDailyDevotionalCombo->addItem(modDescript);
-                    inserted = true;
-                }
-
-                if (!inserted) {    //daily dvotionals, striong lexicons etc. are not very useful for word lookups
-                    m_standardLexiconCombo->addItem(modDescript);
-                }
-                break;
-            }
-            default://unknown type
-                break;
-        } //switch
-    } //for
-
-    //using two lists and one loop is better than six loops with almost the same code :)
-    QList<QComboBox*> comboList;
-    QStringList moduleList;
-
-#define STANDARD_WORKS_TAB_CASE(name) \
-    case CBTConfig::name: \
-        comboList.append(m_ ## name ## Combo); \
-        break
-
-    for (int i = 0; i <= (int)CBTConfig::lastModuleType; ++i) {
-        //fill the combobox list in the right order (i.e. same order as the CBTConfig::module enum list)
-        CBTConfig::modules moduleType = (CBTConfig::modules)(i);
-        switch (moduleType) {
-            STANDARD_WORKS_TAB_CASE(standardBible);
-            STANDARD_WORKS_TAB_CASE(standardCommentary);
-            STANDARD_WORKS_TAB_CASE(standardLexicon);
-            STANDARD_WORKS_TAB_CASE(standardDailyDevotional);
-            STANDARD_WORKS_TAB_CASE(standardHebrewStrongsLexicon);
-            STANDARD_WORKS_TAB_CASE(standardGreekStrongsLexicon);
-            STANDARD_WORKS_TAB_CASE(standardHebrewMorphLexicon);
-            STANDARD_WORKS_TAB_CASE(standardGreekMorphLexicon);
-        }
-        ; //switch
-
-        //fill the module list
-        CSwordModuleInfo* const m = CBTConfig::get( (CBTConfig::modules)(i) );
-        if (m) {
-            moduleList << m->config(CSwordModuleInfo::Description);
-        }
-        else {
-            moduleList << QString::null;
-        }
-    } //for
-
-    QString module = QString::null;
-    int item = 0;
-    int count = 0;
-    QListIterator<QComboBox*> it(comboList);
-    while (it.hasNext()) {
-        //for (QComboBox* combo = comboList.first(); combo; combo = comboList.next() )
-        QComboBox* combo = it.next();
-        module = moduleList[comboList.indexOf(combo)];
-        count = combo->count();
-        combo->setMaximumWidth(300);
-
-        for (item = 0; item < count; item++) {
-            if (combo->itemText(item) == module ) {
-                combo->setCurrentIndex(item);
-                break;
-            }
-        }
-    }
-
-    retranslateUi();
-}
-
-void StandardWorksTab::save() {
-    for (int i = 0; i <= (int)CBTConfig::lastModuleType; ++i) {
-        QString moduleDescription;
-
-
-#define STANDARD_WORKS_TAB_SCASE(name) \
-        case CBTConfig::name: \
-            moduleDescription = m_ ## name ## Combo->currentText(); \
-            break;
-
-        CBTConfig::modules moduleType = (CBTConfig::modules)(i);
-        switch (moduleType) {
-            STANDARD_WORKS_TAB_SCASE(standardBible);
-            STANDARD_WORKS_TAB_SCASE(standardCommentary);
-            STANDARD_WORKS_TAB_SCASE(standardLexicon);
-            STANDARD_WORKS_TAB_SCASE(standardDailyDevotional);
-            STANDARD_WORKS_TAB_SCASE(standardHebrewStrongsLexicon);
-            STANDARD_WORKS_TAB_SCASE(standardGreekStrongsLexicon);
-            STANDARD_WORKS_TAB_SCASE(standardHebrewMorphLexicon);
-            STANDARD_WORKS_TAB_SCASE(standardGreekMorphLexicon);
-            default:
-                qWarning("Unhandled module type.");
-        };
-
-        CSwordModuleInfo * const module = CSwordBackend::instance()->findModuleByDescription(moduleDescription);
-        CBTConfig::set(moduleType, module);
-    }
-}
-
-void StandardWorksTab::retranslateUi() {
-    util::tool::initExplanationLabel(
-        m_explanationLabel, "",
-        tr("Standard works are used when no particular work is specified, for example "
-           "when a hyperlink into a Bible or lexicon was clicked."));
-
-    m_standardBibleLabel->setText(tr("Bible:"));
-    m_standardBibleCombo->setToolTip(tr("The standard Bible is used when a hyperlink into a Bible is clicked"));
-
-    m_standardCommentaryLabel->setText(tr("Commentary:"));
-    m_standardCommentaryCombo->setToolTip(tr("The standard commentary is used when a hyperlink into a commentary is clicked"));
-
-    m_standardLexiconLabel->setText(tr("Lexicon:"));
-    m_standardLexiconCombo->setToolTip(tr("The standard lexicon is used when a hyperlink into a lexicon is clicked"));
-
-    m_standardDailyDevotionalLabel->setText(tr("Daily devotional:"));
-    m_standardDailyDevotionalCombo->setToolTip(tr("The standard devotional will be used to display a short start up devotional"));
-
-    m_standardHebrewStrongsLexiconLabel->setText(tr("Hebrew Strong's lexicon:"));
-    m_standardHebrewStrongsLexiconCombo->setToolTip(tr("The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked"));
-
-    m_standardGreekStrongsLexiconLabel->setText(tr("Greek Strong's lexicon:"));
-    m_standardGreekStrongsLexiconCombo->setToolTip(tr("The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked"));
-
-    m_standardHebrewMorphLexiconLabel->setText(tr("Hebrew morphological lexicon:"));
-    m_standardHebrewMorphLexiconCombo->setToolTip(tr("The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked"));
-
-    m_standardGreekMorphLexiconLabel->setText(tr("Greek morphological lexicon:"));
-    m_standardGreekMorphLexiconCombo->setToolTip(tr("The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked"));
-}
-
-
-/*******************************************************************************
-  TextFiltersTab
-*******************************************************************************/
-
-TextFiltersTab::TextFiltersTab(CSwordSettingsPage *parent)
-    : QWidget(parent)
-{
-    QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(5);
-    layout->setSpacing(2);
-
-    m_explanationLabel = new QLabel(this);
-    m_explanationLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
-    m_explanationLabel->setMaximumHeight(50);
-    m_explanationLabel->setMinimumWidth(300);
-    layout->addWidget(m_explanationLabel);
-
-#define TEXT_FILTERS_TAB_ADD_ROW(name) \
-    m_ ## name ## Check = new QCheckBox(this); \
-    m_ ## name ## Check->setChecked(CBTConfig::get(CBTConfig::name)); \
-    layout->addWidget(m_ ## name ## Check);
-
-    TEXT_FILTERS_TAB_ADD_ROW(lineBreaks);
-    TEXT_FILTERS_TAB_ADD_ROW(verseNumbers);
-    TEXT_FILTERS_TAB_ADD_ROW(headings);
-    TEXT_FILTERS_TAB_ADD_ROW(hebrewPoints);
-    TEXT_FILTERS_TAB_ADD_ROW(hebrewCantillation);
-    TEXT_FILTERS_TAB_ADD_ROW(morphSegmentation);
-    TEXT_FILTERS_TAB_ADD_ROW(greekAccents);
-    TEXT_FILTERS_TAB_ADD_ROW(textualVariants);
-    TEXT_FILTERS_TAB_ADD_ROW(scriptureReferences);
-
-    layout->addStretch(4);
-
-    retranslateUi();
-}
-
-void TextFiltersTab::save() {
-#define TEXT_FILTERS_TAB_SAVE(name) CBTConfig::set(CBTConfig::name, m_ ## name ## Check->isChecked())
-
-    TEXT_FILTERS_TAB_SAVE(lineBreaks);
-    TEXT_FILTERS_TAB_SAVE(verseNumbers);
-    TEXT_FILTERS_TAB_SAVE(headings);
-    TEXT_FILTERS_TAB_SAVE(hebrewPoints);
-    TEXT_FILTERS_TAB_SAVE(hebrewCantillation);
-    TEXT_FILTERS_TAB_SAVE(morphSegmentation);
-    TEXT_FILTERS_TAB_SAVE(greekAccents);
-    TEXT_FILTERS_TAB_SAVE(textualVariants);
-    TEXT_FILTERS_TAB_SAVE(scriptureReferences);
-}
-
-
-void TextFiltersTab::retranslateUi() {
-    util::tool::initExplanationLabel(m_explanationLabel, "",
-          tr("Filters control the appearance of text. Here you can specify "
-             "default settings for all filters. You can override these "
-             "settings in each display window."));
-
-    m_lineBreaksCheck->setText(tr("Insert line break after each verse"));
-    m_verseNumbersCheck->setText(tr("Show verse numbers"));
-    m_headingsCheck->setText(tr("Show section headings"));
-    m_scriptureReferencesCheck->setText(tr("Show scripture cross-references"));
-    m_greekAccentsCheck->setText(tr("Show Greek accents"));
-    m_hebrewPointsCheck->setText(tr("Show Hebrew vowel points"));
-    m_hebrewCantillationCheck->setText(tr("Show Hebrew cantillation marks"));
-    m_morphSegmentationCheck->setText(tr("Show morph segmentation"));
-    m_textualVariantsCheck->setText(tr("Use textual variants"));
-}
-
-
-/*******************************************************************************
-  CSwordSettingsPage
-*******************************************************************************/
-
-CSwordSettingsPage::CSwordSettingsPage(CConfigurationDialog *parent)
-        : BtConfigDialog::Page(util::directory::getIcon(CResMgr::settings::sword::icon), parent)
+CSwordSettingsPage::CSwordSettingsPage(CConfigurationDialog * parent)
+        : BtConfigDialog::Page(util::getIcon(CResMgr::settings::sword::icon), parent)
 {
     static const QString nullString;
 
     m_tabWidget = new QTabWidget(this);
-        m_worksTab = new StandardWorksTab(this);
+        m_worksTab = new BtStandardWorksTab(this);
         m_tabWidget->addTab(m_worksTab, nullString);
 
-        m_filtersTab = new TextFiltersTab(this);
+        m_filtersTab = new BtTextFiltersTab(this);
         m_tabWidget->addTab(m_filtersTab, nullString);
 
 
-    QVBoxLayout *mainLayout = new QVBoxLayout(this);
+    QVBoxLayout * mainLayout = new QVBoxLayout(this);
     mainLayout->addWidget(m_tabWidget);
 
     retranslateUi();
diff --git a/src/frontend/settingsdialogs/cswordsettings.h b/src/frontend/settingsdialogs/cswordsettings.h
index c54630d..18a4268 100644
--- a/src/frontend/settingsdialogs/cswordsettings.h
+++ b/src/frontend/settingsdialogs/cswordsettings.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -14,90 +16,9 @@
 #include <QWidget>
 
 
+class BtTextFiltersTab;
 class CConfigurationDialog;
-class CSwordSettingsPage;
-class QCheckBox;
-class QComboBox;
-class QLabel;
-
-
-/*******************************************************************************
-  StandardWorksTab
-*******************************************************************************/
-
-class StandardWorksTab: public QWidget {
-
-    Q_OBJECT
-
-    public: /* Methods: */
-
-        StandardWorksTab(CSwordSettingsPage *parent);
-
-        void save();
-
-    protected: /* Methods: */
-
-        void retranslateUi();
-
-    private: /* Fields: */
-
-        QLabel *m_explanationLabel;
-
-#define STANDARD_WORKS_TAB_FIELD(name) \
-        QLabel *m_ ## name ## Label; \
-        QComboBox *m_ ## name ## Combo
-
-        STANDARD_WORKS_TAB_FIELD(standardBible);
-        STANDARD_WORKS_TAB_FIELD(standardCommentary);
-        STANDARD_WORKS_TAB_FIELD(standardLexicon);
-        STANDARD_WORKS_TAB_FIELD(standardDailyDevotional);
-        STANDARD_WORKS_TAB_FIELD(standardHebrewStrongsLexicon);
-        STANDARD_WORKS_TAB_FIELD(standardGreekStrongsLexicon);
-        STANDARD_WORKS_TAB_FIELD(standardHebrewMorphLexicon);
-        STANDARD_WORKS_TAB_FIELD(standardGreekMorphLexicon);
-};
-
-
-/*******************************************************************************
-  TextFiltersTab
-*******************************************************************************/
-
-class TextFiltersTab: public QWidget {
-
-    Q_OBJECT
-
-    public: /* Methods: */
-
-        TextFiltersTab(CSwordSettingsPage *parent);
-
-        void save();
-
-    protected: /* Methods: */
-
-        void retranslateUi();
-
-    private: /* Fields: */
-
-        QLabel *m_explanationLabel;
-
-#define TEXT_FILTERS_TAB_FIELD(name) QCheckBox *m_ ## name ## Check
-
-        TEXT_FILTERS_TAB_FIELD(lineBreaks);
-        TEXT_FILTERS_TAB_FIELD(verseNumbers);
-        TEXT_FILTERS_TAB_FIELD(headings);
-        TEXT_FILTERS_TAB_FIELD(hebrewPoints);
-        TEXT_FILTERS_TAB_FIELD(hebrewCantillation);
-        TEXT_FILTERS_TAB_FIELD(morphSegmentation);
-        TEXT_FILTERS_TAB_FIELD(greekAccents);
-        TEXT_FILTERS_TAB_FIELD(textualVariants);
-        TEXT_FILTERS_TAB_FIELD(scriptureReferences);
-
-};
-
-
-/*******************************************************************************
-  CSwordSettingsPage
-*******************************************************************************/
+class BtStandardWorksTab;
 
 class CSwordSettingsPage: public BtConfigDialog::Page {
 
@@ -105,7 +26,7 @@ class CSwordSettingsPage: public BtConfigDialog::Page {
 
     public: /* Methods: */
 
-        CSwordSettingsPage(CConfigurationDialog *parent = 0);
+        CSwordSettingsPage(CConfigurationDialog * parent = 0);
 
         void save();
 
@@ -115,9 +36,9 @@ class CSwordSettingsPage: public BtConfigDialog::Page {
 
     private: /* Fields: */
 
-        QTabWidget *m_tabWidget;
-        StandardWorksTab *m_worksTab;
-        TextFiltersTab *m_filtersTab;
+        QTabWidget * m_tabWidget;
+        BtStandardWorksTab * m_worksTab;
+        BtTextFiltersTab * m_filtersTab;
 
 };
 
diff --git a/src/frontend/tips/bttipdialog.cpp b/src/frontend/tips/bttipdialog.cpp
index 5c4052d..75b7a6d 100644
--- a/src/frontend/tips/bttipdialog.cpp
+++ b/src/frontend/tips/bttipdialog.cpp
@@ -2,18 +2,13 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
 
 #include "bttipdialog.h"
 
-#include "backend/config/cbtconfig.h"
-#include "util/cresmgr.h"
-#include "util/dialogutil.h"
-#include "util/directory.h"
-
 #include <QCheckBox>
 #include <QDesktopServices>
 #include <QDialogButtonBox>
@@ -21,6 +16,13 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QWebView>
+#include "backend/config/btconfig.h"
+#include "bibletimeapp.h"
+#include "util/cresmgr.h"
+#include "frontend/messagedialog.h"
+#include "util/directory.h"
+#include "util/geticon.h"
+#include "util/htmlescape.h"
 
 
 namespace {
@@ -52,20 +54,20 @@ inline QString make_icon(const QString &icon) {
     namespace DU = util::directory;
     QString fileName = DU::getIconDir().filePath(icon);
     QString iconUrl = QUrl::fromLocalFile(fileName).toString();
-    return "<img src=\"" + iconUrl + "\" width=\"32\" />";
+    return "<img src=\"" + util::htmlEscape(iconUrl) + "\" width=\"32\" />";
 }
 
+const QString LastTipNumberKey = "GUI/lastTipNumber";
+
 } // anonymous namespace
 
 
 BtTipDialog::BtTipDialog(QWidget *parent, Qt::WindowFlags wflags)
         : QDialog(parent, wflags)
 {
-    namespace DU = util::directory;
-
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     setWindowTitle(tr("Tip Of The Day"));
-    setWindowIcon(DU::getIcon(CResMgr::mainMenu::help::tipOfTheDay::icon));
+    setWindowIcon(util::getIcon(CResMgr::mainMenu::help::tipOfTheDay::icon));
     resize(450, 240);
 
     QVBoxLayout *mainLayout = new QVBoxLayout;
@@ -79,14 +81,14 @@ BtTipDialog::BtTipDialog(QWidget *parent, Qt::WindowFlags wflags)
 
     m_showTipsCheckBox = new QCheckBox;
     m_showTipsCheckBox->setText(tr("Show tips at startup"));
-    bool showTips = CBTConfig::get(CBTConfig::showTipAtStartup);
+    bool showTips = btConfig().value<bool>("GUI/showTipAtStartup", true);
     m_showTipsCheckBox->setChecked(showTips);
     hLayout->addWidget(m_showTipsCheckBox);
 
     m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Close,
                                        Qt::Horizontal,
                                        this);
-    util::prepareDialogBox(m_buttonBox);
+    message::prepareDialogBox(m_buttonBox);
 
     QPushButton *nextButton;
     nextButton = m_buttonBox->addButton(tr("Next Tip"),
@@ -113,7 +115,7 @@ BtTipDialog::BtTipDialog(QWidget *parent, Qt::WindowFlags wflags)
                      this,              SLOT(linkClicked(const QUrl&)));
     Q_ASSERT(ok);
 
-    m_tipNumber = CBTConfig::get(CBTConfig::tipNumber);
+    m_tipNumber = btConfig().value<int>(LastTipNumberKey, 0);
     initTips();
     displayTip();
 }
@@ -183,7 +185,7 @@ void BtTipDialog::displayTip() {
 }
 
 void BtTipDialog::startupBoxChanged(bool checked) {
-    CBTConfig::set(CBTConfig::showTipAtStartup, checked);
+    btConfig().setValue("GUI/showTipAtStartup", checked);
 }
 
 void BtTipDialog::nextTip() {
@@ -191,7 +193,7 @@ void BtTipDialog::nextTip() {
     if (m_tipNumber >= m_tips.count()) {
         m_tipNumber = 0;
     }
-    CBTConfig::set(CBTConfig::tipNumber, m_tipNumber);
+    btConfig().setValue(LastTipNumberKey, m_tipNumber);
     displayTip();
 }
 
diff --git a/src/frontend/tips/bttipdialog.h b/src/frontend/tips/bttipdialog.h
index cd00394..e8058ee 100644
--- a/src/frontend/tips/bttipdialog.h
+++ b/src/frontend/tips/bttipdialog.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/main.cpp b/src/main.cpp
index 0f2683c..6f459b9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -18,11 +18,11 @@
 #include <QTextCodec>
 #include <QTranslator>
 #include "backend/bookshelfmodel/btbookshelftreemodel.h"
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "bibletime.h"
 #include "bibletime_dbus_adaptor.h"
 #include "bibletimeapp.h"
-#include "frontend/settingsdialogs/btlanguagesettings.h"
+#include "frontend/searchdialog/btsearchoptionsarea.h"
 #include "util/directory.h"
 
 
@@ -167,15 +167,15 @@ void myMessageOutput(
         case QtCriticalMsg:
             debugStream->write("(BibleTime " BT_VERSION ") CRITICAL: ");
             debugStream->write(msg);
-            debugStream->write("\nPlease report this bug! "
-                              "(http://www.bibletime.info/development_help.html)");
+            debugStream->write("\nPlease report this bug at "
+                               "http://bugs.bibletime.info/");
             debugStream->flush();
             break;
         case QtFatalMsg:
             debugStream->write("(BibleTime " BT_VERSION ") FATAL: ");
             debugStream->write(msg);
-            debugStream->write("\nPlease report this bug! "
-                              "(http://www.bibletime.info/development_help.html)");
+            debugStream->write("\nPlease report this bug at "
+                               "http://bugs.bibletime.info/");
 
             // Dump core on purpose (see qInstallMsgHandler documentation):
             debugStream->close();
@@ -191,6 +191,21 @@ void registerMetaTypes() {
     qRegisterMetaType<FilterOptions>("FilterOptions");
     qRegisterMetaType<DisplayOptions>("DisplayOptions");
     qRegisterMetaTypeStreamOperators<BtBookshelfTreeModel::Grouping>("BtBookshelfTreeModel::Grouping");
+
+    qRegisterMetaType<BTModuleTreeItem::Grouping>("Grouping");
+    qRegisterMetaTypeStreamOperators<BTModuleTreeItem::Grouping>("Grouping");
+
+    qRegisterMetaType<alignmentMode>("alignmentMode");
+    qRegisterMetaTypeStreamOperators<alignmentMode>("alignmentMode");
+
+    qRegisterMetaType<Search::BtSearchOptionsArea::SearchType>("SearchType");
+    qRegisterMetaTypeStreamOperators<Search::BtSearchOptionsArea::SearchType>("SearchType");
+
+    qRegisterMetaType<BtConfig::StringMap>("StringMap");
+    qRegisterMetaTypeStreamOperators<BtConfig::StringMap>("StringMap");
+
+    qRegisterMetaType<QList<int> >("QList<int>");
+    qRegisterMetaTypeStreamOperators<QList<int> >("QList<int>");
 }
 
 } // anonymous namespace
@@ -204,8 +219,6 @@ int main(int argc, char* argv[]) {
     namespace DU = util::directory;
 
     BibleTimeApp app(argc, argv); //for QApplication
-    app.setApplicationName("bibletime");
-    app.setApplicationVersion(BT_VERSION);
 
     // Parse command line arguments:
     bool ignoreSession = false;
@@ -220,13 +233,17 @@ int main(int argc, char* argv[]) {
     srand(qHash(QDateTime::currentDateTime().toString(Qt::ISODate)));
 
     // Setup debugging:
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     // Use the default Qt message handler if --debug is not specified
     // This works with Visual Studio debugger Output Window
     if (showDebugMessages) {
         debugStream.reset(new QFile(QDir::homePath().append("/BibleTime Debug.txt")));
         debugStream->open(QIODevice::WriteOnly | QIODevice::Text);
+#if QT_VERSION >= 0x050000
+        qInstallMessageHandler(myMessageOutput);
+#else
         qInstallMsgHandler(myMessageOutput);
+#endif
     }
 #else
     debugStream.reset(new QFile);
@@ -238,7 +255,7 @@ int main(int argc, char* argv[]) {
 #endif
 #endif
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 
     // On Windows, add a path for Qt plugins to be loaded from
     app.addLibraryPath(app.applicationDirPath() + "/plugins");
@@ -257,8 +274,11 @@ int main(int argc, char* argv[]) {
     }
 
     app.startInit();
+    if (!app.initBtConfig()) {
+        return EXIT_FAILURE;
+    }
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     // change directory to the Sword or .sword directory in the $HOME dir so that
     // the sword.conf is found. It points to the sword/locales.d directory
     QString homeSwordDir = util::directory::getUserHomeDir().absolutePath();
@@ -266,7 +286,7 @@ int main(int argc, char* argv[]) {
     dir.setCurrent(homeSwordDir);
 #endif
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     // change to the user's sword dir containing the sword.conf config file, so that
     // Sword will correctly find it.
     QString homeSwordDir = util::directory::getUserHomeSwordDir().absolutePath();
@@ -285,23 +305,18 @@ int main(int argc, char* argv[]) {
 
     app.setProperty("--debug", QVariant(showDebugMessages));
 
-    /*
-      Set book names language if not set. This is a hack. We do this call here,
-      because we need to keep the setting displayed in BtLanguageSettingsPage in
-      sync with the language of the book names displayed, so that both would
-      always use the same setting.
-    */
-    BtLanguageSettingsPage::resetLanguage(); /// \todo refactor this hack
-
     // Initialize display template manager:
-    if (!app.initDisplayTemplateManager()) return EXIT_FAILURE;
+    if (!app.initDisplayTemplateManager()) {
+        qFatal("Error initializing display template manager!");
+        return EXIT_FAILURE;
+    }
 
     BibleTime *mainWindow = new BibleTime();
     mainWindow->setAttribute(Qt::WA_DeleteOnClose);
 
     // a new BibleTime version was installed (maybe a completely new installation)
-    if (CBTConfig::get(CBTConfig::bibletimeVersion) != BT_VERSION) {
-        CBTConfig::set(CBTConfig::bibletimeVersion, BT_VERSION);
+    if (btConfig().value<QString>("bibletimeVersion", BT_VERSION) != BT_VERSION) {
+        btConfig().setValue("bibletimeVersion", QString(BT_VERSION));
         mainWindow->saveConfigSettings();
     }
 
@@ -319,7 +334,7 @@ int main(int argc, char* argv[]) {
     QDBusConnection::sessionBus().registerObject("/BibleTime", mainWindow);
 #endif
 
-    if (CBTConfig::get(CBTConfig::showTipAtStartup))
+    if (btConfig().value<bool>("GUI/showTipAtStartup", true))
         mainWindow->slotOpenTipDialog();
 
     r = app.exec();
diff --git a/src/mobile/bibletime.cpp b/src/mobile/bibletime.cpp
new file mode 100644
index 0000000..dd32bf4
--- /dev/null
+++ b/src/mobile/bibletime.cpp
@@ -0,0 +1,101 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#include "bibletime.h"
+
+#include "backend/config/btconfig.h"
+#include "backend/managers/btstringmgr.h"
+#include "backend/managers/clanguagemgr.h"
+#include "backend/managers/cswordbackend.h"
+#include <QLocale>
+#include <stringmgr.h>
+#include <swlog.h>
+
+namespace btm {
+
+BibleTime::BibleTime(QObject* parent)
+    : QObject(parent) {
+    initBackends();
+}
+
+
+/** Initializes the backend */
+void BibleTime::initBackends() {
+    initSwordConfigFile();
+
+    sword::StringMgr::setSystemStringMgr( new BtStringMgr() );
+    sword::SWLog::getSystemLog()->setLogLevel(sword::SWLog::LOG_ERROR);
+
+    if (qApp->property("--debug").toBool()) {
+        sword::SWLog::getSystemLog()->setLogLevel(sword::SWLog::LOG_DEBUG);
+    }
+
+#ifdef Q_OS_MAC
+    // set a LocaleMgr with a fixed path to the locales.d of the DMG image on MacOS
+    // note: this must be done after setting the BTStringMgr, because this will reset the LocaleMgr
+    qDebug() << "Using sword locales dir: " << util::directory::getSwordLocalesDir().absolutePath().toUtf8();
+    sword::LocaleMgr::setSystemLocaleMgr(new sword::LocaleMgr(util::directory::getSwordLocalesDir().absolutePath().toUtf8()));
+#endif
+
+    CSwordBackend *backend = CSwordBackend::createInstance();
+    QString systemName = QLocale::system().name();
+    QString language = btConfig().value<QString>("language", systemName);
+    backend->booknameLanguage(language);
+
+    const CSwordBackend::LoadError errorCode = CSwordBackend::instance()->initModules(CSwordBackend::OtherChange);
+    if (errorCode != CSwordBackend::NoError) {
+        ; // TODO
+    }
+}
+
+void BibleTime::initSwordConfigFile() {
+// On Windows the sword.conf must be created before the initialization of sword
+// It will contain the LocalePath which is used for sword locales
+// It also contains a DataPath to the %ALLUSERSPROFILE%\Sword directory
+// If this is not done here, the sword locales.d won't be found
+#ifdef Q_OS_WIN
+    QString configFile = util::directory::getUserHomeSwordDir().filePath("sword.conf");
+    QFile file(configFile);
+    if (file.exists()) {
+        return;
+    }
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        return;
+    }
+    QTextStream out(&file);
+    out << "\n";
+    out << "[Install]\n";
+    out << "DataPath="   << util::directory::convertDirSeparators( util::directory::getSharedSwordDir().absolutePath()) << "\n";
+    out << "LocalePath=" << util::directory::convertDirSeparators(util::directory::getApplicationSwordDir().absolutePath()) << "\n";
+    out << "\n";
+    file.close();
+#endif
+
+#ifdef Q_OS_MAC
+    QString configFile = util::directory::getUserHomeSwordDir().filePath("sword.conf");
+    QFile file(configFile);
+    if (file.exists()) {
+        return;
+    }
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        return;
+    }
+    QTextStream out(&file);
+    out << "\n";
+    out << "[Install]\n";
+    out << "DataPath="   << util::directory::convertDirSeparators( util::directory::getUserHomeSwordDir().absolutePath()) << "\n";
+    out << "\n";
+    file.close();
+#endif
+}
+
+}
diff --git a/src/mobile/bibletime.h b/src/mobile/bibletime.h
new file mode 100644
index 0000000..b424571
--- /dev/null
+++ b/src/mobile/bibletime.h
@@ -0,0 +1,31 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#pragma once
+
+#include <QObject>
+
+namespace btm {
+
+class BibleTime : public QObject {
+    Q_OBJECT
+
+public:
+    BibleTime(QObject* parent = 0);
+
+private:
+    void initBackends();
+    void initSwordConfigFile();
+
+};
+
+}
diff --git a/src/mobile/bibletimeapp.cpp b/src/mobile/bibletimeapp.cpp
new file mode 100644
index 0000000..f7801b8
--- /dev/null
+++ b/src/mobile/bibletimeapp.cpp
@@ -0,0 +1,95 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#include "bibletimeapp.h"
+
+#include <QDebug>
+#include <QFile>
+#include "backend/config/btconfig.h"
+#include "backend/managers/cswordbackend.h"
+#include "backend/managers/cdisplaytemplatemgr.h"
+#include "frontend/messagedialog.h"
+#include "util/cresmgr.h"
+#include "util/geticon.h"
+#include "util/directory.h"
+
+
+BibleTimeApp::BibleTimeApp(int &argc, char **argv)
+    : QGuiApplication(argc, argv)
+    , m_init(false) {
+    setApplicationName("bibletime");
+    setApplicationVersion(BT_VERSION);
+}
+
+BibleTimeApp::~BibleTimeApp() {
+    // Prevent writing to the log file before the directory cache is init:
+    if (!m_init || BtConfig::m_instance == 0)
+        return;
+
+    //we can set this safely now because we close now (hopyfully without crash)
+    btConfig().setValue("state/crashedLastTime", false);
+    btConfig().setValue("state/crashedTwoTimes", false);
+
+    delete CDisplayTemplateMgr::instance();
+    CLanguageMgr::destroyInstance();
+    CSwordBackend::destroyInstance();
+    util::clearIconCache();
+
+    BtConfig::destroyInstance();
+}
+
+bool BibleTimeApp::initBtConfig() {
+    Q_ASSERT(m_init);
+
+    return BtConfig::initBtConfig();
+}
+
+bool BibleTimeApp::initDisplayTemplateManager() {
+    Q_ASSERT(m_init);
+
+    QString errorMessage;
+    new CDisplayTemplateMgr(errorMessage);
+    if (errorMessage.isNull())
+        return true;
+    message::showCritical(0, tr("Fatal error!"), errorMessage);
+    return false;
+}
+
+
+const QIcon & BibleTimeApp::getIcon(const QString & name) const {
+    QString plainName(name);
+    if (plainName.endsWith(".svg", Qt::CaseInsensitive))
+        plainName.chop(4);
+
+    const QMap<QString, QIcon>::const_iterator i = m_iconCache.find(plainName);
+    if (i != m_iconCache.end())
+        return *i;
+
+    const QString iconDir = util::directory::getIconDir().canonicalPath();
+    QString iconFileName = iconDir + "/" + plainName + ".svg";
+    if (QFile(iconFileName).exists())
+        return *m_iconCache.insert(plainName, QIcon(iconFileName));
+
+    iconFileName = iconDir + "/" + plainName + ".png";
+    if (QFile(iconFileName).exists())
+        return *m_iconCache.insert(plainName, QIcon(iconFileName));
+
+    if (plainName != "default") {
+        qWarning() << "Cannot find icon file" << iconFileName
+                   << ", using default icon.";
+        return getIcon("default");
+    }
+
+    qWarning() << "Cannot find default icon" << iconFileName
+               << ", using null icon.";
+    return m_nullIcon;
+}
diff --git a/src/mobile/bibletimeapp.h b/src/mobile/bibletimeapp.h
new file mode 100644
index 0000000..08cd0a5
--- /dev/null
+++ b/src/mobile/bibletimeapp.h
@@ -0,0 +1,55 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#ifndef BIBLETIMEAPP_H
+#define BIBLETIMEAPP_H
+
+#include <QGuiApplication>
+#include <QIcon>
+#include <QMap>
+
+
+/**
+  The BibleTimeApp class is used to clean up all instances of the backend and to
+  delete all created module objects.
+*/
+class BibleTimeApp : public QGuiApplication {
+
+    Q_OBJECT
+
+    public: /* Methods: */
+
+        BibleTimeApp(int &argc, char **argv);
+        ~BibleTimeApp();
+
+        inline void startInit() { m_init = true; }
+        bool initBtConfig();
+        bool initDisplayTemplateManager();
+
+        /**
+           \param[in] name the name of the icon to return.
+           \returns a reference to the icon with the given name or to a NULL
+                    icon if no such icon is found.
+         */
+        const QIcon & getIcon(const QString & name) const;
+
+    private: /* Fields: */
+
+        mutable QMap<QString, QIcon> m_iconCache;
+        const QIcon m_nullIcon;
+        bool m_init;
+
+};
+
+#define bApp (static_cast<BibleTimeApp *>(QCoreApplication::instance()))
+
+#endif
diff --git a/src/mobile/bookshelfmanager/installmanager.cpp b/src/mobile/bookshelfmanager/installmanager.cpp
new file mode 100644
index 0000000..99a72a0
--- /dev/null
+++ b/src/mobile/bookshelfmanager/installmanager.cpp
@@ -0,0 +1,371 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#include "installmanager.h"
+
+#include "backend/btinstallbackend.h"
+#include "backend/managers/clanguagemgr.h"
+#include "backend/btinstallmgr.h"
+#include "mobile/btmmain.h"
+#include "mobile/ui/qtquick2applicationviewer.h"
+#include "mobile/ui/viewmanager.h"
+#include <QDebug>
+#include <QQuickItem>
+#include <QtAlgorithms>
+
+namespace btm {
+
+enum TextRoles {
+    TextRole = Qt::UserRole + 1
+};
+
+enum WorksRoles {
+    TitleRole = Qt::UserRole + 1,
+    DescriptionRole = Qt::UserRole + 2,
+    InstalledRole = Qt::UserRole + 3
+};
+
+static bool moduleInstalled(const CSwordModuleInfo& moduleInfo) {
+    const CSwordModuleInfo *installedModule = CSwordBackend::instance()->findModuleByName(moduleInfo.name());
+    return installedModule != 0;
+}
+
+static void setupTextModel(const QStringList& modelList, RoleItemModel* model) {
+    QHash<int, QByteArray> roleNames;
+    roleNames[TextRole] =  "modelText";
+    model->setRoleNames(roleNames);
+
+    model->clear();
+    for (int i=0; i< modelList.count(); ++i) {
+        QString source = modelList.at(i);
+        QStandardItem* item = new QStandardItem();
+        item->setData(source, TextRole);
+        model->appendRow(item);
+    }
+}
+
+static void setupWorksModel(const QStringList& titleList,
+                            const QStringList& descriptionList,
+                            const QList<int>& installedList,
+                            RoleItemModel* model) {
+    Q_ASSERT(titleList.count() == descriptionList.count());
+    Q_ASSERT(titleList.count() == installedList.count());
+
+    QHash<int, QByteArray> roleNames;
+    roleNames[TitleRole] =  "title";
+    roleNames[DescriptionRole] = "desc";
+    roleNames[InstalledRole] = "installed";
+    model->setRoleNames(roleNames);
+
+    model->clear();
+    for (int i=0; i< titleList.count(); ++i) {
+        QStandardItem* item = new QStandardItem();
+        QString title = titleList.at(i);
+        item->setData(title, TitleRole);
+        QString description = descriptionList.at(i);
+        item->setData(description, DescriptionRole);
+        int installed = installedList.at(i);
+        item->setData(installed, InstalledRole);
+        model->appendRow(item);
+    }
+}
+
+InstallManager::InstallManager(QObject* /* parent */)
+    : m_installManagerChooserObject(0),
+      m_btInstallMgr(0) {
+}
+
+void InstallManager::openChooser() {
+
+    if (m_installManagerChooserObject == 0)
+        findInstallManagerObject();
+    if (m_installManagerChooserObject == 0)
+        return;
+
+    setupSourceModel();
+    makeConnections();
+    setProperties();
+    sourceIndexChanged(0);
+}
+
+void InstallManager::findInstallManagerObject() {
+
+    QtQuick2ApplicationViewer* viewer = getViewManager()->getViewer();
+    QQuickItem * rootObject = 0;
+    if (viewer != 0)
+        rootObject = viewer->rootObject();
+    if (rootObject != 0)
+        m_installManagerChooserObject = rootObject->findChild<QQuickItem*>("installManagerChooser");
+}
+
+void InstallManager::findProgressObject() {
+    QtQuick2ApplicationViewer* viewer = getViewManager()->getViewer();
+    QQuickItem * rootObject = 0;
+    if (viewer != 0)
+        rootObject = viewer->rootObject();
+    if (rootObject != 0)
+        m_progressObject = rootObject->findChild<QQuickItem*>("progress");
+}
+
+
+void InstallManager::setupSourceModel() {
+    m_sourceList = BtInstallBackend::sourceNameList();
+    setupTextModel(m_sourceList, &m_sourceModel);
+}
+
+void InstallManager::makeConnections()
+{
+    m_installManagerChooserObject->disconnect();
+
+    bool ok = connect(m_installManagerChooserObject, SIGNAL(sourceChanged(int)),
+                      this, SLOT(sourceIndexChanged(int)));
+    Q_ASSERT(ok);
+
+    ok = connect(m_installManagerChooserObject, SIGNAL(categoryChanged(int)),
+                      this, SLOT(categoryIndexChanged(int)));
+    Q_ASSERT(ok);
+
+    ok = connect(m_installManagerChooserObject, SIGNAL(languageChanged(int)),
+                      this, SLOT(languageIndexChanged(int)));
+    Q_ASSERT(ok);
+
+    ok = connect(m_installManagerChooserObject, SIGNAL(workSelected(int)),
+                      this, SLOT(workSelected(int)));
+    Q_ASSERT(ok);
+
+    ok = connect(m_installManagerChooserObject, SIGNAL(cancel()),
+                      this, SLOT(cancel()));
+    Q_ASSERT(ok);
+
+    ok = connect(m_installManagerChooserObject, SIGNAL(installRemove()),
+                      this, SLOT(installRemove()));
+    Q_ASSERT(ok);
+
+    ok = connect(m_installManagerChooserObject, SIGNAL(refreshLists()),
+                      this, SLOT(refreshLists()));
+    Q_ASSERT(ok);
+}
+
+void InstallManager::setProperties() {
+    m_installManagerChooserObject->setProperty("sourceModel", QVariant::fromValue(&m_sourceModel));
+    m_installManagerChooserObject->setProperty("categoryModel", QVariant::fromValue(&m_categoryModel));
+    m_installManagerChooserObject->setProperty("languageModel", QVariant::fromValue(&m_languageModel));
+    m_installManagerChooserObject->setProperty("worksModel", QVariant::fromValue(&m_worksModel));
+    m_installManagerChooserObject->setProperty("sourceIndex", 0);
+    m_installManagerChooserObject->setProperty("visible", true);
+}
+
+void InstallManager::sourceIndexChanged(int index)
+{
+    if (index < 0 || index >= m_sourceList.count())
+        return;
+
+    updateCategoryAndLanguageModels();
+    updateWorksModel();
+}
+
+void InstallManager::categoryIndexChanged(int index)
+{
+    if (index < 0 || index >= m_categoryList.count())
+        return;
+    updateWorksModel();
+}
+
+void InstallManager::languageIndexChanged(int index)
+{
+    if (index < 0 || index >= m_languageList.count())
+        return;
+    updateWorksModel();
+}
+
+void InstallManager::workSelected(int index) {
+    QStandardItem* item = m_worksModel.item(index,0);
+    QVariant vInstalled = item->data(InstalledRole);
+    int installed = vInstalled.toInt();
+    installed = installed == 0 ? 1 : 0;
+    item->setData(installed, InstalledRole);
+
+    CSwordModuleInfo* moduleInfo = m_worksList.at(index);
+    m_modulesToInstallRemove[moduleInfo] = installed == 1;
+}
+
+void InstallManager::cancel() {
+    m_installManagerChooserObject->setProperty("visible", false);
+}
+
+void InstallManager::installRemove() {
+    m_installManagerChooserObject->setProperty("visible", false);
+
+    QList<CSwordModuleInfo*> modulesToRemove;
+    QList<CSwordModuleInfo*> modulesToInstall;
+    QMap<CSwordModuleInfo*, bool>::const_iterator it;
+    for(it=m_modulesToInstallRemove.constBegin();
+        it!=m_modulesToInstallRemove.constEnd();
+        ++it) {
+        CSwordModuleInfo* moduleInfo = it.key();
+        bool install = it.value();
+        QString name = moduleInfo->name();
+        if (moduleInstalled(*moduleInfo) && install == false) {
+            modulesToRemove.append(moduleInfo);
+        }
+        else if ( ! moduleInstalled(*moduleInfo) && install == true) {
+            modulesToInstall.append(moduleInfo);
+        }
+    }
+    removeModules(modulesToRemove);
+    installModules(modulesToInstall);
+}
+
+void InstallManager::updateCategoryAndLanguageModels()
+{
+    QString sourceName = getCurrentListItem("sourceIndex", m_sourceList);
+    sword::InstallSource source = BtInstallBackend::source(sourceName);
+    CSwordBackend* backend = BtInstallBackend::backend(source);
+    const QList<CSwordModuleInfo*> modules = backend->moduleList();
+
+    QSet<QString> categories;
+    QSet<QString> languages;
+    for (int moduleIndex=0; moduleIndex<modules.count(); ++moduleIndex) {
+        CSwordModuleInfo* module = modules.at(moduleIndex);
+        CSwordModuleInfo::Category category = module->category();
+        //        QString name = module->name();
+        QString categoryName = module->categoryName(category);
+        const CLanguageMgr::Language* language = module->language();
+        QString languageName = language->englishName();
+        categories.insert(categoryName);
+        languages.insert(languageName);
+    }
+
+    QString currentCategory = getCurrentListItem("categoryIndex", m_categoryList);
+        m_categoryList = categories.toList();
+    m_categoryList.sort();
+    setupTextModel(m_categoryList, &m_categoryModel);
+    setCurrentListItem("categoryIndex", m_categoryList, currentCategory);
+
+    QString currentLanguage = getCurrentListItem("languageIndex", m_languageList);
+    m_languageList = languages.toList();
+    m_languageList.sort();
+    setupTextModel(m_languageList, &m_languageModel);
+    setCurrentListItem("languageIndex", m_languageList, currentLanguage);
+}
+
+QString InstallManager::getCurrentListItem(const char* propertyName, const QStringList& list) {
+    QString value;
+    QVariant vIndex = m_installManagerChooserObject->property(propertyName);
+    bool ok;
+    int index = vIndex.toInt(&ok);
+    if (ok) {
+        if (index >= 0 && index < list.count())
+            value = list.at(index);
+    }
+    return value;
+}
+
+void InstallManager::setCurrentListItem(const char* propertyName,
+                                              const QStringList& list,
+                                              const QString& itemName) {
+    int  index = list.indexOf(itemName);
+    if (index < 0)
+        index = 0;
+    m_installManagerChooserObject->setProperty(propertyName, index);
+}
+
+void InstallManager::updateWorksModel()
+{
+    QString sourceName = getCurrentListItem("sourceIndex", m_sourceList);
+    QString categoryName = getCurrentListItem("categoryIndex", m_categoryList);
+    QString languageName = getCurrentListItem("languageIndex", m_languageList);
+
+    sword::InstallSource source = BtInstallBackend::source(sourceName);
+    CSwordBackend* backend = BtInstallBackend::backend(source);
+    const QList<CSwordModuleInfo*> modules = backend->moduleList();
+
+    m_worksTitleList.clear();
+    m_worksDescList.clear();
+    m_worksList.clear();
+    m_worksInstalledList.clear();
+    for (int moduleIndex=0; moduleIndex<modules.count(); ++moduleIndex) {
+        CSwordModuleInfo* module = modules.at(moduleIndex);
+        module->setProperty("installSourceName", sourceName);
+        CSwordModuleInfo::Category category = module->category();
+        QString moduleCategoryName = module->categoryName(category);
+        const CLanguageMgr::Language* language = module->language();
+        QString moduleLanguageName = language->englishName();
+        if (moduleCategoryName == categoryName &&
+            moduleLanguageName == languageName ) {
+            QString name = module->name();
+            QString description = module->config(CSwordModuleInfo::Description);
+            QString version = module->config(CSwordModuleInfo::ModuleVersion);
+            QString info = description + ": " + version;\
+            int installed = moduleInstalled(*module) ? 1 : 0;
+            m_worksTitleList.append(name);
+            m_worksDescList.append(info);
+            m_worksList.append(module);
+            m_worksInstalledList.append(installed);
+        }
+    }
+    setupWorksModel(m_worksTitleList, m_worksDescList, m_worksInstalledList, &m_worksModel);
+}
+
+void InstallManager::removeModules(const QList<CSwordModuleInfo*>& modules) {
+
+    QStringList moduleNames;
+    foreach ( CSwordModuleInfo* mInfo, modules ) {
+        QString moduleName = mInfo->name();
+        moduleNames.append(moduleName);
+    }
+    // Update the module list before really removing. Remember deleting the pointers later.
+    QList<CSwordModuleInfo*> toBeDeleted = CSwordBackend::instance()->takeModulesFromList(moduleNames);
+
+    sword::InstallMgr installMgr;
+    QMap<QString, sword::SWMgr*> mgrDict; //maps config paths to SWMgr objects
+    foreach ( CSwordModuleInfo* mInfo, toBeDeleted ) {
+        Q_ASSERT(mInfo); // Only installed modules could have been selected and returned by takeModulesFromList
+        // Find the install path for the sword manager
+        QString prefixPath = mInfo->config(CSwordModuleInfo::AbsoluteDataPath) + "/";
+        QString dataPath = mInfo->config(CSwordModuleInfo::DataPath);
+        if (dataPath.left(2) == "./") {
+            dataPath = dataPath.mid(2);
+        }
+        if (prefixPath.contains(dataPath)) { //remove module part to get the prefix path
+            prefixPath = prefixPath.remove( prefixPath.indexOf(dataPath), dataPath.length() );
+        }
+        else { //This is an error, should not happen
+            qWarning() << "Removing" << mInfo->name() << "didn't succeed because the absolute path" << prefixPath << "didn't contain the data path" << dataPath;
+            continue; // don't remove this, go to next of the for loop
+        }
+
+        // Create the sword manager and remove the module
+        sword::SWMgr* mgr = mgrDict[ prefixPath ];
+        if (!mgr) { //create new mgr if it's not yet available
+            mgrDict.insert(prefixPath, new sword::SWMgr(prefixPath.toLocal8Bit()));
+            mgr = mgrDict[ prefixPath ];
+        }
+        qDebug() << "Removing the module" << mInfo->name() << "...";
+        installMgr.removeModule(mgr, mInfo->module()->getName());
+    }
+    //delete the removed moduleinfo pointers
+    qDeleteAll(modules);
+    //delete all mgrs which were created above
+    qDeleteAll(mgrDict);
+    mgrDict.clear();
+}
+
+void InstallManager::installModules(const QList<CSwordModuleInfo*>& modules) {
+    m_installProgress.openProgress(modules);
+}
+
+void InstallManager::refreshLists() {
+    m_installSourcesManager.refreshSources();
+}
+
+} // end namespace
diff --git a/src/mobile/bookshelfmanager/installmanager.h b/src/mobile/bookshelfmanager/installmanager.h
new file mode 100644
index 0000000..a976ad8
--- /dev/null
+++ b/src/mobile/bookshelfmanager/installmanager.h
@@ -0,0 +1,82 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#ifndef INSTALL_MODULE_CHOOSER_H
+#define INSTALL_MODULE_CHOOSER_H
+
+#include "installsourcesmanager.h"
+#include "mobile/models/roleitemmodel.h"
+#include "installprogress.h"
+#include <QMap>
+#include <QObject>
+
+class QQuickItem;
+class CSwordModuleInfo;
+class BtInstallMgr;
+
+namespace btm {
+
+class InstallManager :public QObject {
+    Q_OBJECT
+
+public:
+    InstallManager(QObject* parent = 0);
+
+    Q_INVOKABLE void openChooser();
+
+private slots:
+    void cancel();
+    void categoryIndexChanged(int index);
+    void installRemove();
+    void languageIndexChanged(int index);
+    void refreshLists();
+    void sourceIndexChanged(int index);
+    void workSelected(int index);
+
+private:
+    QString getCurrentListItem(const char* propertyName,
+                               const QStringList& list);
+    void findInstallManagerObject();
+    void findProgressObject();
+    void installModules(const QList<CSwordModuleInfo*>& modules);
+    void makeConnections();
+    void removeModules(const QList<CSwordModuleInfo*>& modules);
+    void setProperties();
+    void setupSourceModel();
+    void setCurrentListItem(const char* propertyName,
+                            const QStringList& list,
+                            const QString& itemName);
+    void updateCategoryAndLanguageModels();
+    void updateWorksModel();
+
+    QQuickItem* m_installManagerChooserObject;
+    QQuickItem* m_progressObject;
+    BtInstallMgr* m_btInstallMgr;
+    InstallSourcesManager m_installSourcesManager;
+
+    InstallProgress m_installProgress;
+    QStringList m_sourceList;
+    QStringList m_categoryList;
+    QStringList m_languageList;
+    QStringList m_worksTitleList;
+    QStringList m_worksDescList;
+    QList<CSwordModuleInfo*> m_worksList;
+    QList<int> m_worksInstalledList;
+    QMap<CSwordModuleInfo*, bool> m_modulesToInstallRemove;
+    RoleItemModel m_sourceModel;
+    RoleItemModel m_categoryModel;
+    RoleItemModel m_languageModel;
+    RoleItemModel m_worksModel;
+};
+
+} // end namespace
+#endif
diff --git a/src/mobile/bookshelfmanager/installprogress.cpp b/src/mobile/bookshelfmanager/installprogress.cpp
new file mode 100644
index 0000000..dd113ec
--- /dev/null
+++ b/src/mobile/bookshelfmanager/installprogress.cpp
@@ -0,0 +1,199 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#include "installprogress.h"
+
+#include "backend/btinstallbackend.h"
+#include "backend/managers/cswordbackend.h"
+#include "backend/btinstallthread.h"
+#include "mobile/btmmain.h"
+#include "mobile/ui/qtquick2applicationviewer.h"
+#include "mobile/ui/viewmanager.h"
+#include <QQuickItem>
+#include <QDebug>
+
+namespace btm {
+
+InstallProgress::InstallProgress(QObject* parent)
+    : QObject(parent), m_progressObject(0) {
+}
+
+void InstallProgress::openProgress(const QList<CSwordModuleInfo*>& modules) {
+    if (modules.count() == 0)
+        return;
+
+    if (m_progressObject == 0)
+        findProgressObject();
+    if (m_progressObject == 0)
+        return;
+
+    QString destination = getSourcePath();
+    if (destination.isEmpty())
+        return;
+
+    setProperties();
+
+    Q_FOREACH(const CSwordModuleInfo *module, modules) {
+        const QString sourceName(module->property("installSourceName").toString());
+        // create a thread for this module
+        BtInstallThread* thread = new BtInstallThread(module->name(), sourceName, destination);
+        m_waitingThreads.insert(sourceName, thread);
+        m_threadsByModule.insert(module->name(), thread);
+
+        QObject::connect(thread, SIGNAL(installStopped(QString, QString)),
+                         this, SLOT(slotOneItemStopped(QString, QString)), Qt::QueuedConnection);
+        QObject::connect(thread, SIGNAL(installCompleted(QString, QString, int)),
+                         this, SLOT(slotOneItemCompleted(QString, QString, int)), Qt::QueuedConnection);
+        QObject::connect(thread, SIGNAL(statusUpdated(QString, int)),
+                         this, SLOT(slotStatusUpdated(QString, int)), Qt::QueuedConnection);
+        QObject::connect(thread, SIGNAL(downloadStarted(QString)),
+                         this, SLOT(slotDownloadStarted(QString)), Qt::QueuedConnection);
+        QObject::connect(thread, SIGNAL(preparingInstall(QString, QString)),
+                         this, SLOT(slotInstallStarted(QString, QString)), Qt::QueuedConnection);
+    }
+
+    connect(m_progressObject, SIGNAL(cancel()), this, SLOT(slotStopInstall()));
+    startThreads();
+}
+
+void InstallProgress::cancel() {
+    m_progressObject->setProperty("visible", false);
+}
+
+void InstallProgress::close() {
+    m_progressObject->setProperty("visible", false);
+    CSwordBackend::instance()->reloadModules(CSwordBackend::AddedModules);
+}
+
+void InstallProgress::slotOneItemCompleted(QString module, QString source, int status) {
+    QString message;
+    //status comes from the sword installer.
+    if (status != 0) {
+        message = tr("Failed");
+    }
+    else {
+        message = tr("Completed");
+    }
+    oneItemStoppedOrCompleted(module, source, message);
+}
+
+void InstallProgress::slotOneItemStopped(QString module, QString source) {
+    oneItemStoppedOrCompleted(module, source, tr("Cancelled"));
+}
+
+// TODO show failed status
+void InstallProgress::oneItemStoppedOrCompleted(QString module, QString source, QString statusMessage) {
+    qDebug() << "\n**********************************\nBtInstallProgressDialog::oneItemStoppedOrCompleted" << module << statusMessage << "\n******************************************";
+    qDebug() << "remove from threads maps" << source << m_threadsByModule.value(module);
+    m_runningThreads.remove(source, m_threadsByModule.value(module));
+    m_waitingThreads.remove(source, m_threadsByModule.value(module));
+
+    //non-concurrent
+    QMultiMap<QString, BtInstallThread*>::iterator threadIterator = m_waitingThreads.end();
+    if (m_runningThreads.isEmpty() && threadIterator != m_waitingThreads.begin()) {
+        --threadIterator; // the last item
+        QString sourceName = threadIterator.key();
+        BtInstallThread* t = threadIterator.value();
+        m_runningThreads.insert(sourceName, t);
+        threadIterator = m_waitingThreads.erase(threadIterator);
+        t->start();
+    }
+
+    if (threadsDone()) {
+        qDebug() << "close the dialog";
+        close();
+    }
+}
+
+void InstallProgress::slotStopInstall() {
+    qDebug() << "BtInstallProgressDialog::slotStopInstall";
+
+    // Clear the waiting threads map, stop all running threads.
+    m_waitingThreads.clear();
+    if (m_runningThreads.count() > 0) {
+        foreach(BtInstallThread* thread, m_runningThreads) {
+            thread->slotStopInstall();
+        }
+    }
+    else {
+        close();
+    }
+}
+
+void InstallProgress::slotStatusUpdated(QString /* module */, int status) {
+    m_progressObject->setProperty("value", status);
+}
+
+void InstallProgress::slotInstallStarted(QString /* module */, QString) {
+}
+
+void InstallProgress::slotDownloadStarted(QString module) {
+    QString message = "Installing " + module;
+    m_progressObject->setProperty("text", message);
+    m_progressObject->setProperty("value", 0);
+}
+
+void InstallProgress::startThreads() {
+    QMultiMap<QString, BtInstallThread*>::iterator threadIterator = m_waitingThreads.end();
+    if (threadIterator != m_waitingThreads.begin()) {
+        // go to the last item which is actually the first in the visible list
+        // because the iterator is reversed compared to insert order
+        --threadIterator;
+        QString sourceName = threadIterator.key();
+        BtInstallThread* t = threadIterator.value();
+        m_runningThreads.insert(sourceName, t);
+        threadIterator = m_waitingThreads.erase(threadIterator);
+        t->start();
+    }
+}
+
+bool InstallProgress::threadsDone() {
+    return (m_waitingThreads.isEmpty() && m_runningThreads.isEmpty());
+}
+
+void InstallProgress::findProgressObject() {
+    QtQuick2ApplicationViewer* viewer = getViewManager()->getViewer();
+    QQuickItem * rootObject = 0;
+    if (viewer != 0)
+        rootObject = viewer->rootObject();
+    if (rootObject != 0)
+        m_progressObject = rootObject->findChild<QQuickItem*>("progress");
+}
+
+void InstallProgress::setProperties() {
+    m_progressObject->setProperty("visible", true);
+    m_progressObject->setProperty("minimumValue", 0.0);
+    m_progressObject->setProperty("maximumValue", 100.0);
+    m_progressObject->setProperty("value", 0.0);
+}
+
+QString InstallProgress::getSourcePath() {
+    QStringList targets = BtInstallBackend::targetList();
+    for (QStringList::iterator it = targets.begin(); it != targets.end(); ++it)  {
+        // Add the path only if it's writable
+        QString sourcePath = *it;
+        if (sourcePath.isEmpty())
+            continue;
+        QDir dir(sourcePath);
+        if (!dir.exists())
+            continue;
+        if (!dir.isReadable())
+            continue;
+        QFileInfo fi( dir.canonicalPath());
+        if (!fi.isWritable())
+            continue;
+        return sourcePath;
+    }
+    return QString();
+}
+
+}
diff --git a/src/mobile/bookshelfmanager/installprogress.h b/src/mobile/bookshelfmanager/installprogress.h
new file mode 100644
index 0000000..4f9908c
--- /dev/null
+++ b/src/mobile/bookshelfmanager/installprogress.h
@@ -0,0 +1,61 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#ifndef INSTALL_PROGRESS_H
+#define INSTALL_PROGRESS_H
+
+#include <QObject>
+#include <QMultiMap>
+#include <QMap>
+
+class QQuickItem;
+class CSwordModuleInfo;
+class BtInstallThread;
+
+namespace btm {
+
+class InstallProgress: public QObject {
+    Q_OBJECT
+
+public:
+    InstallProgress(QObject* parent = 0);
+
+    void openProgress(const QList<CSwordModuleInfo*>& modules);
+
+private slots:
+    void cancel();
+    void close();
+    void slotOneItemCompleted(QString module, QString source, int status);
+    void slotOneItemStopped(QString module, QString source);
+    void slotStopInstall();
+    void slotStatusUpdated(QString module, int status);
+    void slotDownloadStarted(QString module);
+    void slotInstallStarted(QString module, QString);
+    bool threadsDone();
+
+private:
+    void findProgressObject();
+    QString getSourcePath();
+    void oneItemStoppedOrCompleted(QString module, QString source, QString message);
+    void setProperties();
+    void startThreads();
+
+    QQuickItem* m_progressObject;
+    QMultiMap<QString, BtInstallThread*> m_waitingThreads;
+    QMultiMap<QString, BtInstallThread*> m_runningThreads;
+    QMap<QString, BtInstallThread*> m_threadsByModule;
+};
+
+
+}
+
+#endif
diff --git a/src/mobile/bookshelfmanager/installsources.cpp b/src/mobile/bookshelfmanager/installsources.cpp
new file mode 100644
index 0000000..6f6fa91
--- /dev/null
+++ b/src/mobile/bookshelfmanager/installsources.cpp
@@ -0,0 +1,75 @@
+/*********
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#include "installsources.h"
+
+#include "backend/btinstallbackend.h"
+#include "backend/btinstallmgr.h"
+#include <QDebug>
+
+namespace btm {
+
+InstallSources::InstallSources(QObject *parent)
+    : QObject(parent),
+      done(false),
+      m_cancelled(false) {
+    m_iMgr = new BtInstallMgr();
+}
+
+
+InstallSources::~InstallSources() {
+    delete m_iMgr;
+}
+
+void InstallSources::process() {
+
+    m_canceled = false;
+    refreshSourceList();
+    if (m_canceled)
+            return;
+    QStringList sourceNames = BtInstallBackend::sourceNameList();
+    refreshWorks(sourceNames);
+    emit finished();
+}
+
+void InstallSources::refreshSourceList() {
+    int ret = m_iMgr->refreshRemoteSourceConfiguration();
+    if (ret ) {
+        qWarning("InstallMgr: getting remote list returned an error.");
+    }
+}
+
+void InstallSources::refreshWorks(const QStringList& sourceNames) {
+    int sourceCount = sourceNames.count();
+    for (int i=0; i<sourceCount; ++i) {
+        if (m_canceled)
+            break;
+        QString sourceName = sourceNames.at(i);
+        int percent = 10 + 90 *((double)i/sourceCount);
+        QString title = "Refreshing " + sourceName;
+        emit percentComplete(percent, title);
+        qDebug() << title << percent;
+        sword::InstallSource source = BtInstallBackend::source(sourceName);
+        bool result = (m_iMgr->refreshRemoteSource(&source) == 0);
+        if (result) {
+            ;
+        } else {
+            QString error = QString(tr("Failed to refresh source %1")).arg(sourceName);
+            qDebug() << error;
+        }
+    }
+    emit percentComplete(100, "Done");
+}
+
+void InstallSources::cancel() {
+    m_canceled = true;
+    qDebug() << "IS canceled";
+}
+
+}
diff --git a/src/mobile/bookshelfmanager/installsources.h b/src/mobile/bookshelfmanager/installsources.h
new file mode 100644
index 0000000..f552c68
--- /dev/null
+++ b/src/mobile/bookshelfmanager/installsources.h
@@ -0,0 +1,52 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#ifndef INSTALLSOURCESTHREAD_H
+#define INSTALLSOURCESTHREAD_H
+
+#include <QObject>
+
+class BtInstallMgr;
+
+namespace btm {
+
+class InstallSources : public QObject {
+        Q_OBJECT
+    public:
+        InstallSources(QObject *parent = 0);
+
+        ~InstallSources();
+
+    public slots:
+        void process();
+        void cancel();
+
+    public:
+        bool done;
+
+    protected:
+        void refreshSourceList();
+        void refreshWorks(const QStringList& sourceNames);
+
+        bool m_cancelled;
+        BtInstallMgr* m_iMgr;
+
+    signals:
+        void finished();
+        void error(QString err);
+        void percentComplete(int percent, const QString& title);
+
+private:
+        bool m_canceled;
+};
+
+}
+#endif
diff --git a/src/mobile/bookshelfmanager/installsourcesmanager.cpp b/src/mobile/bookshelfmanager/installsourcesmanager.cpp
new file mode 100644
index 0000000..bc55f12
--- /dev/null
+++ b/src/mobile/bookshelfmanager/installsourcesmanager.cpp
@@ -0,0 +1,85 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#include "installsourcesmanager.h"
+
+#include "installsources.h"
+#include "backend/btinstallbackend.h"
+#include "mobile/btmmain.h"
+#include "mobile/ui/qtquick2applicationviewer.h"
+#include "mobile/ui/viewmanager.h"
+#include <QDebug>
+#include <QQuickItem>
+#include <QThread>
+
+namespace btm {
+
+InstallSourcesManager::InstallSourcesManager(QObject* /* parent */)
+    : m_worker(0) {
+}
+
+InstallSourcesManager::~InstallSourcesManager() {
+}
+
+void InstallSourcesManager::refreshSources() {
+    findProgressObject();
+    Q_ASSERT(m_progressObject != 0);
+    if (m_progressObject == 0)
+        return;
+    m_progressObject->disconnect(this);
+    connect(m_progressObject, SIGNAL(cancel()), this, SLOT(cancel()));
+
+    m_progressObject->setProperty("minimumValue", 0.0);
+    m_progressObject->setProperty("maximumValue", 100.0);
+    m_progressObject->setProperty("value", 0.0);
+    m_progressObject->setProperty("visible", true);
+    m_progressObject->setProperty("text", "Refreshing Source List");
+
+    runThread();
+}
+
+void InstallSourcesManager::cancel() {
+    m_worker->cancel();
+    m_progressObject->setProperty("visible", false);
+}
+
+void InstallSourcesManager::runThread() {
+    QThread* thread = new QThread;
+    m_worker = new InstallSources();
+    m_worker->moveToThread(thread);
+//    connect(m_worker, SIGNAL(error(QString)), this, SLOT(errorString(QString)));
+    connect(thread, SIGNAL(started()), m_worker, SLOT(process()));
+    connect(m_worker, SIGNAL(finished()), thread, SLOT(quit()));
+    connect(m_worker, SIGNAL(finished()), m_worker, SLOT(deleteLater()));
+    connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
+    connect(m_worker, SIGNAL(percentComplete(int, const QString&)),
+            this, SLOT(percentComplete(int, const QString&)));
+    thread->start();
+}
+
+void InstallSourcesManager::percentComplete(int percent, const QString& title) {
+    m_progressObject->setProperty("value", percent);
+    m_progressObject->setProperty("text", title);
+    if (percent == 100)
+        m_progressObject->setProperty("visible", false);
+}
+
+void InstallSourcesManager::findProgressObject() {
+    QtQuick2ApplicationViewer* viewer = getViewManager()->getViewer();
+    QQuickItem * rootObject = 0;
+    if (viewer != 0)
+        rootObject = viewer->rootObject();
+    if (rootObject != 0)
+        m_progressObject = rootObject->findChild<QQuickItem*>("progress");
+}
+
+} // end namespace
diff --git a/src/mobile/bookshelfmanager/installsourcesmanager.h b/src/mobile/bookshelfmanager/installsourcesmanager.h
new file mode 100644
index 0000000..07665b4
--- /dev/null
+++ b/src/mobile/bookshelfmanager/installsourcesmanager.h
@@ -0,0 +1,45 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#ifndef INSTALL_SOURCES_MANAGER_H
+#define INSTALL_SOURCES_MANAGER_H
+
+#include <QObject>
+#include <QQuickItem>
+
+namespace btm {
+
+class InstallSources;
+
+class InstallSourcesManager :public QObject {
+    Q_OBJECT
+
+public:
+    InstallSourcesManager(QObject* parent = 0);
+    ~InstallSourcesManager();
+
+    void refreshSources();
+
+private slots:
+    void cancel();
+    void percentComplete(int percent, const QString& title);
+
+private:
+    void findProgressObject();
+    void runThread();
+
+    QQuickItem* m_progressObject;
+    InstallSources* m_worker;
+};
+
+} // end namespace
+#endif
diff --git a/src/mobile/btmmain.cpp b/src/mobile/btmmain.cpp
new file mode 100644
index 0000000..12cbbf4
--- /dev/null
+++ b/src/mobile/btmmain.cpp
@@ -0,0 +1,106 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#include "bibletime.h"
+#include "backend/config/btconfig.h"
+#include "backend/bookshelfmodel/btbookshelftreemodel.h"
+#include "mobile/bibletimeapp.h"
+#include "mobile/bookshelfmanager/installmanager.h"
+#include "mobile/ui/btstyle.h"
+#include "mobile/ui/btwindowinterface.h"
+#include "mobile/ui/moduleinterface.h"
+#include "mobile/ui/qtquick2applicationviewer.h"
+#include "mobile/ui/viewmanager.h"
+#include <QBrush>
+#include <QColor>
+#include <QGuiApplication>
+#include <QPalette>
+#include <QQuickItem>
+#include <QQmlDebuggingEnabler>
+#include <QMetaType>
+#include <QTranslator>
+#include "util/directory.h"
+
+btm::ViewManager* mgr = 0;
+
+void register_gml_classes() {
+    QQmlDebuggingEnabler enabler;
+
+    qmlRegisterType<btm::BtWindowInterface>("BibleTime", 1, 0, "BtWindowInterface");
+    qmlRegisterType<btm::BtStyle>("BibleTime", 1, 0, "BtStyle");
+    qmlRegisterType<btm::InstallManager>("BibleTime", 1, 0, "InstallManager");
+    qmlRegisterType<btm::ModuleInterface>("BibleTime", 1, 0, "ModuleInterface");
+}
+
+btm::ViewManager* getViewManager() {
+    return mgr;
+}
+
+/*******************************************************************************
+  Handle Qt's meta type system.
+*******************************************************************************/
+
+void registerMetaTypes() {
+    qRegisterMetaType<FilterOptions>("FilterOptions");
+    qRegisterMetaType<DisplayOptions>("DisplayOptions");
+    qRegisterMetaTypeStreamOperators<BtBookshelfTreeModel::Grouping>("BtBookshelfTreeModel::Grouping");
+
+    qRegisterMetaType<BTModuleTreeItem::Grouping>("Grouping");
+    qRegisterMetaTypeStreamOperators<BTModuleTreeItem::Grouping>("Grouping");
+
+    qRegisterMetaType<BtConfig::StringMap>("StringMap");
+    qRegisterMetaTypeStreamOperators<BtConfig::StringMap>("StringMap");
+
+    qRegisterMetaType<QList<int> >("QList<int>");
+    qRegisterMetaTypeStreamOperators<QList<int> >("QList<int>");
+}
+
+
+int main(int argc, char *argv[]) {
+    namespace DU = util::directory;
+
+    BibleTimeApp app(argc, argv); //for QApplication
+
+    registerMetaTypes();
+
+    if (!DU::initDirectoryCache()) {
+        qFatal("Error initializing directory cache!");
+        return EXIT_FAILURE;
+    }
+
+    app.startInit();
+    if (!app.initBtConfig()) {
+        return EXIT_FAILURE;
+    }
+
+    //first install QT's own translations
+    QTranslator qtTranslator;
+    qtTranslator.load("qt_" + QLocale::system().name());
+    app.installTranslator(&qtTranslator);
+    //then our own
+    QTranslator BibleTimeTranslator;
+    BibleTimeTranslator.load( QString("bibletime_ui_").append(QLocale::system().name()), DU::getLocaleDir().canonicalPath());
+    app.installTranslator(&BibleTimeTranslator);
+
+//    // a new BibleTime version was installed (maybe a completely new installation)
+//    if (btConfig().value<QString>("bibletimeVersion", BT_VERSION) != BT_VERSION) {
+//        btConfig().setValue("bibletimeVersion", QString(BT_VERSION));
+//        mainWindow->saveConfigSettings();
+//    }
+
+    register_gml_classes();
+    mgr = new btm::ViewManager;
+    mgr->show();
+    btm::BibleTime btm;
+
+    return app.exec();
+}
diff --git a/src/mobile/btmmain.h b/src/mobile/btmmain.h
new file mode 100644
index 0000000..64bd25e
--- /dev/null
+++ b/src/mobile/btmmain.h
@@ -0,0 +1,23 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#ifndef VIEW_MANAGER_INCLUDED
+#define VIEW_MANAGER_INCLUDED
+
+namespace btm {
+    class ViewManager;
+}
+
+btm::ViewManager* getViewManager();
+
+#endif
+
diff --git a/src/mobile/keychooser/bookkeychooser.cpp b/src/mobile/keychooser/bookkeychooser.cpp
new file mode 100644
index 0000000..9ae3ef9
--- /dev/null
+++ b/src/mobile/keychooser/bookkeychooser.cpp
@@ -0,0 +1,272 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#include "bookkeychooser.h"
+
+#include <cmath>
+#include "mobile/ui/btwindowinterface.h"
+#include "mobile/ui/qtquick2applicationviewer.h"
+#include <QCoreApplication>
+#include <QDebug>
+#include <QQmlProperty>
+#include <QQmlContext>
+#include <QQmlProperty>
+#include <QQuickItem>
+#include <QStandardItem>
+#include <QString>
+
+namespace btm {
+
+struct BookEntry {
+    enum BookRoles {
+        NameRole = Qt::UserRole + 1,
+        ChildCountRole
+    };
+};
+
+BookKeyChooser::BookKeyChooser(QtQuick2ApplicationViewer* viewer,
+                               BtWindowInterface* windowInterface)
+    : m_viewer(viewer),
+      m_windowInterface(windowInterface),
+      m_key(0),
+      m_treeChooserObject(0),
+      m_state(CLOSED ) {
+    findTreeChooserObject();
+    initializeRoleNameModel();
+}
+
+void BookKeyChooser::copyKey()
+{
+    CSwordKey* key = m_windowInterface->getKey();
+    CSwordTreeKey* bookKey = dynamic_cast<CSwordTreeKey*>(key);
+    m_key = new CSwordTreeKey(*bookKey);
+}
+
+void BookKeyChooser::findTreeChooserObject() {
+    QQuickItem * rootObject = m_viewer->rootObject();
+    if (rootObject != 0)
+        m_treeChooserObject = rootObject->findChild<QQuickItem*>("treeChooser");
+}
+
+void BookKeyChooser::initializeRoleNameModel() {
+    QHash<int, QByteArray> roleNames;
+    roleNames[BookEntry::NameRole] =  "name";
+    roleNames[BookEntry::ChildCountRole] = "childcount";
+    m_roleItemModel.setRoleNames(roleNames);
+}
+
+void BookKeyChooser::populateRoleNameModel(const QStringList& sibblings, const QList<int>& sibblingChildCounts) {
+    m_roleItemModel.clear();
+    Q_ASSERT(sibblings.count() == sibblingChildCounts.count());
+    for (int i=0; i< sibblings.count(); ++i) {
+        QString sibbling = sibblings.at(i);
+        int childCount = sibblingChildCounts.at(i);
+        QStandardItem* item = new QStandardItem();
+        item->setData(sibbling, BookEntry::NameRole);
+        item->setData(childCount, BookEntry::ChildCountRole);
+        m_roleItemModel.appendRow(item);
+    }
+}
+
+static QString constructPath(const QStringList& pathList) {
+    QString path;
+    for (int i=0; i< pathList.count(); ++i) {
+        QString leaf = QString("/") + pathList.at(i);
+        path.append(leaf);
+    }
+    return path;
+}
+
+static QString getBackPath(const CSwordTreeKey& key) {
+    QString path = key.key();
+    QStringList pathList = path.split('/', QString::SkipEmptyParts);
+    pathList.removeLast();
+
+    QString backPath;
+    if (pathList.count() == 0)
+        return backPath;
+
+    backPath = constructPath(pathList);
+    return backPath;
+}
+
+void BookKeyChooser::select(QString value) {
+    openChooser(false);
+
+    QStringList keyPathList = getKeyPath();
+    keyPathList.removeLast();
+    keyPathList.append(value);
+    QString newPath = constructPath(keyPathList);
+    CSwordTreeKey* tmpBookKey = dynamic_cast<CSwordTreeKey*>(m_key);
+    tmpBookKey->setKey(newPath);
+
+    CSwordKey* key = m_windowInterface->getKey();
+    CSwordTreeKey* bookKey = dynamic_cast<CSwordTreeKey*>(key);
+    bookKey->setKey(*tmpBookKey);
+
+    emit referenceChanged();
+}
+
+void BookKeyChooser::open() {
+    copyKey();
+
+    CSwordTreeKey tmpKey(*m_key);
+    m_backPath = getBackPath(tmpKey);
+    QStringList siblings;
+    QList<int> hasChildrenList;
+    parseKey(&siblings, &hasChildrenList, &tmpKey);
+    populateRoleNameModel(siblings, hasChildrenList);
+    openChooser(true);
+}
+
+void BookKeyChooser::next(QString value) {
+    openChooser(false);
+
+    QStringList keyPathList = getKeyPath();
+    keyPathList.removeLast();
+    keyPathList.append(value);
+
+    QString newPath = constructPath(keyPathList);
+    m_key->setKey(newPath);
+    m_key->firstChild();
+
+    CSwordTreeKey tmpKey(*m_key);
+    m_backPath = getBackPath(tmpKey);
+    QStringList siblings;
+    QList<int> counts;
+    parseKey(&siblings, &counts, &tmpKey);
+    populateRoleNameModel(siblings, counts);
+    openChooser(true);
+
+    m_key->setKey(tmpKey);
+}
+
+void BookKeyChooser::back() {
+    openChooser(false);
+
+    QStringList keyPathList = getKeyPath();
+    keyPathList.removeLast();
+
+    QString newPath = constructPath(keyPathList);
+    keyPathList.removeLast();
+    m_key->setKey(newPath);
+
+    CSwordTreeKey tmpKey(*m_key);
+    m_backPath = getBackPath(tmpKey);
+    QStringList siblings;
+    QList<int> counts;
+    parseKey(&siblings, &counts, &tmpKey);
+    populateRoleNameModel(siblings, counts);
+
+    openChooser(true);
+}
+
+void BookKeyChooser::stringCanceled() {
+}
+
+void BookKeyChooser::setProperties() {
+    m_treeChooserObject->setProperty("path",m_backPath);
+    m_treeChooserObject->setProperty("model", QVariant::fromValue(&m_roleItemModel));
+}
+
+void BookKeyChooser::openChooser(bool open) {
+    Q_ASSERT(m_treeChooserObject != 0);
+    if (m_treeChooserObject == 0)
+        return;
+
+    m_treeChooserObject->disconnect();
+    bool ok = connect(m_treeChooserObject, SIGNAL(select(QString)),
+                      this, SLOT(select(QString)));
+    Q_ASSERT(ok);
+
+    ok = connect(m_treeChooserObject, SIGNAL(next(QString)),
+                 this, SLOT(next(QString)));
+    Q_ASSERT(ok);
+
+    ok = connect(m_treeChooserObject, SIGNAL(back()),
+                 this, SLOT(back()));
+    Q_ASSERT(ok);
+
+    setProperties();
+
+    m_treeChooserObject->setProperty("visible",open);
+}
+
+QStringList BookKeyChooser::getKeyPath() const {
+    QString oldKey = m_key->key(); //string backup of key
+
+    if (oldKey.isEmpty()) { //don't set keys equal to "/", always use a key which may have content
+        m_key->firstChild();
+        oldKey = m_key->key();
+    }
+
+    QStringList siblings; //split up key
+    if (!oldKey.isEmpty()) {
+        siblings = oldKey.split('/', QString::SkipEmptyParts);
+    }
+    return siblings;
+}
+
+static int findEntry(const QString& sibling, bool* found,
+                     CSwordTreeKey* key, QString* matchingKey, QStringList* siblings, QList<int>* hasChildrenList) {
+    int index = 0;
+    int foundIndex = 0;
+    do { //look for matching sibling
+        QString keyName = key->getLocalNameUnicode();
+        if (keyName == sibling) {
+            *found = true;
+            foundIndex = index;
+            *matchingKey = key->key();
+        }
+        siblings->append(keyName);
+        bool hasChildren = key->hasChildren();
+        hasChildrenList->append(hasChildren ? 1 : 0);
+        ++index;
+    } while (key->nextSibling());
+    return foundIndex;
+}
+
+void BookKeyChooser::parseKey(QStringList * siblings,
+            QList<int>* hasChildrenList, CSwordTreeKey* key) {
+    QString oldKey = key->key();
+    QStringList pathDepthList = oldKey.split("/", QString::SkipEmptyParts);
+    int depth = 0;
+    key->root();
+
+    while ( key->firstChild() && (depth < pathDepthList.count()) ) {
+        QString localName = key->getLocalNameUnicode();
+        QString savedKey = key->key();
+        bool found = false;
+        QString path = pathDepthList[depth];
+        siblings->clear();
+        hasChildrenList->clear();
+        QString matchingKey;
+        findEntry(path, &found, key, &matchingKey, siblings, hasChildrenList);
+        if (found) {
+            key->setKey(matchingKey);
+        }
+        depth++;
+    }
+}
+
+void BookKeyChooser::createModel()
+{
+    m_model.clear();
+
+    QStandardItem *parentItem = m_model.invisibleRootItem();
+    for (int i = 0; i < 4; ++i) {
+        QStandardItem *item = new QStandardItem("item1");
+        parentItem->appendRow(item);
+    }
+}
+
+} // end namespace
diff --git a/src/mobile/keychooser/bookkeychooser.h b/src/mobile/keychooser/bookkeychooser.h
new file mode 100644
index 0000000..720e5f0
--- /dev/null
+++ b/src/mobile/keychooser/bookkeychooser.h
@@ -0,0 +1,81 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#ifndef BOOK_KEY_CHOOSER_H
+#define BOOK_KEY_CHOOSER_H
+
+#include "backend/keys/cswordtreekey.h"
+#include <QObject>
+#include <QList>
+#include <QStringList>
+#include <QStandardItemModel>
+#include "mobile/models/roleitemmodel.h"
+
+class QtQuick2ApplicationViewer;
+class QQmlComponent;
+class QQuickItem;
+
+namespace btm {
+
+class BtWindowInterface;
+
+class BookKeyChooser : public QObject {
+    Q_OBJECT
+
+    enum State {
+        CLOSED,
+        BOOK,
+        CHAPTER,
+        VERSE
+    };
+
+public:
+    BookKeyChooser(QtQuick2ApplicationViewer* viewer, BtWindowInterface* windowInterface);
+    void open();
+
+signals:
+    void referenceChanged();
+
+private slots:
+    void select(QString value);
+    void next(QString value);
+    void back();
+    void stringCanceled();
+
+private:
+    void copyKey();
+    void findTreeChooserObject();
+    QStringList getKeyPath() const;
+    void showGridChooser(const QStringList& list);
+    void setProperties(const QStringList& list);
+    void parseKey(QStringList * sibblings, QList<int>* hasChildrenList, CSwordTreeKey* key);
+    void createModel();
+    void setProperties();
+    void initializeRoleNameModel();
+    void populateRoleNameModel(const QStringList& sibblings, const QList<int>& sibblingChildCounts);
+    void openChooser(bool open);
+
+
+    QtQuick2ApplicationViewer* m_viewer;
+    BtWindowInterface* m_windowInterface;
+    CSwordTreeKey* m_key;
+    QQuickItem* m_treeChooserObject;
+    int m_state;
+    QString m_backPath;
+    QStringList m_sibblings;
+    QStandardItemModel m_model;
+    RoleItemModel m_roleItemModel;
+};
+
+} // end namespace
+
+#endif
diff --git a/src/mobile/keychooser/versechooser.cpp b/src/mobile/keychooser/versechooser.cpp
new file mode 100644
index 0000000..f510da0
--- /dev/null
+++ b/src/mobile/keychooser/versechooser.cpp
@@ -0,0 +1,160 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#include "versechooser.h"
+
+#include "backend/keys/cswordversekey.h"
+#include "backend/drivers/cswordbiblemoduleinfo.h"
+#include "backend/drivers/cswordmoduleinfo.h"
+#include <cmath>
+#include "mobile/ui/btwindowinterface.h"
+#include "mobile/ui/gridchooser.h"
+#include "mobile/ui/qtquick2applicationviewer.h"
+#include <QQuickItem>
+#include <QQmlProperty>
+#include <QQmlContext>
+#include <QDebug>
+#include <QQmlProperty>
+#include <QCoreApplication>
+
+namespace btm {
+
+VerseChooser::VerseChooser(QtQuick2ApplicationViewer* viewer, BtWindowInterface* bibleVerse)
+    : m_viewer(viewer),
+      m_gridChooser(0),
+      bibleVerse_(bibleVerse),
+      m_key(0),
+      m_state(CLOSED ) {
+    m_gridChooser = new GridChooser(m_viewer);
+    bool ok = connect(m_gridChooser, SIGNAL(accepted(const QString&)),
+                      this, SLOT(stringAccepted(const QString&)));
+    Q_ASSERT(ok);
+}
+
+void VerseChooser::open(CSwordVerseKey* key) {
+    if (key == 0)
+        return;
+    m_key = key;
+    m_oldBook = getBook();
+    m_oldChapter = getChapter();
+    m_oldVerse = getVerse();
+    m_state = BOOK;
+    QStringList books = getBooks();
+    m_gridChooser->open(books, m_oldBook, "Book");
+}
+
+void VerseChooser::stringAccepted(const QString& value) {
+    if (m_state == BOOK) {
+        m_newBook = value;
+        m_state = CHAPTER;
+        setBook(value);
+        QStringList chapters = getChapters();
+        m_gridChooser->open(chapters, m_oldChapter, "Chapter");
+    }
+    else if (m_state == CHAPTER) {
+        m_newChapter = value;
+        m_state = VERSE;
+        setChapter(value);
+        QStringList verses = getVerses();
+        m_gridChooser->open(verses, m_oldVerse, "Verse");
+    }
+    else if (m_state == VERSE) {
+        m_newVerse = value;
+        m_state = CLOSED;
+        setVerse(m_newVerse);
+    }
+}
+
+void VerseChooser::stringCanceled() {
+}
+
+QString VerseChooser::getBook() const {
+    QString book;
+    if (m_key)
+        book = m_key->book();
+    return book;
+}
+
+void VerseChooser::setBook(const QString& book) {
+    if (m_key) {
+        m_key->book(book);
+    }
+}
+
+QString VerseChooser::getChapter() const {
+    QString chapter;
+    if (m_key)
+        chapter = QString::number(m_key->getChapter());
+    return chapter;
+}
+
+void VerseChooser::setChapter(const QString& chapter)  {
+    if (m_key) {
+        int iChapter = chapter.toInt();
+        m_key->setChapter(iChapter);
+    }
+}
+
+QString VerseChooser::getVerse() const {
+    QString verse;
+    if (m_key) {
+        verse = QString::number(m_key->getVerse());
+    }
+    return verse;
+}
+
+void VerseChooser::setVerse(const QString& verse) {
+    if (m_key) {
+        int iVerse = verse.toInt();
+        m_key->setVerse(iVerse);
+        emit referenceChanged();
+    }
+}
+
+QStringList VerseChooser::getBooks() const {
+    QStringList books;
+    const CSwordModuleInfo* module = m_key->module();
+    const CSwordBibleModuleInfo* bibleModule = qobject_cast<const CSwordBibleModuleInfo*>(module);
+    if (bibleModule)
+        books = *bibleModule->books();
+    return books;
+}
+
+QStringList VerseChooser::getChapters() const {
+    QStringList chapters;
+    const CSwordModuleInfo* module = m_key->module();
+    const CSwordBibleModuleInfo* m = qobject_cast<const CSwordBibleModuleInfo*>(module);
+
+    QString book = m_key->book();
+    int count = m->chapterCount(book);
+    for (int i = 1; i <= count; i++) {
+        chapters << QString::number(i);
+    }
+    return chapters;
+}
+
+QStringList VerseChooser::getVerses() const {
+    QStringList verses;
+    const CSwordModuleInfo* module = m_key->module();
+    const CSwordBibleModuleInfo* m = qobject_cast<const CSwordBibleModuleInfo*>(module);
+    QString book = m_key->book();
+    int chapter = m_key->getChapter();
+    int count = m->verseCount(book,chapter);
+    for (int i = 1; i <= count; i++) {
+        verses << QString::number(i);
+    }
+    return verses;
+}
+
+
+
+} // end namespace
diff --git a/src/mobile/keychooser/versechooser.h b/src/mobile/keychooser/versechooser.h
new file mode 100644
index 0000000..3c7f52b
--- /dev/null
+++ b/src/mobile/keychooser/versechooser.h
@@ -0,0 +1,86 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#ifndef VERSE_CHOOSER_H
+#define VERSE_CHOOSER_H
+
+#include <QObject>
+#include <QList>
+
+class CSwordVerseKey;
+class QtQuick2ApplicationViewer;
+class QQmlComponent;
+class QQuickItem;
+class QStringList;
+
+namespace btm {
+
+class GridChooser;
+
+class BtWindowInterface;
+
+class VerseChooser : public QObject {
+    Q_OBJECT
+
+    enum State {
+        CLOSED,
+        BOOK,
+        CHAPTER,
+        VERSE
+    };
+
+public:
+    VerseChooser(QtQuick2ApplicationViewer* viewer, BtWindowInterface* bibleVerse);
+    void open(CSwordVerseKey* key);
+
+signals:
+    void referenceChanged();
+
+private slots:
+    void stringAccepted(const QString& value);
+    void stringCanceled();
+
+private:
+    QString getBook() const;
+    void setBook(const QString& book);
+
+    QString getChapter() const;
+    void setChapter(const QString& chapter);
+
+    QString getVerse() const;
+    void setVerse(const QString& chapter);
+
+    QStringList getBooks() const;
+    QStringList getChapters() const;
+    QStringList getVerses() const;
+
+    void showGridChooser(const QStringList& list);
+    void setProperties(const QStringList& list);
+
+
+    QtQuick2ApplicationViewer* m_viewer;
+    GridChooser* m_gridChooser;
+    BtWindowInterface* bibleVerse_;
+    CSwordVerseKey* m_key;
+    int m_state;
+
+    QString m_oldBook;
+    QString m_oldChapter;
+    QString m_oldVerse;
+    QString m_newBook;
+    QString m_newChapter;
+    QString m_newVerse;
+};
+
+} // end namespace
+
+#endif
diff --git a/src/mobile/models/bibletextmodelbuilder.cpp b/src/mobile/models/bibletextmodelbuilder.cpp
new file mode 100644
index 0000000..20faf14
--- /dev/null
+++ b/src/mobile/models/bibletextmodelbuilder.cpp
@@ -0,0 +1,184 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#include "bibletextmodelbuilder.h"
+
+#include "btglobal.h"
+#include "backend/keys/cswordversekey.h"
+#include "backend/drivers/cswordbiblemoduleinfo.h"
+#include "backend/managers/cswordbackend.h"
+
+namespace btm {
+
+struct BookEntry {
+    enum TextRoles {
+        ReferenceRole = Qt::UserRole + 1,
+        TextRole = Qt::UserRole + 2
+    };
+};
+
+BibleTextModelBuilder::BibleTextModelBuilder(RoleItemModel* model)
+    : m_model(model) {
+    QHash<int, QByteArray> roleNames;
+    roleNames[BookEntry::ReferenceRole] =  "ref";
+    roleNames[BookEntry::TextRole] = "line";
+    m_model->setRoleNames(roleNames);
+}
+
+void BibleTextModelBuilder::updateModel(
+        QList<const CSwordModuleInfo*> modules,
+        const QString& keyName) {
+
+    Q_ASSERT( modules.count() >= 1 );
+    Q_ASSERT( !keyName.isEmpty() );
+
+    FilterOptions options;
+    options.footnotes = 0;
+    options.strongNumbers = 0;
+    options.headings = 1;
+    options.morphTags = 0;
+    options.lemmas = 0;
+    options.hebrewPoints = 0;
+    options.greekAccents = 0;
+    options.textualVariants = 0;
+    options.redLetterWords = 1;
+    options.scriptureReferences = 0;
+    options.morphSegmentation = 0;
+    CSwordBackend::instance()->setFilterOptions(options);
+
+    const CSwordModuleInfo *module = modules.first();
+
+    if (modules.count() == 1)
+        module->module()->setSkipConsecutiveLinks( true ); //skip empty, linked verses
+
+    QString startKey = keyName;
+    QString endKey = startKey;
+
+    //check whether there's an intro we have to include
+    Q_ASSERT((module->type() == CSwordModuleInfo::Bible));
+
+    if (module->type() == CSwordModuleInfo::Bible) {
+        ((sword::VerseKey*)(module->module()->getKey()))->setIntros(true);
+
+        Q_ASSERT(dynamic_cast<const CSwordBibleModuleInfo*>(module) != 0);
+        const CSwordBibleModuleInfo* bible =
+                static_cast<const CSwordBibleModuleInfo*>(module);
+
+        CSwordVerseKey k1(module);
+        k1.setIntros(true);
+        k1.setKey(keyName);
+
+        if (k1.getChapter() == 1)
+            k1.setChapter(0); // Chapter 1, start with 0:0, otherwise X:0
+
+        k1.setVerse(0);
+
+        startKey = k1.key();
+
+        if (k1.getChapter() == 0)
+            k1.setChapter(1);
+
+        k1.setVerse(bible->verseCount(k1.book(), k1.getChapter()));
+        endKey = k1.key();
+    }
+
+    updateKeyRange(modules, startKey, endKey, keyName);
+}
+
+void BibleTextModelBuilder::updateKeyRange(
+        QList<const CSwordModuleInfo*> modules,
+        const QString& startKey,
+        const QString& endKey,
+        const QString& highlightKey) {
+
+    m_model->clear();
+
+    const CSwordModuleInfo *module = modules.first();
+
+    QSharedPointer<CSwordKey> currentKey( CSwordKey::createInstance(module) );
+    currentKey->setKey(highlightKey);
+    CSwordVerseKey* vk_current = dynamic_cast<CSwordVerseKey*>(currentKey.data());
+    Q_ASSERT(vk_current);
+    m_currentVerse = vk_current->getVerse();
+
+    QSharedPointer<CSwordKey> lowerBound( CSwordKey::createInstance(module) );
+    lowerBound->setKey(startKey);
+
+    QSharedPointer<CSwordKey> upperBound( CSwordKey::createInstance(module) );
+    upperBound->setKey(endKey);
+
+    sword::SWKey* sw_start = dynamic_cast<sword::SWKey*>(lowerBound.data());
+    sword::SWKey* sw_stop = dynamic_cast<sword::SWKey*>(upperBound.data());
+
+    Q_ASSERT((*sw_start == *sw_stop) || (*sw_start < *sw_stop));
+
+    //    if (*sw_start == *sw_stop) { //same key, render single key
+    //        return renderSingleKey(lowerBound->key(), modules);
+    //    }
+    //    else if (*sw_start < *sw_stop) { // Render range
+    //        KeyTree tree;
+    //        KeyTreeItem::Settings settings = keySettings;
+
+    CSwordVerseKey* vk_start = dynamic_cast<CSwordVerseKey*>(lowerBound.data());
+    Q_ASSERT(vk_start);
+
+    CSwordVerseKey* vk_stop = dynamic_cast<CSwordVerseKey*>(upperBound.data());
+    Q_ASSERT(vk_stop);
+
+    while ((*vk_start < *vk_stop) || (*vk_start == *vk_stop)) {
+
+        //make sure the key given by highlightKey gets marked as current key
+        //            settings.highlight = (!highlightKey.isEmpty() ? (vk_start->key() == highlightKey) : false);
+
+        /**
+                \todo We need to take care of linked verses if we render one or
+                      (esp) more modules. If the verses 2,3,4,5 are linked to 1,
+                      it should be displayed as one entry with the caption 1-5.
+            */
+
+        if (vk_start->getChapter() == 0) { // range was 0:0-1:x, render 0:0 first and jump to 1:0
+            vk_start->setVerse(0);
+            addVerseToModel(vk_start);
+            vk_start->setChapter(1);
+            vk_start->setVerse(0);
+        }
+        addVerseToModel(vk_start);
+        if (!vk_start->next(CSwordVerseKey::UseVerse)) {
+            /// \todo Notify the user about this failure.
+            break;
+        }
+    }
+}
+
+void BibleTextModelBuilder::addVerseToModel(CSwordVerseKey* key) {
+    int verseNumber = key->getVerse();
+    QString verse;
+    if (verseNumber != 0)
+        verse.setNum(verseNumber);
+    QString text = key->renderedText();
+    if (text.isEmpty())
+        return;
+    text.replace("<br /><br />", "<br />");
+    QStandardItem* item = new QStandardItem();
+    item->setData(verse, BookEntry::ReferenceRole);
+    item->setData(text, BookEntry::TextRole);
+    m_model->appendRow(item);
+
+    if (m_currentVerse == verseNumber)
+        m_currentModelIndex = m_model->rowCount() - 1;
+}
+
+int BibleTextModelBuilder::getCurrentModelIndex() const {
+    return m_currentModelIndex;
+}
+
+}
diff --git a/src/mobile/models/bibletextmodelbuilder.h b/src/mobile/models/bibletextmodelbuilder.h
new file mode 100644
index 0000000..620810a
--- /dev/null
+++ b/src/mobile/models/bibletextmodelbuilder.h
@@ -0,0 +1,46 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#include "mobile/models/roleitemmodel.h"
+#include <QList>
+#include <QString>
+#include "backend/drivers/cswordmoduleinfo.h"
+
+class CSwordVerseKey;
+
+namespace btm {
+
+class BibleTextModelBuilder {
+public:
+    BibleTextModelBuilder(RoleItemModel* model);
+
+    void updateModel(
+            QList<const CSwordModuleInfo*> modules,
+            const QString& keyText);
+
+    void updateKeyRange(
+            QList<const CSwordModuleInfo*> modules,
+            const QString& startKey,
+            const QString& endKey,
+            const QString& highlightKey);
+
+    int getCurrentModelIndex() const;
+
+private:
+    void addVerseToModel(CSwordVerseKey* key);
+
+    RoleItemModel* m_model;
+    int m_currentVerse;
+    int m_currentModelIndex;
+};
+
+}
diff --git a/src/mobile/models/booktextmodelbuilder.cpp b/src/mobile/models/booktextmodelbuilder.cpp
new file mode 100644
index 0000000..44d5d92
--- /dev/null
+++ b/src/mobile/models/booktextmodelbuilder.cpp
@@ -0,0 +1,101 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#include "booktextmodelbuilder.h"
+
+#include "btglobal.h"
+#include "backend/keys/cswordtreekey.h"
+#include "backend/drivers/cswordbookmoduleinfo.h"
+#include "backend/managers/cswordbackend.h"
+
+namespace btm {
+
+struct BookEntry {
+    enum TextRoles {
+        ReferenceRole = Qt::UserRole + 1,
+        TextRole = Qt::UserRole + 2
+    };
+};
+
+BookTextModelBuilder::BookTextModelBuilder(RoleItemModel* model)
+    : m_model(model) {
+    QHash<int, QByteArray> roleNames;
+    roleNames[BookEntry::ReferenceRole] =  "ref";
+    roleNames[BookEntry::TextRole] = "line";
+    m_model->setRoleNames(roleNames);
+}
+
+void BookTextModelBuilder::updateModel(
+        QList<const CSwordModuleInfo*> modules,
+        const QString& keyName) {
+
+    Q_ASSERT( modules.count() >= 1 );
+    Q_ASSERT( !keyName.isEmpty() );
+
+    FilterOptions options;
+    options.footnotes = 0;
+    options.strongNumbers = 0;
+    options.headings = 1;
+    options.morphTags = 0;
+    options.lemmas = 0;
+    options.hebrewPoints = 0;
+    options.greekAccents = 0;
+    options.textualVariants = 0;
+    options.redLetterWords = 1;
+    options.scriptureReferences = 0;
+    options.morphSegmentation = 0;
+    CSwordBackend::instance()->setFilterOptions(options);
+
+    const CSwordModuleInfo *module = modules.first();
+
+    const CSwordBookModuleInfo* book = dynamic_cast<const CSwordBookModuleInfo*>(module);
+    Q_ASSERT(book);
+
+    QSharedPointer<CSwordTreeKey> key (
+        dynamic_cast<CSwordTreeKey*>( CSwordKey::createInstance(book) )
+    );
+    key->setKey(keyName); //set the key to position we'd like to get
+
+//    const unsigned long offset = key->getOffset();
+
+    //check whether there's an intro we have to include
+    Q_ASSERT((module->type() == CSwordModuleInfo::GenericBook));
+
+    if (module->type() == CSwordModuleInfo::GenericBook) {
+        CSwordTreeKey* swKey = dynamic_cast<CSwordTreeKey*>(key.data());
+        addVerseToModel(swKey);
+    }
+}
+
+void BookTextModelBuilder::addVerseToModel(CSwordTreeKey* key) {
+//    int verseNumber = key->getVerse();
+    QString verse;
+//    if (verseNumber != 0)
+//        verse.setNum(verseNumber);
+    QString text = key->renderedText(); // TODO - fix
+    if (text.isEmpty())
+        return;
+//    text.replace("<br /><br />", "<br />");
+    QStandardItem* item = new QStandardItem();
+    item->setData(verse, BookEntry::ReferenceRole);
+    item->setData(text, BookEntry::TextRole);
+    m_model->appendRow(item);
+
+//    if (m_currentVerse == verseNumber)
+//        m_currentModelIndex = m_model->rowCount() - 1;
+}
+
+int BookTextModelBuilder::getCurrentModelIndex() const {
+    return m_currentModelIndex;
+}
+
+}
diff --git a/src/mobile/models/booktextmodelbuilder.h b/src/mobile/models/booktextmodelbuilder.h
new file mode 100644
index 0000000..a64c380
--- /dev/null
+++ b/src/mobile/models/booktextmodelbuilder.h
@@ -0,0 +1,40 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#include "mobile/models/roleitemmodel.h"
+#include <QList>
+#include <QString>
+#include "backend/drivers/cswordmoduleinfo.h"
+
+class CSwordTreeKey;
+
+namespace btm {
+
+class BookTextModelBuilder {
+public:
+    BookTextModelBuilder(RoleItemModel* model);
+
+    void updateModel(
+            QList<const CSwordModuleInfo*> modules,
+            const QString& keyText);
+
+    int getCurrentModelIndex() const;
+
+private:
+    void addVerseToModel(CSwordTreeKey* key);
+
+    RoleItemModel* m_model;
+    int m_currentVerse;
+    int m_currentModelIndex;
+};
+
+}
diff --git a/src/mobile/models/roleitemmodel.cpp b/src/mobile/models/roleitemmodel.cpp
new file mode 100644
index 0000000..95634af
--- /dev/null
+++ b/src/mobile/models/roleitemmodel.cpp
@@ -0,0 +1,54 @@
+#include "roleitemmodel.h"
+
+/* Example usage:
+
+Enumerate the role ID's somewhere
+---------------------------------
+
+struct RedditEntry {
+
+    enum RedditRoles {
+        UrlRole = Qt::UserRole + 1,
+        DescRole,
+        ...
+    };
+    ...
+}
+
+Instantiate the class
+---------------------
+
+    QHash<int, QByteArray> roleNames;
+    roleNames[RedditEntry::UrlRole] =  "url";
+    roleNames[RedditEntry::ScoreRole] = "score";
+    m_linksmodel = new RoleItemModel(roleNames);
+
+Populate with data:
+-------------------
+
+    QStandardItem* it = new QStandardItem();
+    it->setData(e.desc, RedditEntry::DescRole);
+    it->setData(e.score, RedditEntry::ScoreRole);
+
+    m_linksmodel->appendRow(it);
+
+Expose to QML:
+-------------
+
+QDeclarativeContext *ctx = ...
+
+ctx->setContextProperty("mdlLinks", m_linksmodel);
+
+*/
+
+//RoleItemModel::RoleItemModel(const QHash<int, QByteArray> &roleNames)
+//    : m_roleNames(roleNames) {
+//}
+
+QHash<int, QByteArray> RoleItemModel::roleNames() const {
+    return m_roleNames;
+}
+
+void RoleItemModel::setRoleNames(const QHash<int, QByteArray> &roleNames) {
+    m_roleNames = roleNames;
+}
diff --git a/src/mobile/models/roleitemmodel.h b/src/mobile/models/roleitemmodel.h
new file mode 100644
index 0000000..46f02be
--- /dev/null
+++ b/src/mobile/models/roleitemmodel.h
@@ -0,0 +1,24 @@
+#ifndef ROLEITEMMODEL_H
+#define ROLEITEMMODEL_H
+
+#include <QStandardItemModel>
+
+/* class to allow easily exposing
+   C++ data as a model for QML View.
+*/
+
+class RoleItemModel : public QStandardItemModel {
+public:
+    //  roleNames is a map describing what role id (e.g. Qt::UserRole+1)
+    //  is associated with what name on QML side (e.g. 'bookTitle')
+    //  RoleItemModel(const QHash<int, QByteArray> &roleNames);
+
+    QHash<int, QByteArray> roleNames() const;
+    void setRoleNames(const QHash<int, QByteArray> &roleNames);
+
+private:
+    QHash<int, QByteArray> m_roleNames;
+
+};
+
+#endif // ROLEITEMMODEL_H
diff --git a/src/mobile/qml/ContextMenu.qml b/src/mobile/qml/ContextMenu.qml
new file mode 100644
index 0000000..bf55ebf
--- /dev/null
+++ b/src/mobile/qml/ContextMenu.qml
@@ -0,0 +1,62 @@
+import QtQuick 2.1
+import BibleTime 1.0
+
+Rectangle {
+    id: contextMenu
+
+    property alias model: menuList.model
+
+    signal accepted(string action)
+
+    color: "white"
+    border.color: "black"
+    border.width: 1
+    anchors.centerIn: parent
+    height: 250
+    width: 250
+
+    onVisibleChanged: PropertyAnimation {
+        target: settings
+        property: "opacity"
+        from: 0
+        to: 1
+        duration: 400
+        easing.type: Easing.InOutCubic
+    }
+
+    BtStyle {
+        id: btStyle
+    }
+
+    ListView {
+        id: menuList
+
+        anchors.fill: parent
+        anchors.topMargin: 100
+
+        delegate: Rectangle {
+            color: "white"
+            border.color: "black"
+            border.width: 1
+            width: parent.width
+            height: children[0].height * 2.5
+
+            Text {
+                id: menuText
+                x: 40
+                anchors.verticalCenter: parent.verticalCenter
+                text: title
+                color: "black"
+                font.pointSize: btStyle.uiFontPointSize
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    contextMenu.visible = false;
+                    contextMenu.accepted(action);
+                }
+            }
+        }
+    }
+}
diff --git a/src/mobile/qml/FontSizeSlider.qml b/src/mobile/qml/FontSizeSlider.qml
new file mode 100644
index 0000000..6c11dc0
--- /dev/null
+++ b/src/mobile/qml/FontSizeSlider.qml
@@ -0,0 +1,139 @@
+import QtQuick 2.1
+import BibleTime 1.0
+
+Rectangle {
+    id: fontPointSize
+
+    property string title: ""
+    property int min: 10
+    property int max: 22
+    property int current: 12
+    property int previous: 12
+
+    signal accepted(int pointSize);
+
+    color: "#f8f8f8"
+    border.color: "black"
+    border.width: 1
+    anchors.centerIn: parent
+    width: parent.width * 0.85
+    height: 140
+
+    Text {
+        text: title
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: parent.top
+        anchors.topMargin: 10
+        height: 40
+        font.pointSize: btStyle.uiFontPointSize
+    }
+
+    Rectangle {
+        id: bar
+
+        color: "blue"
+        width: parent.width *.80
+        height: 3
+        anchors.centerIn: parent
+    }
+
+    Rectangle {
+        id: indicator
+
+        width: 18
+        height: 18
+        color: "red"
+        y: bar.y - height / 2
+        x: {
+            var range = fontPointSize.max - fontPointSize.min;
+            var xpos = bar.width *
+                    (fontPointSize.current - fontPointSize.min) / range;
+            xpos = xpos + bar.x
+            return xpos
+        }
+    }
+
+    MouseArea {
+        property bool active: false
+        width: bar.width
+        anchors.left: bar.left
+        height: 40
+        anchors.verticalCenter: bar.verticalCenter
+
+        onPressed: {
+            active = true;
+        }
+
+        onReleased: {
+            active = false;
+        }
+
+        onMouseXChanged: {
+            if ( ! active)
+                return;
+            var range = fontPointSize.max - fontPointSize.min;
+            var currentF = mouse.x / bar.width * range  + fontPointSize.min;
+            var value = Math.round(currentF);
+            if (value < fontPointSize.min)
+                value = min;
+            if (value > fontPointSize.max)
+                value = max;
+            fontPointSize.current = value;
+            accepted(value);
+        }
+
+    }
+
+    Grid {
+        id: buttons
+
+        spacing: 10
+        columns: 2
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+        anchors.rightMargin: 10
+        anchors.bottomMargin: 10
+
+        Rectangle {
+            height: 40
+            width: 120
+            border.color: "black"
+            border.width: 1
+
+            Text {
+                text: "Ok"
+                anchors.centerIn: parent
+                font.pointSize: btStyle.uiFontPointSize
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    fontPointSize.visible = false;
+                }
+            }
+        }
+
+        Rectangle {
+            height: 40
+            width: 120
+            border.color: "black"
+            border.width: 1
+
+            Text {
+                text: "Cancel"
+                anchors.centerIn: parent
+                font.pointSize: btStyle.uiFontPointSize
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    accepted(previous);
+                    fontPointSize.visible = false;
+                }
+            }
+        }
+    }
+
+}
diff --git a/src/mobile/qml/GridChooser.qml b/src/mobile/qml/GridChooser.qml
new file mode 100644
index 0000000..b4d1612
--- /dev/null
+++ b/src/mobile/qml/GridChooser.qml
@@ -0,0 +1,117 @@
+import QtQuick 2.1
+import BibleTime 1.0
+
+Rectangle {
+    id: gridChooser
+
+    property int columns: 5
+    property int rows: 5
+    property int buttonWidth: 100
+    property int buttonHeight: 30
+    property int topMargin: 10
+    property int leftMargin: 10
+    property int titleHeight: 20
+    property int space:5
+    property string selected: ""
+    property string titleText: ""
+    property int maxLength: 0
+
+    signal accepted(string choosenText);
+    signal canceled();
+
+    onVisibleChanged: {
+
+        var count = gridChooserModel.length
+        if (count < 36)
+            count = 36;
+
+        calculateColumns(count);
+
+        buttonWidth = (width-50)/columns;
+        buttonHeight = Math.floor((height-(rows*5))/rows);
+
+        topMargin = (height - rows*(buttonHeight+space) + space)/2 +titleHeight;
+        leftMargin = (width - columns*(buttonWidth+space) + space)/2;
+    }
+
+    function calculateColumns(count) {
+        var aspectRatio = 0.175;
+        var columnsF = Math.sqrt(count * width * aspectRatio / height);
+        columns = Math.ceil(columnsF);
+        rows = Math.ceil((count-0.01)/columns);
+    }
+
+    function accept(value) {
+        visible = false;
+        gridChooser.accepted(value);
+    }
+
+    Text {
+        id: title
+
+        text: titleText
+        font.pointSize: btStyle.uiFontPointSize
+        height: titleHeight
+        anchors.top: parent.top
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+
+    BtStyle {
+        id: btStyle
+    }
+
+    MouseArea {
+        id: mouseArea
+
+        anchors.fill: parent
+        enabled: gridChooser.opacity
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        color: btStyle.buttonBackground
+    }
+
+    Rectangle {
+        id: topSpace
+
+        width: leftMargin
+        height: topMargin
+        color: btStyle.buttonBackground
+    }
+
+    Grid {
+        id: grid
+
+        anchors.top: topSpace.bottom
+        anchors.bottom: bottom.top
+        anchors.left: topSpace.right
+        anchors.right: parent.right
+        columns: gridChooser.columns
+        spacing: gridChooser.space
+
+        Repeater {
+            id: repeater
+
+            model: gridChooserModel
+
+            GridChooserButton {
+                id: buttonX
+
+                text: modelData
+                textHeight: btStyle.uiFontPointSize
+                buttonWidth: gridChooser.buttonWidth
+                buttonHeight: gridChooser.buttonHeight
+                textColor: {
+                    if (text == gridChooser.selected)
+                        return btStyle.buttonHighlightedText
+                    else
+                        return btStyle.buttonTextColor
+                }
+                buttonColor: btStyle.buttonColor
+                activeButtonColor: btStyle.buttonTextColor
+                onClicked: gridChooser.accept(text)
+            }
+        }
+    }
+}
diff --git a/src/mobile/qml/GridChooserButton.qml b/src/mobile/qml/GridChooserButton.qml
new file mode 100644
index 0000000..9a65041
--- /dev/null
+++ b/src/mobile/qml/GridChooserButton.qml
@@ -0,0 +1,52 @@
+import QtQuick 2.1
+import BibleTime 1.0
+
+Rectangle {
+    id: button
+
+    property int buttonWidth
+    property int buttonHeight
+    property int textHeight
+    property color textColor
+    property color buttonColor
+    property color activeButtonColor
+    property alias text: buttonText.text
+
+    signal clicked
+
+    width: buttonWidth
+    height: buttonHeight
+    gradient: Gradient {
+        GradientStop { position: 0.0;  color: btStyle.buttonGradient0 }
+        GradientStop { position: 0.15; color: btStyle.buttonGradient1 }
+        GradientStop { position: 0.85; color: btStyle.buttonGradient2 }
+        GradientStop { position: 1.0;  color: btStyle.buttonGradient3 }
+    }
+    smooth: true
+
+    border {
+        width: 1
+        color: btStyle.buttonBorder
+    }
+
+    BtStyle {
+        id: btStyle
+    }
+
+    Text {
+        id: buttonText
+
+        width: buttonWidth-8
+        anchors.centerIn: parent
+        color: button.textColor
+        font.pointSize: parent.textHeight
+        elide: Text.ElideRight
+    }
+
+    MouseArea {
+        id: mouseArea
+
+        anchors.fill: parent
+        onClicked: button.clicked()
+    }
+}
diff --git a/src/mobile/qml/ImageButton.qml b/src/mobile/qml/ImageButton.qml
new file mode 100644
index 0000000..552a9b4
--- /dev/null
+++ b/src/mobile/qml/ImageButton.qml
@@ -0,0 +1,24 @@
+import QtQuick 2.1
+
+Rectangle {
+    id: imageButton
+
+    property bool show: true
+    property string icon: ""
+    property int corner: 6
+
+    border.width: 1
+    border.color: "gray"
+    radius: corner
+
+    Image{
+        id: nextIcon
+        anchors.fill: parent
+        fillMode: Image.PreserveAspectFit
+        source: imageButton.icon
+        height: parent.height
+        width: parent.height
+        anchors.right: parent.right
+        anchors.top: parent.top
+    }
+}
diff --git a/src/mobile/qml/InstallManagerChooser.qml b/src/mobile/qml/InstallManagerChooser.qml
new file mode 100644
index 0000000..15b6079
--- /dev/null
+++ b/src/mobile/qml/InstallManagerChooser.qml
@@ -0,0 +1,153 @@
+import QtQuick 2.1
+
+Rectangle {
+    id: installManager
+
+    property alias sourceModel: sourceView.model
+    property alias categoryModel: categoryView.model
+    property alias languageModel: languageView.model
+    property alias worksModel: worksView.model
+    property alias sourceIndex: sourceView.currentIndex
+    property alias categoryIndex: categoryView.currentIndex
+    property alias languageIndex: languageView.currentIndex
+    property int spacing: 8
+
+    objectName: "installManager"
+    color: "lightgray"
+    border.color: "black"
+    border.width: 2
+
+    signal sourceChanged(int index);
+    signal categoryChanged(int index);
+    signal languageChanged(int index);
+    signal workSelected(int index);
+    signal cancel();
+    signal installRemove();
+    signal refreshLists();
+
+    Grid {
+        id:  grid
+        columns: 3
+        rows: 1
+        spacing: installManager.spacing
+        width: parent.width - installManager.spacing
+        height: installManager.height/3
+        anchors.left: parent.left
+        anchors.top: parent.top
+        anchors.margins: installManager.spacing
+
+        ListTextView {
+            id: sourceView
+            onItemSelected: {
+                sourceChanged(currentIndex)
+            }
+
+            title: "Source"
+            width: parent.width/3 - grid.spacing
+            height: installManager.height/3
+        }
+
+        ListTextView {
+            id: categoryView
+
+            title: "Category"
+            width: parent.width/3 - grid.spacing
+            height: installManager.height/3
+            onItemSelected: {
+                categoryChanged(currentIndex)
+            }
+        }
+
+        ListTextView {
+            id: languageView
+
+            title: "Language"
+            width: parent.width/3 - grid.spacing
+            height: installManager.height/3
+            onItemSelected: {
+                languageChanged(currentIndex)
+            }
+        }
+    }
+
+    ListWorksView {
+        id: worksView
+
+        title: "Work"
+        width: parent.width - 2 * installManager.spacing
+        anchors.top: grid.bottom
+        anchors.left: parent.left
+        anchors.bottom: installRemoveButton.top
+        anchors.margins: installManager.spacing
+        onItemSelected: {
+            workSelected(index)
+        }
+    }
+
+    Rectangle {
+        id: "refreshButton"
+        width:150
+        height: 40
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: 10
+        anchors.right: installRemoveButton.left
+        anchors.rightMargin: 10
+        border.width: 1
+        border.color: "black"
+
+        Text {
+            text: "Refresh Lists"
+            anchors.centerIn: parent
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: installManager.refreshLists()
+        }
+    }
+
+    Rectangle {
+        id: "installRemoveButton"
+        width:150
+        height: 40
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: 10
+        anchors.right: cancelButton.left
+        anchors.rightMargin: 10
+        border.width: 1
+        border.color: "black"
+
+        Text {
+            text: "Install / Remove"
+            anchors.centerIn: parent
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: installManager.installRemove()
+        }
+    }
+
+    Rectangle {
+        id: "cancelButton"
+        width: installRemoveButton.width
+        height: installRemoveButton.height
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: 10
+        anchors.right: parent.right
+        anchors.rightMargin: 10
+        border.width: 1
+        border.color: "black"
+
+        Text {
+            text: "Cancel"
+            anchors.centerIn: parent
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: installManager.cancel();
+        }
+    }
+
+}
diff --git a/src/mobile/qml/ListTextView.qml b/src/mobile/qml/ListTextView.qml
new file mode 100644
index 0000000..703fe48
--- /dev/null
+++ b/src/mobile/qml/ListTextView.qml
@@ -0,0 +1,108 @@
+import QtQuick 2.1
+
+Rectangle {
+    id: top
+
+    property alias model: listView.model
+    property alias currentIndex: listView.currentIndex
+    property alias title: title.text
+    property bool highlight: true
+
+    border.color: "black"
+    border.width: 2
+
+    signal itemSelected(int index)
+
+    Rectangle {
+        id: titleRect
+
+        border.color: "black"
+        border.width: 1
+        height:25
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.leftMargin: 3
+        anchors.rightMargin: 3
+        anchors.topMargin: 3
+
+        Text {
+            id: title
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.centerIn: parent
+            horizontalAlignment: Text.AlignCenter
+            verticalAlignment: Text.AlignBottom
+            style: Text.Sunken
+            font.pointSize: btStyle.uiFontPointSize
+        }
+    }
+
+    ListView {
+        id: listView
+
+        anchors.top: titleRect.bottom
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.leftMargin: 3
+        anchors.rightMargin: 3
+        anchors.bottomMargin: 3
+        clip: true
+        highlightFollowsCurrentItem: true
+        currentIndex: 2
+
+        function selectItem(x, y) {
+            var index = listView.indexAt(x+contentX,y+contentY);
+            currentIndex = index;
+            top.itemSelected(index);
+        }
+
+        Rectangle {
+            id: scrollbar
+            anchors.right: listView.right
+            y: listView.visibleArea.yPosition * listView.height
+            width: 7
+            height: listView.visibleArea.heightRatio * listView.height
+            color: "black"
+            visible: listView.visibleArea.heightRatio < 0.99
+        }
+
+        delegate {
+            Rectangle {
+                id: entry
+
+                property bool selected: ListView.isCurrentItem ? true : false
+                objectName: "entry"
+                color: (highlight && ListView.isCurrentItem) ? "#ffeeaa" : "white"
+                border.width: 1
+                border.color: "darkgray"
+                width: parent.width
+                height: 40
+
+                Text {
+                    id: entryText
+
+                    anchors.top: entry.top
+                    anchors.left: entry.left
+                    anchors.right: entry.right
+                    width: parent.width
+                    anchors.leftMargin: 10
+                    anchors.rightMargin: 10
+                    anchors.topMargin: 10
+                    text: modelText
+                    font.pointSize: btStyle.uiFontPointSize
+                    font.bold: highlight && entry.selected
+                }
+            }
+        }
+
+        MouseArea {
+            anchors.fill: listView
+            onClicked: itemSelected()
+
+            function itemSelected() {
+                listView.selectItem(mouseX, mouseY);
+            }
+        }
+    }
+}
diff --git a/src/mobile/qml/ListWorksView.qml b/src/mobile/qml/ListWorksView.qml
new file mode 100644
index 0000000..6e6dd13
--- /dev/null
+++ b/src/mobile/qml/ListWorksView.qml
@@ -0,0 +1,123 @@
+import QtQuick 2.1
+import BibleTime 1.0
+
+Rectangle {
+    id: top
+    property alias model: listView.model
+    property alias title: title.text
+
+    border.color: "black"
+    border.width: 2
+
+    signal itemSelected(int index)
+
+    Rectangle {
+        id: titleRect
+
+        border.color: "black"
+        border.width: 1
+        height:25
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.leftMargin: 3
+        anchors.rightMargin: 3
+        anchors.topMargin: 3
+
+        Text {
+            id: title
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.centerIn: parent
+            horizontalAlignment: Text.AlignCenter
+            verticalAlignment: Text.AlignBottom
+            style: Text.Sunken
+            font.pointSize: btStyle.uiFontPointSize
+        }
+    }
+
+    ListView {
+        id: listView
+        clip: true
+        anchors.top: titleRect.bottom
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.margins: 3
+
+        function itemSelected(index) {
+            top.itemSelected(index);
+        }
+
+        Rectangle {
+            id: scrollbar
+            anchors.right: listView.right
+            y: listView.visibleArea.yPosition * listView.height
+            width: 5
+            height: listView.visibleArea.heightRatio * listView.height
+            color: "black"
+            visible: listView.visibleArea.heightRatio < 0.99
+        }
+
+        delegate {
+            Rectangle {
+                id: entry
+
+                color: "white"
+                border.width: 1
+                border.color: ListView.isCurrentItem ? "#c0c0c0" : "#a0a0a0"
+                width: parent.width
+                height: 60
+
+                Image {
+                    id: installedCheckmark
+
+                    source: "checkmark.svg"
+                    height: entry.height - 15
+                    width:  25
+                    anchors.left: parent.left
+                    anchors.top: parent.top
+                    anchors.leftMargin: 5
+                    anchors.topMargin: 5
+                    visible: installed == 1
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {listView.itemSelected(index)}
+                }
+
+                Text {
+                    anchors.top: entry.top
+                    anchors.left: installedCheckmark.right
+                    anchors.right: entry.right
+                    width: parent.width
+                    height: parent.height/2 -4
+                    anchors.leftMargin: 10
+                    anchors.rightMargin: 10
+                    anchors.topMargin: 5
+                    text: title
+                    font.pointSize: btStyle.textFontPointSize
+                }
+
+                Text {
+                    anchors.bottom: entry.bottom
+                    anchors.left: installedCheckmark.right
+                    anchors.right: entry.right
+                    width: parent.width
+                    height: parent.height/2 -4
+                    anchors.leftMargin: 35
+                    anchors.rightMargin: 10
+                    anchors.topMargin: 25
+                    text: desc
+                    elide: Text.ElideMiddle
+                    font.pointSize: btStyle.textFontPointSize
+                }
+            }
+        }
+
+        BtStyle {
+            id: btStyle
+        }
+    }
+}
+
diff --git a/src/mobile/qml/MainToolbar.qml b/src/mobile/qml/MainToolbar.qml
new file mode 100644
index 0000000..66513b2
--- /dev/null
+++ b/src/mobile/qml/MainToolbar.qml
@@ -0,0 +1,27 @@
+import QtQuick 2.1
+import BibleTime 1.0
+
+Rectangle {
+    id: toolbar
+
+    signal buttonClicked
+
+    BtStyle {
+        id: btStyle
+    }
+
+    color: btStyle.toolbarColor
+    z:0
+
+    MenuButton {
+        id: menuButton
+
+        width: parent.height
+        height: parent.height
+        anchors.right: parent.right
+        anchors.top: parent.top
+        onButtonClicked: {
+            toolbar.buttonClicked()
+        }
+    }
+}
diff --git a/src/mobile/qml/MenuButton.qml b/src/mobile/qml/MenuButton.qml
new file mode 100644
index 0000000..b3ba458
--- /dev/null
+++ b/src/mobile/qml/MenuButton.qml
@@ -0,0 +1,30 @@
+import QtQuick 2.1
+import BibleTime 1.0
+
+Rectangle {
+    id: menuButton
+
+    signal buttonClicked
+
+    color: "black"
+
+    BtStyle {
+        id: btStyle
+    }
+
+    Column {
+        spacing:3
+
+        Rectangle { color: "white"; width:2; height:2 }
+        Rectangle { color: "white"; width:2; height:2 }
+        Rectangle { color: "white"; width:2; height:2 }
+
+        anchors.centerIn: parent
+    }
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            menuButton.buttonClicked()
+        }
+    }
+}
diff --git a/src/mobile/qml/MenuView.qml b/src/mobile/qml/MenuView.qml
new file mode 100644
index 0000000..01b5142
--- /dev/null
+++ b/src/mobile/qml/MenuView.qml
@@ -0,0 +1,28 @@
+import QtQuick 2.1
+
+Column {
+    id: menus
+
+    width:120
+    height:20 * listModel.count
+    anchors.top: mainToolbar.bottom
+    anchors.right: mainToolbar.right
+    z: 100
+    visible: false
+
+    Repeater {
+        model: listModel
+        delegate: Rectangle {
+            width:parent.width
+            height:24
+            color: btStyle.menu
+            border.color: btStyle.menuBorder
+            border.width: 1
+            Text {
+                anchors.centerIn: parent
+                text: title
+                color: btStyle.menuText
+            }
+        }
+    }
+}
diff --git a/src/mobile/qml/Menus.qml b/src/mobile/qml/Menus.qml
new file mode 100644
index 0000000..1a9e53b
--- /dev/null
+++ b/src/mobile/qml/Menus.qml
@@ -0,0 +1,61 @@
+import QtQuick 2.1
+import BibleTime 1.0
+
+Rectangle {
+    id: menu
+
+    property alias model: menusRepeater.model
+    property int fontPointSize: 15
+    property int menuHeight: 70
+    property int topMenuMargin: 150
+    property int leftMenuMargin: 50
+
+    signal menuSelected(string action)
+
+    visible: false
+    anchors.fill: parent
+    color: "#f0f0f0"
+
+    BtStyle {
+        id: btStyle
+    }
+
+    Component {
+        id: eachMenu
+
+        Rectangle {
+            width: menu.width
+            height: menuHeight
+            color: "white"
+            border.color: "#f0f0f0"
+            border.width: 2
+
+            Text {
+                text: title
+                font.pointSize: btStyle.uiFontPointSize
+                color: "black"
+                anchors.fill: parent
+                anchors.leftMargin: leftMenuMargin
+                verticalAlignment: Text.AlignVCenter
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        menu.menuSelected(action);
+                    }
+                }
+            }
+        }
+    }
+
+    ListView {
+        id: menusRepeater
+
+        delegate: eachMenu
+        width: parent.width
+        anchors.fill: parent
+        anchors.topMargin: topMenuMargin
+
+    }
+}
+
diff --git a/src/mobile/qml/ModuleChooser.qml b/src/mobile/qml/ModuleChooser.qml
new file mode 100644
index 0000000..49d19d1
--- /dev/null
+++ b/src/mobile/qml/ModuleChooser.qml
@@ -0,0 +1,109 @@
+import QtQuick 2.1
+import BibleTime 1.0
+
+Rectangle {
+    id: moduleChooser
+
+    property alias categoryModel: categoryView.model
+    property alias languageModel: languageView.model
+    property alias worksModel: worksView.model
+    property alias categoryIndex: categoryView.currentIndex
+    property alias languageIndex: languageView.currentIndex
+    property alias moduleIndex: worksView.currentIndex
+    property int lastCategoryIndex: 0
+    property int lastLanguageIndex: 0
+    property int spacing: 5
+    property string selectedModule: ""
+    property string selectedCategory: ""
+
+    objectName: "moduleChooser"
+    color: "lightgray"
+    border.color: "black"
+    border.width: 2
+
+    onVisibleChanged: {
+        if (visible == true) {
+            moduleInterface.updateCategoryAndLanguageModels();
+            categoryIndex = lastCategoryIndex;
+            languageIndex = lastLanguageIndex;
+        }
+    }
+
+    onCategoryIndexChanged: {
+        if (visible == true) {
+            moduleInterface.updateWorksModel();
+        }
+    }
+
+    onLanguageIndexChanged: {
+        if (visible == true) {
+            moduleInterface.updateWorksModel();
+        }
+    }
+
+    signal categoryChanged(int index);
+    signal languageChanged(int index);
+    signal moduleSelected();
+
+    ModuleInterface {
+        id: moduleInterface
+    }
+
+    Grid {
+        id:  grid
+        columns: 2
+        rows: 1
+        spacing: parent.spacing
+        width: parent.width - moduleChooser.spacing
+        height: parent.height/2.5
+        anchors.left: parent.left
+        anchors.top: parent.top
+        anchors.margins: parent.spacing
+
+        ListTextView {
+            id: categoryView
+
+            title: "Category"
+            width: grid.width/2 - grid.spacing
+            height: grid.height
+            onItemSelected: {
+                categoryChanged(currentIndex)
+            }
+        }
+
+        ListTextView {
+            id: languageView
+
+            title: "Language"
+            width: grid.width/2 - grid.spacing
+            height: grid.height
+            onItemSelected: {
+                languageChanged(currentIndex);
+            }
+        }
+    }
+
+    ListTextView {
+        id: worksView
+
+        title: "Work"
+        width: parent.width - 2 * parent.spacing
+        anchors.top: grid.bottom
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+        anchors.margins: moduleChooser.spacing
+        highlight: false
+        onItemSelected: {
+            selectedModule = moduleInterface.module(index);
+            selectedCategory = moduleInterface.category(index);
+            moduleSelected();
+            moduleChooser.visible = false;
+        }
+    }
+
+//    MouseArea {
+//        anchors.fill: parent
+//        onClicked: moduleChooser.cancel();
+//    }
+}
+
diff --git a/src/mobile/qml/Progress.qml b/src/mobile/qml/Progress.qml
new file mode 100644
index 0000000..e5f75b3
--- /dev/null
+++ b/src/mobile/qml/Progress.qml
@@ -0,0 +1,63 @@
+import QtQuick 2.1
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
+import BibleTime 1.0
+
+Rectangle {
+    id: installProgress
+
+    property alias minimumValue: progressBar.minimumValue
+    property alias value: progressBar.value
+    property alias maximumValue: progressBar.maximumValue
+    property alias text: label.text
+
+    color: btStyle.buttonBackground
+    border.color: "black"
+    border.width: 5
+
+    signal cancel()
+
+    BtStyle {
+        id: btStyle
+    }
+
+    Text {
+        id: label
+
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.bottom: progressBar.top
+        anchors.bottomMargin: 20
+    }
+
+    ProgressBar {
+        id: progressBar
+
+        anchors.centerIn: parent
+        width: parent.width - 100
+        height: 16
+    }
+
+    Rectangle {
+        color: "white"
+        border.color: "black"
+        border.width: 1
+        width: 100
+        height:30
+        anchors.top: progressBar.bottom
+        anchors.topMargin: 20
+        anchors.horizontalCenter: parent.horizontalCenter
+
+        Text {
+            anchors.centerIn: parent
+            text: "Cancel"
+
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                cancel();
+            }
+        }
+    }
+}
diff --git a/src/mobile/qml/Settings.qml b/src/mobile/qml/Settings.qml
new file mode 100644
index 0000000..391ce4c
--- /dev/null
+++ b/src/mobile/qml/Settings.qml
@@ -0,0 +1,93 @@
+import QtQuick 2.1
+import BibleTime 1.0
+
+Rectangle {
+    id: settings
+
+    property int finalHeight: 300
+
+    color: "white"
+    anchors.bottom: parent.bottom
+    anchors.left: parent.left
+    anchors.right: parent.right
+    height: parent.height
+
+    onVisibleChanged: PropertyAnimation {
+        target: settings
+        property: "opacity"
+        from: 0
+        to: 1
+        duration: 200
+        easing.type: Easing.InOutCubic
+    }
+
+    BtStyle {
+        id: btStyle
+    }
+
+    ListModel {
+        id: settingsModel
+
+        ListElement { title: "Ui Font Size";   action: "uiSize" }
+        ListElement { title: "Window Arrangement";   action: "arrangement" }
+    }
+
+    ListView {
+        id: settingsList
+
+        anchors.fill: parent
+        anchors.topMargin: 100
+        model: settingsModel
+
+        delegate: Rectangle {
+            color: "white"
+            border.color: "lightgray"
+            border.width: 1
+            width: parent.width
+            height: children[0].height * 2.5
+
+            Text {
+                id: menuText
+                x: 40
+                anchors.verticalCenter: parent.verticalCenter
+                text: title
+                color: "black"
+                font.pointSize: btStyle.uiFontPointSize
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    if (action == "arrangement") {
+                        windowArrangementMenus.visible = true;
+                        settings.visible = false;
+                    }
+                    else if (action == "uiSize") {
+                        uiFontPointSize.visible = true;
+                        settings.visible = false;
+                        console.log("y")
+                    }
+                }
+            }
+        }
+    }
+
+    ImageButton {
+        id: backButton
+
+        icon: "leftarrow.svg"
+        height: 36
+        width:  56
+        anchors.bottom: parent.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.bottomMargin: 8
+        visible: true
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                settings.visible = false;
+            }
+        }
+    }
+}
diff --git a/src/mobile/qml/TreeChooser.qml b/src/mobile/qml/TreeChooser.qml
new file mode 100644
index 0000000..5dc1eeb
--- /dev/null
+++ b/src/mobile/qml/TreeChooser.qml
@@ -0,0 +1,167 @@
+import QtQuick 2.1
+
+Rectangle {
+    id: treeChooser
+
+    property ListModel model: ListModel {
+    }
+    property string path: ""
+    property int pathCount: 0
+
+    color: "white"
+    border.width: 2
+    border.color: "black"
+
+    signal back()
+    signal next(string childText)
+    signal select(string childText)
+
+    Rectangle {
+        id: pathArea
+
+        border.color: "black"
+        border.width: 0
+        color: "white"
+
+        height: {20 * pathCount }
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.top: parent.top
+        anchors.margins: 4
+        visible: path.length > 0
+
+        function splitPath(path) {
+            var pathList = path.split("/");
+            var newPath = "";
+            var space = "";
+            var count = pathList.length;
+            treeChooser.pathCount = count;
+            // pathList[0] is empty
+            for (var i=1; i< count; ++i) {
+                var pathI = pathList[i];
+                newPath += space + pathI + "\n";
+                space += "    ";
+            }
+            return newPath;
+        }
+
+        ImageButton {
+            id: backButton
+
+            icon: "leftarrow.svg"
+            height: 36
+            width:  56
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.right : parent.right
+            anchors.topMargin: 2
+            visible: true
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    treeChooser.back();
+                }
+            }
+        }
+
+        Text {
+            id: pathText
+
+            text: pathArea.splitPath(treeChooser.path)
+            font.pointSize: 12
+            height: parent.height
+//            width: parent.width - backButton.width -50
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: backButton.left
+            anchors.leftMargin: 10
+            elide: Text.ElideRight
+        }
+    }
+
+    ListView {
+        id: listView
+
+        function next(index, name) {
+            treeChooser.next(name);
+        }
+
+        function select(index, name) {
+            treeChooser.select(name);
+        }
+
+        anchors.top: pathArea.bottom
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.topMargin: 30
+        anchors.leftMargin: 4
+        anchors.rightMargin: 4
+        anchors.bottomMargin: 4
+        boundsBehavior: Flickable.StopAtBounds
+        width: pathArea.width
+        model: treeChooser.model
+        delegate:
+            Rectangle {
+            id: entry
+
+            property string action: ""
+
+
+            border.color: "#eeeeee"
+            border.width: 1
+            width: parent.width
+            height: 40
+
+            Text {
+                id: entryText
+
+                font.pointSize: 12
+//                anchors.fill: entry
+                anchors.top: entry.top
+                anchors.left: entry.left
+                anchors.right: entry.right
+                width: 340
+                anchors.leftMargin: 10
+                anchors.rightMargin: 10
+                anchors.topMargin: 10
+                text: name
+                elide: Text.ElideRight
+            }
+
+            ImageButton {
+                id: imageButton
+                icon: "rightarrow.svg"
+
+                height: parent.height-4
+                width:  56
+                anchors.right: parent.right
+                anchors.top: parent.top
+                anchors.topMargin: 2
+                visible: childcount > 0
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        listView.currentIndex = index
+                        listView.next(index, name)
+                    }
+                }
+            }
+
+            MouseArea {
+                anchors.left: parent.left
+                anchors.right: imageButton.left
+                anchors.top: parent.top
+                anchors.bottom: parent.bottom
+                onClicked: {
+                    listView.currentIndex = index
+                    listView.select(index, name)
+                }
+            }
+        }
+
+        snapMode: ListView.SnapToItem
+        focus: true
+    }
+}
diff --git a/src/mobile/qml/Window.qml b/src/mobile/qml/Window.qml
new file mode 100644
index 0000000..a14131f
--- /dev/null
+++ b/src/mobile/qml/Window.qml
@@ -0,0 +1,178 @@
+import QtQuick 2.1
+import BibleTime 1.0
+
+Rectangle {
+    id: windowView
+
+    property string title: toolbar.title
+
+    function setModule(module) {
+        btWindowInterface.moduleName = module;
+    }
+
+    function contextMenus() {
+//        contextMenu.visible = true;
+    }
+
+    color: "black"
+
+    BtWindowInterface {
+        id: btWindowInterface
+    }
+
+    BtStyle {
+        id:btStyle
+    }
+
+    Rectangle {
+        id: toolbar
+
+        property string title: btWindowInterface.moduleName + " (" + btWindowInterface.reference + ")"
+
+        width: parent.width
+        height: 36
+        color: btStyle.toolbarColor
+        border.width: 1
+        border.color: "black"
+
+        Rectangle {
+            id: moduleDisplay
+
+            width: text.width +10
+            radius:btStyle.buttonRadius
+            anchors.left: parent.left
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            anchors.topMargin: 4
+            anchors.leftMargin: 5
+            anchors.bottomMargin: 4
+            color: btStyle.toolbarButton
+            border.color: btStyle.buttonBorder
+            border.width: 1
+
+            Text {
+                id: text
+
+                anchors.centerIn: parent
+                anchors.leftMargin: 4
+                anchors.rightMargin: 4
+                font.pointSize: btStyle.uiFontPointSize
+                elide: Text.ElideMiddle
+                color: btStyle.toolbarButtonText
+                text: btWindowInterface.moduleName
+            }
+
+            MouseArea {
+                id: moduleMouseArea
+
+                anchors.fill: parent
+                onClicked: {
+                    btWindowInterface.changeModule();
+                }
+            }
+        }
+
+
+        Rectangle {
+            id: referenceDisplay
+
+            width: {
+                var w1 = 300
+                var w2 = toolbar.width - moduleDisplay.width;
+                var w = Math.min(w1,w2);
+                return w - 15;
+            }
+            radius: btStyle.buttonRadius
+            anchors.left: moduleDisplay.right
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            anchors.topMargin: 4
+            anchors.bottomMargin: 4
+            anchors.leftMargin: 5
+            color: btStyle.toolbarButton
+            border.color: btStyle.buttonBorder
+            border.width: 1
+
+            Text {
+                id: referenceText
+                anchors.centerIn: parent
+                anchors.leftMargin: 6
+                anchors.rightMargin: 4
+                width: referenceDisplay.width - 4
+                font.pointSize: btStyle.uiFontPointSize
+                elide: Text.ElideMiddle
+                color: btStyle.toolbarButtonText
+                text: btWindowInterface.reference
+            }
+
+            MouseArea {
+                id: mouseArea
+
+                anchors.fill: parent
+                onClicked: {
+                    btWindowInterface.changeReference();
+                }
+            }
+        }
+
+    }
+
+    Rectangle {
+        id: mainTextView
+
+        color: "white"
+        anchors.top: toolbar.bottom
+        anchors.left: windowView.left
+        anchors.right: windowView.right
+        anchors.bottom: windowView.bottom
+
+        ListView {
+            id: listView
+
+            clip: true
+            anchors.fill: parent
+            anchors.leftMargin: 8
+            anchors.rightMargin: 8
+            model: btWindowInterface.textModel
+            currentIndex: btWindowInterface.currentModelIndex
+            delegate: Text {
+                text: "<font color=\"blue\">" + ref + "</font> " + line
+                width: parent.width
+                color: "black"
+                font.pointSize: btStyle.textFontPointSize
+                wrapMode: Text.WordWrap
+            }
+
+            MouseArea {
+
+                anchors.fill: parent
+                onDoubleClicked: {
+                    windowView.contextMenus();
+                }
+
+                onPressAndHold: {
+                    windowView.contextMenus();
+
+                }
+            }
+        }
+    }
+
+    ListModel {
+        id: contextMenuModel
+
+        ListElement { title: "Text Font Size"; action: "textSize" }
+    }
+
+    ContextMenu {
+        id: contextMenu
+
+        function doAction(action) {
+        }
+
+        model: contextMenuModel
+        visible: false
+        Component.onCompleted: contextMenu.accepted.connect(contextMenu.doAction)
+    }
+
+}
diff --git a/src/mobile/qml/WindowManager.qml b/src/mobile/qml/WindowManager.qml
new file mode 100644
index 0000000..3a66219
--- /dev/null
+++ b/src/mobile/qml/WindowManager.qml
@@ -0,0 +1,291 @@
+import QtQuick 2.1
+import BibleTime 1.0
+
+
+Rectangle {
+    id: windowArea
+
+    property var windows: []
+    property int single: 0
+    property int tabLayout: 1
+    property int autoTile: 2
+    property int autoTileHor: 3
+    property int autoTileVer: 4
+    property int windowLayout: single
+
+    function setCurrentTabbedWindow(index) {
+        tabbedWindows.current = index;
+    }
+
+    function setWindowArrangement(arrangement) {
+        if (arrangement < single || arrangement > autoTileVer)
+            return;
+        windowLayout = arrangement;
+        layoutWindows();
+    }
+
+    function createWindowMenus() {
+        windowsModel.clear();
+        for (var i=0; i<windows.length; ++i) {
+            var window = windows[i];
+            windowsModel.append (
+                        { title: window.title, action: i.toString() }
+                        )
+        }
+        windowTitlesMenus.model = windowsModel
+        windowTitlesMenus.visible = true;
+    }
+
+
+    function newWindow() {
+        moduleChooser.moduleSelected.connect(openWindowSlot);
+        moduleChooser.visible = true;
+    }
+
+    function openWindowSlot() {
+        moduleChooser.moduleSelected.disconnect(openWindowSlot);
+        openWindow(moduleChooser.selectedCategory, moduleChooser.selectedModule)
+    }
+
+    function openWindow(category, module) {
+        if (category == "Bibles")
+            component = Qt.createComponent("Window.qml");
+        else if (category == "Commentaries")
+            component = Qt.createComponent("Window.qml");
+        else if (category == "Books")
+            component = Qt.createComponent("Window.qml");
+        else {
+            console.log(category, " are not yet supported.");
+            return;
+        }
+
+        window = component.createObject(null, {"width": 250, "height": 200});
+        window.setModule(module);
+
+        if (window == null) {
+            // Error Handling
+            console.log("Error creating object");
+        }
+        else {
+            windows.push(window)
+            layoutWindows();
+            var curWindow = windows.length -1;
+            selectWindow(curWindow);
+        }
+    }
+
+    function layoutTiles(rows, columns)
+    {
+        gridWindows.columns = columns;
+        gridWindows.rows = rows;
+        var width = gridWindows.width/columns -2;
+        var height = gridWindows.height/rows -2;
+
+        for (var i=0; i<windows.length; ++i) {
+            var window = windows[i];
+            window.anchors.fill = undefined
+            window.height = height;
+            window.width = width;
+            window.parent = gridWindows;
+        }
+    }
+
+    function arrangeSingleWindow() {
+        tabbedWindows.z = 1;
+        tabbedWindows.tabVisible = false;
+        for (var i=0; i<windows.length; ++i) {
+            var window = windows[i];
+            window.parent = tabbedWindowsStack;
+            window.anchors.fill = tabbedWindowsStack
+        }
+    }
+
+    function arrangeTabbedWindows() {
+        tabbedWindows.z = 1;
+        tabbedWindows.tabVisible = true;
+        for (var i=0; i<windows.length; ++i) {
+            var window = windows[i];
+            window.parent = tabbedWindowsStack;
+            window.anchors.fill = tabbedWindowsStack
+        }
+    }
+
+    function arrangeTiledWindows() {
+        gridWindows.z = 1;
+        var columns = 1;
+        var rows = 1;
+        var count = windows.length;
+
+        if (windowLayout == autoTile) {
+            if (count > 1) {
+                columns = 2
+                rows = Math.floor((count+1)/2);
+            }
+        }
+        else if (windowLayout == autoTileHor)
+        {
+            rows = count;
+        }
+        else if (windowLayout == autoTileVer)
+        {
+            columns = count;
+        }
+        layoutTiles(rows, columns);
+    }
+
+    function layoutWindows() {
+        tabbedWindows.z = -2;
+        gridWindows.z = -3;
+
+        if (windowLayout == single) {
+            arrangeSingleWindow();
+        }
+        else if (windowLayout == tabLayout) {
+            arrangeTabbedWindows();
+        }
+        else {
+            arrangeTiledWindows();
+        }
+    }
+
+    function selectWindow(n) {
+        if (windowLayout == tabLayout || windowLayout == single) {
+            tabbedWindows.current = n;
+        }
+    }
+
+//    anchors.top: spacer.bottom
+//    anchors.left: parent.left
+//    anchors.right: parent.right
+//    anchors.bottom: parent.bottom
+//    color: "#646464"
+
+    Grid {
+        id: gridWindows
+
+        objectName: "gridWindows"
+        anchors.fill: parent
+        columns: 2
+        spacing: 2
+        z: 2
+    }
+
+    Item {
+        id: tabbedWindows
+
+        default property alias content: tabbedWindowsStack.children
+        property bool tabVisible: true
+        property int current: 0
+
+        function changeTabs() {
+            setOpacities();
+        }
+
+        function setOpacities() {
+            for (var i = 0; i < tabbedWindowsStack.children.length; ++i) {
+                tabbedWindowsStack.children[i].z = (i == current ? 1 : 0)
+            }
+        }
+
+        objectName: "tabbedWindows"
+        anchors.fill: parent
+        onCurrentChanged: changeTabs()
+        Component.onCompleted: changeTabs()
+
+        Row {
+            id: header
+
+            objectName: "header"
+
+            Repeater {
+                id: tabRepeater
+
+                function setColors() {
+                    if (tabbedWindows.current == tabbedWindowsStack.index) {
+                        tabImage.color = btStyle.windowTabSelected
+                        tabText.color = btStyle.windowTabTextSelected
+                    }
+                    else {
+                        tabImage.color = btStyle.windowTab
+                        tabText.color = btStyle.windowTabText
+                    }
+                }
+
+                model: tabbedWindowsStack.children.length
+                delegate: Rectangle {
+                    id: tab
+
+                    function calculateTabWidth() {
+                        var tabWidth = (tabbedWindows.width) / tabbedWindowsStack.children.length;
+                        return tabWidth;
+                    }
+
+                    visible: tabbedWindows.tabVisible
+                    //width: (tabbedWindows.width) / tabbedWindowsStack.children.length;
+                    width: {
+                        calculateTabWidth()
+                    }
+                    height: 36
+
+                    Rectangle {
+                        id: tabBorder
+                        width: parent.width; height: 1
+                        anchors { bottom: parent.bottom; bottomMargin: 1 }
+                        color: "#acb2c2"
+                    }
+
+                    Rectangle {
+                        id: tabImage
+
+                        anchors { fill: parent; leftMargin: 8; topMargin: 4; rightMargin: 8 }
+                        color: {
+                            if (tabbedWindows.current == index)
+                                return btStyle.windowTabSelected
+                            else
+                                return btStyle.windowTab
+                        }
+                        border.color: btStyle.windowTab
+                        border.width: 2
+
+                        Text {
+                            id: tabText
+
+                            horizontalAlignment: Qt.AlignHCenter;
+                            verticalAlignment: Qt.AlignVCenter
+                            anchors.fill: parent
+                            anchors.topMargin: 6
+                            font.pointSize: btStyle.uiFontPointSize -3
+                            text: tabbedWindowsStack.children[index].title
+                            elide: Text.ElideLeft
+                            color: {
+                                if (tabbedWindows.current == index)
+                                    return btStyle.windowTabTextSelected
+                                else
+                                    return btStyle.windowTabText
+                            }
+                        }
+                    }
+
+                    MouseArea {
+                        id: tabMouseArea
+
+                        anchors.fill: parent
+                        onClicked: {
+                            tabbedWindows.current = index
+                        }
+                    }
+                }
+            }
+        }
+
+        Item {
+            id: tabbedWindowsStack
+
+            objectName: "tabbedWindowsStack"
+            width: parent.width
+            anchors.top: header.bottom;
+            anchors.bottom: tabbedWindows.bottom
+        }
+    }
+
+}
diff --git a/src/mobile/qml/checkmark.svg b/src/mobile/qml/checkmark.svg
new file mode 100644
index 0000000..07a3ad8
--- /dev/null
+++ b/src/mobile/qml/checkmark.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="450" height="400" viewBox="85 145 450 400"
+   sodipodi:version="0.32"
+   inkscape:version="0.45"
+   sodipodi:docname="checkmark.svg">
+  <metadata>
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="fill:#5fd35f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 508.74477,226.99015 C 459.42189,193.17234 436.08559,163.59563 436.08559,163.59563 C 344.99984,217.26626 248.26757,407.83719 248.26757,407.83719 C 202.93454,344.01939 157.35384,326.21932 157.35384,326.21932 C 136.86236,353.60112 101.54091,390.09316 101.54091,390.09316 C 183.924,412.28062 253.07323,493.70015 253.07323,493.70015 C 402.5571,259.01322 508.74477,226.99015 508.74477,226.99015 z "
+     sodipodi:nodetypes="ccccccc" />
+  <path
+     sodipodi:type="arc"
+     style="opacity:0.2;fill:#999999;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
+     sodipodi:cx="238.57143"
+     sodipodi:cy="529.50507"
+     sodipodi:rx="64.285713"
+     sodipodi:ry="7.1428571"
+     d="M 302.03011,528.36301 A 64.285713,7.1428571 0 1 1 301.97855,528.32818"
+     sodipodi:start="6.1226078"
+     sodipodi:end="12.400852"
+     sodipodi:open="true"
+     transform="translate(8.5714285,-11.428571)" />
+  <path
+     style="opacity:0.27777782;fill:#5fd35f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 518.74479,227.27587 C 469.42191,193.45806 446.08561,163.88135 446.08561,163.88135 C 354.99986,217.55198 258.26759,408.12291 258.26759,408.12291 C 212.93456,344.30511 167.35386,326.50504 167.35386,326.50504 C 146.86238,353.88684 111.54093,390.37888 111.54093,390.37888 C 193.92402,412.56634 263.07325,493.98587 263.07325,493.98587 C 412.55712,259.29894 518.74479,227.27587 518.74479,227.27587 z "
+     sodipodi:nodetypes="ccccccc" />
+</svg>
diff --git a/src/mobile/qml/leftarrow.svg b/src/mobile/qml/leftarrow.svg
new file mode 100644
index 0000000..6143c87
--- /dev/null
+++ b/src/mobile/qml/leftarrow.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="900"
+   height="900"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="rightarrow.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.74333333"
+     inkscape:cx="450"
+     inkscape:cy="450"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="in"
+     inkscape:window-width="1600"
+     inkscape:window-height="868"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-152.3622)">
+    <path
+       sodipodi:type="star"
+       style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path2995"
+       sodipodi:sides="3"
+       sodipodi:cx="460"
+       sodipodi:cy="420"
+       sodipodi:r1="380.52594"
+       sodipodi:r2="190.26299"
+       sodipodi:arg1="0"
+       sodipodi:arg2="1.0471976"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 840.52594,420 -570.78891,329.54513 0,-659.090261 z"
+       transform="matrix(-1,0,0,-1,1014.9543,1026.7074)"
+       inkscape:transform-center-y="-2.9985352e-05"
+       inkscape:transform-center-x="95.131485" />
+  </g>
+</svg>
diff --git a/src/mobile/qml/main.qml b/src/mobile/qml/main.qml
new file mode 100644
index 0000000..d7597b1
--- /dev/null
+++ b/src/mobile/qml/main.qml
@@ -0,0 +1,270 @@
+import QtQuick 2.1
+import BibleTime 1.0
+
+Rectangle {
+    id: root
+
+    property int opacitypopup: 0
+    property QtObject component: null;
+    property Item window: null;
+
+    ListModel {
+        id: windowsModel
+
+        ListElement { title: ""; action: "" }
+    }
+
+    function installModules() {
+        installManager.openChooser();
+    }
+
+//    width: 1280 // Nexus 7 (2012)
+//    height: 800
+
+    width:  480   // Phone
+    height: 800
+
+    rotation: 0
+
+    MainToolbar {
+        id: mainToolbar
+
+        anchors.left: parent.left
+        anchors.top: parent.top
+        anchors.right: parent.right
+        height: 30
+        onButtonClicked: {
+            mainMenus.visible = ! mainMenus.visible;
+        }
+    }
+
+    Rectangle {
+        id: spacer
+
+        anchors.top: mainToolbar.bottom
+        height:2
+        width: parent.width
+        color: "#646464"
+    }
+
+    WindowManager {
+        id: windowManager
+
+        anchors.top: spacer.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+        color: "#646464"
+
+    }
+
+    Settings {
+        id: settings
+
+        visible: false;
+    }
+
+    GridChooser {
+        id: gridChooser
+
+        objectName: "gridChooser"
+        width: parent.width
+        height: parent.height
+        visible: false
+    }
+
+    BtStyle {
+        id: btStyle
+    }
+
+    ModuleChooser {
+        id: moduleChooser
+
+        objectName: "moduleChooser"
+        visible: false
+        width: Math.min(parent.height, parent.width);
+        height: parent.height
+        anchors.centerIn: parent
+    }
+
+    TreeChooser {
+        id: treeChooser
+
+        objectName: "treeChooser"
+        width:480
+        height: parent.height
+        anchors.top: parent.top
+        anchors.horizontalCenter: parent.horizontalCenter
+        path: ""
+        visible: false
+        z: 100
+    }
+
+    InstallManager {
+        id: installManager
+    }
+
+    InstallManagerChooser {
+        id: installManagerChooser
+
+        objectName: "installManagerChooser"
+        width: Math.min(parent.height, parent.width);
+        height: parent.height
+        anchors.centerIn: parent
+        anchors.top: parent.top
+        visible: false
+    }
+
+    Progress {
+        id: progress
+
+        objectName: "progress"
+        value: 0.25
+        minimumValue: 0
+        maximumValue: 1
+        width:550
+        height: 200
+        anchors.centerIn: parent
+        anchors.top: parent.top
+        visible: false
+    }
+
+    ListModel {
+        id: mainMenusModel
+
+        ListElement { title: QT_TR_NOOP("New Window");              action: "newWindow" }
+        ListElement { title: QT_TR_NOOP("View Window");             action: "windows" }
+        ListElement { title: QT_TR_NOOP("Text Font Size");          action: "textFontSize"}
+        ListElement { title: QT_TR_NOOP("User Interface Font Size");action: "uiFontSize"}
+
+        //ListElement { title: QT_TR_NOOP("Settings");                action: "settings" }
+        ListElement { title: QT_TR_NOOP("Bookshelf Manager");       action: "install" }
+        //            ListElement { title: QT_TR_NOOP("Gnome Style");             action: "gnomeStyle" }
+        //            ListElement { title: QT_TR_NOOP("Android Style");           action: "androidStyle" }
+    }
+
+    Menus {
+        id: mainMenus
+
+        Component.onCompleted: menuSelected.connect(mainMenus.doAction)
+
+        function doAction(action) {
+            mainMenus.visible = false;
+            if (action == "newWindow") {
+                windowManager.newWindow();
+            }
+            else if (action == "windows") {
+                windowManager.createWindowMenus();
+            }
+            else if (action == "gnomeStyle") {
+                btStyle.setStyle(1)
+            }
+            else if (action == "androidStyle") {
+                btStyle.setStyle(2)
+            }
+            else if (action == "install") {
+                installModules();
+            }
+            else if (action == "settings") {
+                settings.visible = true;
+            }
+            else if (action == "textFontSize") {
+                textFontPointSize.visible = true;
+            }
+            else if (action == "uiFontSize") {
+                uiFontPointSize.visible = true;
+            }
+
+        }
+
+        model: mainMenusModel
+        topMenuMargin: 100
+    }
+
+    ListModel {
+        id: windowArrangementModel
+
+        ListElement { title: QT_TR_NOOP("Single");                  action: "single" }
+        ListElement { title: QT_TR_NOOP("Tabbed");                  action: "tabbed" }
+        ListElement { title: QT_TR_NOOP("Auto-tile");               action: "autoTile" }
+        ListElement { title: QT_TR_NOOP("Auto-tile horizontally");  action: "autoTileHor" }
+        ListElement { title: QT_TR_NOOP("Auto-tile vertically");    action: "autoTileVer" }
+    }
+
+    Menus {
+        id: windowArrangementMenus
+
+        Component.onCompleted: menuSelected.connect(windowArrangementMenus.doAction)
+
+        function doAction(action) {
+            windowArrangementMenus.visible = false;
+            if (action == "single") {
+                windowManager.setWindowArrangement(windowManager.single);
+            }
+            else if (action == "tabbed") {
+                windowManager.setWindowArrangement(windowManager.tabLayout);
+            }
+            else if (action == "autoTile") {
+                windowManager.setWindowArrangement(windowManager.autoTile);
+            }
+            else if (action == "autoTileHor") {
+                windowManager.setWindowArrangement(windowManager.autoTileHor);
+            }
+            else if (action == "autoTileVer") {
+                windowManager.setWindowArrangement(windowManager.autoTileVer);
+            }
+        }
+
+        model: windowArrangementModel
+    }
+
+    Menus {
+        id: windowTitlesMenus
+
+        model: windowsModel
+        visible: false
+        Component.onCompleted: menuSelected.connect(windowTitlesMenus.doAction)
+
+        function doAction(action) {
+            windowTitlesMenus.visible = false;
+            var index = Number(action)
+            windowManager.setCurrentTabbedWindow(index);
+        }
+    }
+
+    FontSizeSlider {
+        id: uiFontPointSize
+        visible: false
+        title: "User Interface Font Size"
+
+        onVisibleChanged: {
+            if (visible)
+            {
+                uiFontPointSize.current = btStyle.uiFontPointSize;
+                uiFontPointSize.previous = btStyle.uiFontPointSize;
+            }
+        }
+
+        onAccepted: {
+            btStyle.uiFontPointSize = pointSize
+        }
+    }
+
+    FontSizeSlider {
+        id: textFontPointSize
+        visible: false
+        title: "Text Font Size"
+
+        onVisibleChanged: {
+            if (visible)
+            {
+                textFontPointSize.current = btStyle.textFontPointSize;
+                textFontPointSize.previous = btStyle.textFontPointSize;
+            }
+        }
+
+        onAccepted: {
+            btStyle.textFontPointSize = pointSize;
+        }
+    }
+}
diff --git a/src/mobile/qml/rightarrow.svg b/src/mobile/qml/rightarrow.svg
new file mode 100644
index 0000000..e9fd5d1
--- /dev/null
+++ b/src/mobile/qml/rightarrow.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="900"
+   height="900"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 1">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="21.09998"
+     inkscape:cy="433.47351"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="in"
+     inkscape:window-width="1600"
+     inkscape:window-height="868"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-152.3622)">
+    <path
+       sodipodi:type="star"
+       style="fill:#4d4d4d;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       id="path2995"
+       sodipodi:sides="3"
+       sodipodi:cx="460"
+       sodipodi:cy="420"
+       sodipodi:r1="380.52594"
+       sodipodi:r2="190.26299"
+       sodipodi:arg1="0"
+       sodipodi:arg2="1.0471976"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 840.52594,420 -570.78891,329.54513 0,-659.090261 z"
+       transform="translate(-101.01525,164.48403)"
+       inkscape:transform-center-x="-95.131488" />
+  </g>
+</svg>
diff --git a/src/mobile/qml/tab.png b/src/mobile/qml/tab.png
new file mode 100644
index 0000000..ad80216
--- /dev/null
+++ b/src/mobile/qml/tab.png
diff --git a/src/mobile/ui/btstyle.cpp b/src/mobile/ui/btstyle.cpp
new file mode 100644
index 0000000..ee22d15
--- /dev/null
+++ b/src/mobile/ui/btstyle.cpp
@@ -0,0 +1,334 @@
+
+#include "btstyle.h"
+#include <QList>
+#include <QPointer>
+#include "backend/config/btconfig.h"
+
+// BtStyle is a class that is registered at a QML item. It can be placed into
+// QML files and its properties are available to be used in QML. It contains
+// colors, sizes, etc. that affect the look of the UI. You can have multipe
+// instances of the item. Changing a property on one of them changes all of them
+/*
+   import BibleTime 1.0
+
+    BtStyle {
+       id: btStyle
+    }
+
+    Rectangle {
+        color: btStyle.button
+    }
+*/
+
+namespace btm {
+
+// Only one copy of properties so they are the same everywhere used.
+static QColor buttonColor             = QColor();
+static QColor buttonBackground        = QColor();
+static QColor buttonTextColor         = QColor();
+static QColor buttonHighlightedText   = QColor();
+static QColor buttonBorder            = QColor();
+static int buttonRadius               = 0;
+static QColor buttonGradient0;
+static QColor buttonGradient1;
+static QColor buttonGradient2;
+static QColor buttonGradient3;
+
+static QColor windowTab               = QColor();
+static QColor windowTabSelected       = QColor();
+static QColor windowTabText           = QColor();
+static QColor windowTabTextSelected   = QColor();
+
+static QColor menu                    = QColor();
+static QColor menuBorder              = QColor();
+static QColor menuText                = QColor();
+static int menuHeight                 = 0;
+
+static QColor toolbarColor            = QColor();
+static QColor toolbarButton           = QColor();
+static QColor toolbarButtonText       = QColor();
+static double toolbarTextPointSize    = 6;
+
+
+static QList<QPointer<BtStyle> > styles;
+
+static void emitChanged() {
+    for (int i=0; i<styles.count(); ++i) {
+        QPointer<BtStyle> style = styles.at(i);
+        if (style != 0)
+            style->changed();
+    }
+}
+
+void BtStyle::setStyle(int style) {
+    if (style == BtStyle::gnome) {
+        setButtonColor(QColor(0,0,0));
+        setButtonBackground(QColor(237, 237, 237));
+        setButtonTextColor(QColor(0,0,0));
+        setButtonHighlightedText(QColor(0,0,255));
+        setButtonBorder(QColor(80,80,0));
+        setButtonRadius(3);
+        setButtonGradient0(QColor(200,200,200));
+        setButtonGradient1(QColor(246,246,246));
+        setButtonGradient2(QColor(246,246,246));
+        setButtonGradient3(QColor(200,200,200));
+
+        setWindowTab(QColor(206,206,206));
+        setWindowTabSelected(QColor(255,255,255));
+        setWindowTabText(QColor(0,0,0));
+        setWindowTabTextSelected(QColor(0,0,0));
+
+        setMenu(QColor(255,255,255));
+        setMenuBorder(QColor(255,255,255));
+        setMenuText(QColor(0,0,0));
+        setMenuHeight(40);
+
+        setToolbarColor(QColor(237,237,237));
+        setToolbarButton(QColor(237,237,237));
+        setToolbarButtonText(QColor(0,0,0));
+        setToolbarTextPointSize(10);
+    }
+    else if (style == BtStyle::android) {
+        setButtonColor(QColor(0,0,0));
+        setButtonBackground(QColor(35,35,100));
+        setButtonTextColor(QColor(255,210,0));
+        setButtonHighlightedText(QColor(255,255,0));
+        setButtonBorder(QColor(80,80,0));
+        setButtonRadius(3);
+        setButtonGradient0(QColor(125,125,125));
+        setButtonGradient1(QColor(60,60,60));
+        setButtonGradient2(QColor(50,50,50));
+        setButtonGradient3(QColor(20,20,20));
+
+        setWindowTab(QColor(100,100,100));
+        setWindowTabSelected(QColor(255,255,255));
+        setWindowTabText(QColor(255,255,255));
+        setWindowTabTextSelected(QColor(0,0,0));
+
+        setMenu(QColor(255,255,255));
+        setMenuBorder(QColor(224,224,224));
+        setMenuText(QColor(0,0,0));
+        setMenuHeight(34);
+
+        setToolbarColor(QColor(120,120,120));
+        setToolbarButton(QColor(255,210,0));
+        setToolbarButtonText(QColor(0,0,0));
+        setToolbarTextPointSize(10);
+    }
+
+    emitChanged();
+}
+
+BtStyle::BtStyle(QObject* parent)
+    : QObject(parent) {
+    styles.append(this);
+}
+
+QColor BtStyle::getButtonColor() const {
+    return buttonColor;
+}
+void BtStyle::setButtonColor(const QColor& color) {
+    buttonColor = color;
+    emitChanged();
+}
+
+
+QColor BtStyle::getButtonBackground() const {
+    return buttonBackground;
+}
+void BtStyle::setButtonBackground(const QColor& color) {
+    buttonBackground = color;
+    emitChanged();
+}
+
+
+QColor BtStyle::getButtonTextColor() const {
+    return buttonTextColor;
+}
+void BtStyle::setButtonTextColor(const QColor& color) {
+    buttonTextColor = color;
+    emitChanged();
+}
+
+
+QColor BtStyle::getButtonHighlightedText() const {
+    return buttonHighlightedText;
+}
+void BtStyle::setButtonHighlightedText(const QColor& color) {
+    buttonHighlightedText = color;
+    emitChanged();
+}
+
+
+QColor BtStyle::getButtonBorder() const {
+    return buttonBorder;
+}
+void BtStyle::setButtonBorder(const QColor& color) {
+    buttonBorder = color;
+    emitChanged();
+}
+
+int BtStyle::getButtonRadius() const {
+    return buttonRadius;
+}
+void BtStyle::setButtonRadius(int radius) {
+    buttonRadius = radius;
+    emitChanged();
+}
+
+QColor BtStyle::getButtonGradient0() const {
+    return buttonGradient0;
+}
+void BtStyle::setButtonGradient0(const QColor& color) {
+    buttonGradient0 = color;
+    emitChanged();
+}
+
+QColor BtStyle::getButtonGradient1() const {
+    return buttonGradient1;
+}
+void BtStyle::setButtonGradient1(const QColor& color) {
+    buttonGradient1 = color;
+    emitChanged();
+}
+
+QColor BtStyle::getButtonGradient2() const {
+    return buttonGradient2;
+}
+void BtStyle::setButtonGradient2(const QColor& color) {
+    buttonGradient2 = color;
+    emitChanged();
+}
+
+QColor BtStyle::getButtonGradient3() const {
+    return buttonGradient3;
+}
+void BtStyle::setButtonGradient3(const QColor& color) {
+    buttonGradient3 = color;
+    emitChanged();
+}
+
+QColor BtStyle::getWindowTab() const {
+    return windowTab;
+}
+
+void BtStyle::setWindowTab(const QColor& color) {
+    windowTab = color;
+    emitChanged();
+}
+
+QColor BtStyle::getWindowTabSelected() const {
+    return windowTabSelected;
+}
+
+void BtStyle::setWindowTabSelected(const QColor& color) {
+    windowTabSelected = color;
+    emitChanged();
+}
+
+QColor BtStyle::getWindowTabText() const {
+    return windowTabText;
+}
+
+void BtStyle::setWindowTabText(const QColor& color) {
+    windowTabText = color;
+    emitChanged();
+}
+
+QColor BtStyle::getWindowTabTextSelected() const {
+    return windowTabTextSelected;
+}
+
+void BtStyle::setWindowTabTextSelected(const QColor& color) {
+    windowTabTextSelected = color;
+    emitChanged();
+}
+
+QColor BtStyle::getMenu() const {
+    return menu;
+}
+
+void BtStyle::setMenu(const QColor& color) {
+    menu = color;
+    emitChanged();
+}
+
+QColor BtStyle::getMenuBorder() const {
+    return menuBorder;
+}
+
+void BtStyle::setMenuBorder(const QColor& color) {
+    menuBorder = color;
+    emitChanged();
+}
+
+QColor BtStyle::getMenuText() const {
+    return menuText;
+}
+
+void BtStyle::setMenuText(const QColor& color) {
+    menuText = color;
+    emitChanged();
+}
+
+int BtStyle::getMenuHeight() const {
+    return menuHeight;
+}
+void BtStyle::setMenuHeight(int height) {
+    menuHeight = height;
+    emitChanged();
+}
+
+QColor BtStyle::getToolbarColor() const {
+    return toolbarColor;
+}
+void BtStyle::setToolbarColor(const QColor& color) {
+    toolbarColor = color;
+    emitChanged();
+}
+
+QColor BtStyle::getToolbarButton() const {
+    return toolbarButton;
+}
+void BtStyle::setToolbarButton(const QColor& color) {
+    toolbarButton = color;
+    emitChanged();
+}
+
+QColor BtStyle::getToolbarButtonText() const {
+    return toolbarButtonText;
+}
+void BtStyle::setToolbarButtonText(const QColor& color) {
+    toolbarButtonText = color;
+    emitChanged();
+}
+
+double BtStyle::getToolbarTextPointSize() const {
+    return toolbarTextPointSize;
+}
+
+void BtStyle::setToolbarTextPointSize(double pointSize) {
+    toolbarTextPointSize = pointSize;
+    emitChanged();
+}
+
+double BtStyle::getTextFontPointSize() const {
+    return btConfig().value<int>("ui/textFontSize",14);
+}
+
+void BtStyle::setTextFontPointSize(double pointSize) {
+    btConfig().setValue<int>("ui/textFontSize", pointSize);
+    emitChanged();
+}
+
+double BtStyle::getUiFontPointSize() const {
+    return btConfig().value<int>("ui/uiFontSize",14);
+}
+
+void BtStyle::setUiFontPointSize(double pointSize) {
+    btConfig().setValue<int>("ui/uiFontSize", pointSize);
+    emitChanged();
+}
+
+} // end namespace
+
diff --git a/src/mobile/ui/btstyle.h b/src/mobile/ui/btstyle.h
new file mode 100644
index 0000000..7f65c22
--- /dev/null
+++ b/src/mobile/ui/btstyle.h
@@ -0,0 +1,132 @@
+#ifndef BT_STYLE_H
+#define BT_STYLE_H
+
+#include <QObject>
+#include <QColor>
+
+namespace btm {
+
+class BtStyle : public QObject {
+    Q_OBJECT
+
+    Q_PROPERTY(QColor buttonColor           READ getButtonColor NOTIFY changed)
+    Q_PROPERTY(QColor buttonBackground      READ getButtonBackground NOTIFY changed)
+    Q_PROPERTY(QColor buttonTextColor       READ getButtonTextColor NOTIFY changed)
+    Q_PROPERTY(QColor buttonHighlightedText READ getButtonHighlightedText NOTIFY changed)
+    Q_PROPERTY(QColor buttonBorder          READ getButtonBorder NOTIFY changed)
+    Q_PROPERTY(int    buttonRadius          READ getButtonRadius NOTIFY changed)
+
+    Q_PROPERTY(QColor buttonGradient0       READ getButtonGradient0 NOTIFY changed)
+    Q_PROPERTY(QColor buttonGradient1       READ getButtonGradient1 NOTIFY changed)
+    Q_PROPERTY(QColor buttonGradient2       READ getButtonGradient2 NOTIFY changed)
+    Q_PROPERTY(QColor buttonGradient3       READ getButtonGradient3 NOTIFY changed)
+
+
+    Q_PROPERTY(QColor windowTab             READ getWindowTab NOTIFY changed)
+    Q_PROPERTY(QColor windowTabSelected     READ getWindowTabSelected NOTIFY changed)
+    Q_PROPERTY(QColor windowTabText         READ getWindowTabText NOTIFY changed)
+    Q_PROPERTY(QColor windowTabTextSelected READ getWindowTabTextSelected NOTIFY changed)
+
+    Q_PROPERTY(QColor menu                  READ getMenu NOTIFY changed)
+    Q_PROPERTY(QColor menuBorder            READ getMenuBorder NOTIFY changed)
+    Q_PROPERTY(QColor menuText              READ getMenuText NOTIFY changed)
+    Q_PROPERTY(int    menuHeight            READ getMenuHeight() NOTIFY changed)
+
+    Q_PROPERTY(QColor toolbarColor          READ getToolbarColor NOTIFY changed)
+    Q_PROPERTY(QColor toolbarButton         READ getToolbarButton NOTIFY changed)
+    Q_PROPERTY(QColor toolbarButtonText     READ getToolbarButtonText NOTIFY changed)
+    Q_PROPERTY(double toolbarTextPointSize  READ getToolbarTextPointSize NOTIFY changed);
+
+    Q_PROPERTY(double textFontPointSize     READ getTextFontPointSize WRITE setTextFontPointSize NOTIFY changed);
+    Q_PROPERTY(double uiFontPointSize       READ getUiFontPointSize   WRITE setUiFontPointSize   NOTIFY changed);
+
+public:
+    Q_INVOKABLE void setStyle(int style);
+
+    enum Style {
+        gnome = 1,
+        android = 2
+    };
+
+
+    BtStyle(QObject *parent = 0);
+
+    QColor getButtonColor() const;
+    void setButtonColor(const QColor& color);
+
+    QColor getButtonBackground() const;
+    void setButtonBackground(const QColor& color);
+
+    QColor getButtonTextColor() const;
+    void setButtonTextColor(const QColor& color);
+
+    QColor getButtonHighlightedText() const;
+    void setButtonHighlightedText(const QColor& color);
+
+    QColor getButtonBorder() const;
+    void setButtonBorder(const QColor& color);
+
+    int getButtonRadius() const;
+    void setButtonRadius(int radius);
+
+    QColor getButtonGradient0() const;
+    void setButtonGradient0(const QColor& color);
+
+    QColor getButtonGradient1() const;
+    void setButtonGradient1(const QColor& color);
+
+    QColor getButtonGradient2() const;
+    void setButtonGradient2(const QColor& color);
+
+    QColor getButtonGradient3() const;
+    void setButtonGradient3(const QColor& color);
+
+    QColor getWindowTab() const;
+    void setWindowTab(const QColor& color);
+
+    QColor getWindowTabSelected() const;
+    void setWindowTabSelected(const QColor& color);
+
+    QColor getWindowTabText() const;
+    void setWindowTabText(const QColor& color);
+
+    QColor getWindowTabTextSelected() const;
+    void setWindowTabTextSelected(const QColor& color);
+
+    QColor getMenu() const;
+    void setMenu(const QColor& color);
+
+    QColor getMenuBorder() const;
+    void setMenuBorder(const QColor& color);
+
+    QColor getMenuText() const;
+    void setMenuText(const QColor& color);
+
+    int getMenuHeight() const;
+    void setMenuHeight(int height);
+
+    QColor getToolbarColor() const;
+    void setToolbarColor(const QColor& color);
+
+    QColor getToolbarButton() const;
+    void setToolbarButton(const QColor& color);
+
+    QColor getToolbarButtonText() const;
+    void setToolbarButtonText(const QColor& color);
+
+    double getToolbarTextPointSize() const;
+    void setToolbarTextPointSize(double pointSize);
+
+    double getTextFontPointSize() const;
+    void setTextFontPointSize(double pointSize);
+
+    double getUiFontPointSize() const;
+    void setUiFontPointSize(double pointSize);
+
+signals:
+    void changed();
+};
+
+} // end namespace
+
+#endif
diff --git a/src/mobile/ui/btwindowinterface.cpp b/src/mobile/ui/btwindowinterface.cpp
new file mode 100644
index 0000000..1016055
--- /dev/null
+++ b/src/mobile/ui/btwindowinterface.cpp
@@ -0,0 +1,257 @@
+
+#include "btwindowinterface.h"
+
+#include "backend/config/btconfig.h"
+#include "backend/drivers/cswordbiblemoduleinfo.h"
+#include "backend/drivers/cswordmoduleinfo.h"
+#include "backend/keys/cswordkey.h"
+#include "backend/keys/cswordtreekey.h"
+#include "backend/managers/cswordbackend.h"
+#include "backend/rendering/centrydisplay.h"
+#include "backend/rendering/cdisplayrendering.h"
+#include "mobile/btmmain.h"
+#include "mobile/keychooser/versechooser.h"
+#include "mobile/keychooser/bookkeychooser.h"
+#include "mobile/ui/modulechooser.h"
+#include "mobile/ui/viewmanager.h"
+#include <QDebug>
+#include <QFile>
+#include <QObject>
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <QQuickItem>
+#include <QStringList>
+
+
+namespace btm {
+
+BtWindowInterface::BtWindowInterface(QObject* parent)
+    : QObject(parent),
+      m_key(0),
+      m_textModel(new RoleItemModel()),
+      m_bookKeyChooser(0),
+      m_verseKeyChooser(0),
+      m_bibleTextModelBuilder(m_textModel),
+      m_bookTextModelBuilder(m_textModel){
+
+    QtQuick2ApplicationViewer* viewer = getViewManager()->getViewer();
+    m_verseKeyChooser = new VerseChooser(viewer, this);
+    bool ok = connect(m_verseKeyChooser, SIGNAL(referenceChanged()), this, SLOT(referenceChanged()));
+    Q_ASSERT(ok);
+
+    m_bookKeyChooser = new BookKeyChooser(viewer, this);
+    ok = connect(m_bookKeyChooser, SIGNAL(referenceChanged()), this, SLOT(referenceChanged()));
+    Q_ASSERT(ok);
+}
+
+static QString getKeyText(CSwordKey* key) {
+    QString keyText;
+    if ( ! key)
+        return keyText;
+
+    CSwordVerseKey* verseKey = dynamic_cast<CSwordVerseKey*>(key);
+    if (verseKey) {
+        keyText = verseKey->key();
+        return keyText;
+    }
+
+    CSwordTreeKey* treeKey = dynamic_cast<CSwordTreeKey*>(key);
+    if (treeKey) {
+        keyText = treeKey->key();
+        return keyText;
+    }
+    return keyText;
+}
+
+void BtWindowInterface::updateModel() {
+    QString moduleName= getModuleName();
+    QStringList moduleList = QStringList() << moduleName;
+    QList<const CSwordModuleInfo*> modules =
+        CSwordBackend::instance()->getConstPointerList(moduleList);
+    QString keyText = getKeyText(m_key);
+
+    m_textModel->clear();
+    if (modules.at(0)->type() == CSwordModuleInfo::Bible)
+        m_bibleTextModelBuilder.updateModel(modules, keyText);
+    else if (modules.at(0)->type() == CSwordModuleInfo::GenericBook)
+        m_bookTextModelBuilder.updateModel(modules, keyText);
+
+    emit currentModelIndexChanged();
+}
+
+int BtWindowInterface::getCurrentModelIndex() const {
+    return m_bibleTextModelBuilder.getCurrentModelIndex();
+}
+
+static bool moduleIsBibleOrCommentary(const CSwordModuleInfo* module) {
+    CSwordModuleInfo::Category category = module->category();
+    if (category == CSwordModuleInfo::Bibles ||
+            category == CSwordModuleInfo::Commentaries)
+        return true;
+    return false;
+}
+
+static bool moduleIsBook(const CSwordModuleInfo* module) {
+    CSwordModuleInfo::Category category = module->category();
+    if (category == CSwordModuleInfo::Books)
+        return true;
+    return false;
+}
+
+QString BtWindowInterface::getModuleName() const {
+    QString moduleName;
+    if (m_key)
+        moduleName = m_key->module()->name();
+    return moduleName;
+}
+
+void BtWindowInterface::setModuleName(const QString& moduleName) {
+    CSwordModuleInfo* m = CSwordBackend::instance()->findModuleByName(moduleName);
+    if (!m_key) {
+        m_key = CSwordKey::createInstance(m);
+    }
+    else {
+        if (moduleIsBibleOrCommentary(m) &&
+                moduleIsBibleOrCommentary(m_key->module())) {
+            m_key->setModule(m);
+        }
+        else if (moduleIsBook(m) &&
+                 moduleIsBook(m_key->module())) {
+            m_key->setModule(m);
+        }
+
+        else {
+            delete m_key;
+            m_key = CSwordKey::createInstance(m);
+        }
+
+    }
+
+    CSwordTreeKey* treeKey = dynamic_cast<CSwordTreeKey*>(m_key);
+    if (treeKey)
+        treeKey->firstChild();
+
+    emit moduleChanged();
+    emit referenceChange();
+    updateModel();
+}
+
+QString BtWindowInterface::getReference() const {
+    QString reference;
+    if (m_key)
+        reference = m_key->key();
+    return reference;
+}
+
+void BtWindowInterface::changeModule() {
+    QtQuick2ApplicationViewer* viewer = getViewManager()->getViewer();
+    ModuleChooser* dlg = new ModuleChooser(viewer, this);
+    dlg->open();
+}
+
+static void parseKey(CSwordTreeKey* currentKey, QStringList* keyPath, QStringList* children)
+{
+    if (currentKey == 0)
+        return;
+
+    CSwordTreeKey localKey(*currentKey);
+
+    QString oldKey = localKey.key(); //string backup of key
+
+    if (oldKey.isEmpty()) { //don't set keys equal to "/", always use a key which may have content
+        localKey.firstChild();
+        oldKey = localKey.key();
+    }
+//    const int oldOffset = localKey.getOffset(); //backup key position
+
+    QStringList siblings; //split up key
+    if (!oldKey.isEmpty()) {
+        siblings = oldKey.split('/', QString::SkipEmptyParts);
+    }
+
+    int depth = 0;
+    int index = 0;
+    localKey.root(); //start iteration at root node
+
+    while ( localKey.firstChild() && (depth < siblings.count()) ) {
+        QString key = localKey.key();
+        index = (depth == 0) ? -1 : 0;
+
+        bool found = false;
+        do { //look for matching sibling
+            ++index;
+            found = (localKey.getLocalNameUnicode() == siblings[depth]);
+        }
+        while (!found && localKey.nextSibling());
+
+        if (found)
+            key = localKey.key(); //found: change key to this level
+        else
+            localKey.setKey(key); //not found: restore old key
+
+        *keyPath << key;
+
+        //last iteration: get child entries
+        if (depth == siblings.count() - 1 && localKey.hasChildren()) {
+            localKey.firstChild();
+            ++depth;
+            do {
+                *children << localKey.getLocalNameUnicode();
+            }
+            while (localKey.nextSibling());
+        }
+        depth++;
+    }
+}
+
+void BtWindowInterface::changeReference() {
+    CSwordVerseKey* verseKey = dynamic_cast<CSwordVerseKey*>(m_key);
+    if (verseKey != 0) {
+        m_verseKeyChooser->open(verseKey);
+    }
+
+    CSwordTreeKey* treeKey = dynamic_cast<CSwordTreeKey*>(m_key);
+    if (treeKey != 0) {
+        QStringList keyPath;
+        QStringList children;
+        parseKey(treeKey, &keyPath, &children);
+        m_bookKeyChooser->open();
+    }
+}
+
+void BtWindowInterface::referenceChanged() {
+    emit referenceChange();
+    updateModel();
+}
+
+const CSwordModuleInfo* BtWindowInterface::module() const {
+    const CSwordModuleInfo* module = m_key->module();
+    return module;
+}
+
+CSwordKey* BtWindowInterface::getKey() const {
+    return m_key;
+}
+
+int BtWindowInterface::getFontSize() const {
+    const CLanguageMgr::Language* lang = module()->language();
+    BtConfig::FontSettingsPair fontPair = btConfig().getFontForLanguage(*lang);
+    QFont font = fontPair.second;
+    return font.pointSize();
+}
+
+void BtWindowInterface::setFontSize(int size) {
+    const CLanguageMgr::Language* lang = module()->language();
+    BtConfig::FontSettingsPair fontPair = btConfig().getFontForLanguage(*lang);
+    fontPair.second.setPointSize(size);
+    btConfig().setFontForLanguage(*lang, fontPair);
+    emit textChanged();
+}
+
+QVariant BtWindowInterface::getTextModel() {
+    QVariant var;
+    var.setValue(m_textModel);
+    return var;
+}
+
+} // end namespace
diff --git a/src/mobile/ui/btwindowinterface.h b/src/mobile/ui/btwindowinterface.h
new file mode 100644
index 0000000..c6c31b0
--- /dev/null
+++ b/src/mobile/ui/btwindowinterface.h
@@ -0,0 +1,73 @@
+#ifndef BT_WINDOW_INTERFACE_H
+#define BT_WINDOW_INTERFACE_H
+
+#include <QObject>
+#include <QString>
+#include "mobile/models/roleitemmodel.h"
+#include "mobile/models/bibletextmodelbuilder.h"
+#include "mobile/models/booktextmodelbuilder.h"
+
+class CSwordKey;
+class CSwordVerseKey;
+class CSwordModuleInfo;
+
+namespace btm {
+
+class BookKeyChooser;
+class VerseChooser;
+
+class BtWindowInterface : public QObject {
+
+    Q_OBJECT
+
+    Q_PROPERTY(QString moduleName READ getModuleName WRITE setModuleName NOTIFY moduleChanged)
+    Q_PROPERTY(QString reference READ getReference NOTIFY referenceChange)
+    Q_PROPERTY(int fontSize READ getFontSize WRITE setFontSize NOTIFY textChanged)
+    Q_PROPERTY(QVariant textModel READ getTextModel NOTIFY textModelChanged)
+    Q_PROPERTY(int currentModelIndex READ getCurrentModelIndex NOTIFY currentModelIndexChanged)
+
+public:
+    Q_INVOKABLE void changeModule();
+    Q_INVOKABLE void changeReference();
+
+    BtWindowInterface(QObject *parent = 0);
+
+    CSwordKey* getKey() const;
+
+    QString getModuleName() const;
+    void setModuleName(const QString& moduleName);
+
+    QString getReference() const;
+
+    int getCurrentModelIndex() const;
+
+    int getFontSize() const;
+    void setFontSize(int size);
+
+    QVariant getTextModel();
+
+signals:
+    void referenceChange();
+    void moduleChanged();
+    void textChanged();
+    void textModelChanged();
+    void currentModelIndexChanged();
+
+private slots:
+    void referenceChanged();
+
+private:
+    const CSwordModuleInfo* module() const;
+    void updateModel();
+
+    CSwordKey* m_key;
+    RoleItemModel* m_textModel;
+    BookKeyChooser* m_bookKeyChooser;
+    VerseChooser* m_verseKeyChooser;
+    BibleTextModelBuilder m_bibleTextModelBuilder;
+    BookTextModelBuilder m_bookTextModelBuilder;
+};
+
+} // end namespace
+
+#endif
diff --git a/src/mobile/ui/gridchooser.cpp b/src/mobile/ui/gridchooser.cpp
new file mode 100644
index 0000000..3836b18
--- /dev/null
+++ b/src/mobile/ui/gridchooser.cpp
@@ -0,0 +1,63 @@
+
+#include "gridchooser.h"
+
+#include "qtquick2applicationviewer.h"
+
+#include <algorithm>
+#include <cmath>
+#include <QEventLoop>
+#include <QQuickItem>
+#include <QQmlContext>
+#include <QDebug>
+#include <QCoreApplication>
+
+namespace btm {
+
+GridChooser::GridChooser(QtQuick2ApplicationViewer* viewer)
+    : viewer_(viewer),
+      gridChooserObject_(0) {
+    QQuickItem * rootObject = viewer_->rootObject();
+    if (rootObject != 0)
+        gridChooserObject_ = rootObject->findChild<QQuickItem*>("gridChooser");
+}
+
+GridChooser::~GridChooser() {
+}
+
+void GridChooser::open(const QStringList& stringList, const QString& highlight, const QString& title) {
+    Q_ASSERT(gridChooserObject_ != 0);
+    if (gridChooserObject_ == 0)
+        return;
+
+    gridChooserObject_->disconnect();
+    bool ok = connect(gridChooserObject_, SIGNAL(accepted(QString)),
+                      this, SLOT(gridChooserAccepted(QString)));
+    Q_ASSERT(ok);
+    setProperties(stringList, highlight, title);
+}
+
+void GridChooser::setProperties(const QStringList& list, const QString& hightlight, const QString& title) {
+    QQmlContext* ctx = viewer_->rootContext();
+    ctx->setContextProperty("gridChooserModel",list);
+    gridChooserObject_->setProperty("selected",hightlight);
+    gridChooserObject_->setProperty("titleText",title);
+
+    int maxLength = 0;
+    for (int i = 0; i < list.count(); ++i) {
+        QString text = list.at(i);
+        maxLength = std::max(maxLength, text.length());
+    }
+    gridChooserObject_->setProperty("maxLength", maxLength);
+
+    gridChooserObject_->setProperty("visible",true);
+}
+
+void GridChooser::gridChooserAccepted(QString value) {
+    emit accepted(value);
+}
+
+void GridChooser::gridChooserCanceled() {
+    emit canceled();
+}
+
+} // end namespace
diff --git a/src/mobile/ui/gridchooser.h b/src/mobile/ui/gridchooser.h
new file mode 100644
index 0000000..8200f91
--- /dev/null
+++ b/src/mobile/ui/gridchooser.h
@@ -0,0 +1,43 @@
+#ifndef GRID_CHOOSER_H
+#define GRID_CHOOSER_H
+
+#include <QEventLoop>
+#include <QObject>
+#include <QList>
+
+class QtQuick2ApplicationViewer;
+class QQuickItem;
+class QStringList;
+class QEventLoop;
+
+namespace btm {
+
+class BtWindowInterface;
+
+class GridChooser : public QObject {
+    Q_OBJECT
+
+public:
+    GridChooser(QtQuick2ApplicationViewer* viewer);
+    ~GridChooser();
+    void open(const QStringList& stringList, const QString& highlight = QString(), const QString& title = QString());
+
+signals:
+    void accepted(const QString& value);
+    void canceled();
+
+private slots:
+    void gridChooserAccepted(QString value);
+    void gridChooserCanceled();
+
+private:
+    void setProperties(const QStringList& list, const QString& hightlight, const QString& title);
+
+    QtQuick2ApplicationViewer* viewer_;
+    QQuickItem* gridChooserObject_;
+    QEventLoop eventLoop_;
+};
+
+} // end namespace
+
+#endif
diff --git a/src/mobile/ui/modulechooser.cpp b/src/mobile/ui/modulechooser.cpp
new file mode 100644
index 0000000..bc3d582
--- /dev/null
+++ b/src/mobile/ui/modulechooser.cpp
@@ -0,0 +1,44 @@
+
+#include "modulechooser.h"
+
+#include "qtquick2applicationviewer.h"
+
+#include "backend/bookshelfmodel/btbookshelftreemodel.h"
+#include "backend/managers/cswordbackend.h"
+#include <cmath>
+#include <QQuickItem>
+#include <QQmlProperty>
+#include "btwindowinterface.h"
+#include "mobile/util/findqmlobject.h"
+
+namespace btm {
+
+ModuleChooser::ModuleChooser(QtQuick2ApplicationViewer* viewer, BtWindowInterface* bibleVerse)
+    : viewer_(viewer),
+      bibleVerse_(bibleVerse) {
+}
+
+void ModuleChooser::open() {
+    QQuickItem* item = findQmlObject("moduleChooser");
+    Q_ASSERT(item != 0);
+    if (item == 0)
+        return;
+
+    item->setProperty("visible", true);
+    bool ok = connect(item, SIGNAL(moduleSelected()), this, SLOT(moduleSelectedSlot()));
+    Q_ASSERT(ok);
+}
+
+void ModuleChooser::moduleSelectedSlot() {
+    QQuickItem* item = findQmlObject("moduleChooser");
+    Q_ASSERT(item != 0);
+    if (item == 0)
+        return;
+
+    item->setProperty("visible", false);
+    QVariant v = item->property("selectedModule");
+    QString moduleName = v.toString();
+    bibleVerse_->setModuleName(moduleName);
+}
+
+} // end namespace
diff --git a/src/mobile/ui/modulechooser.h b/src/mobile/ui/modulechooser.h
new file mode 100644
index 0000000..4e261f9
--- /dev/null
+++ b/src/mobile/ui/modulechooser.h
@@ -0,0 +1,35 @@
+#ifndef MODULE_CHOOSER_H
+#define MODULE_CHOOSER_H
+
+#include <QObject>
+
+class QtQuick2ApplicationViewer;
+class QStringList;
+
+namespace btm {
+
+class GridChooser;
+
+class BtWindowInterface;
+
+class ModuleChooser : public QObject {
+    Q_OBJECT
+
+public:
+    ModuleChooser(QtQuick2ApplicationViewer* viewer, BtWindowInterface* bibleVerse);
+    void open();
+
+private slots:
+    void moduleSelectedSlot();
+
+private:
+    void showGridChooser(const QStringList& list);
+    void setProperties(const QStringList& list);
+
+    QtQuick2ApplicationViewer* viewer_;
+    BtWindowInterface* bibleVerse_;
+};
+
+} // end namespace
+
+#endif
diff --git a/src/mobile/ui/moduleinterface.cpp b/src/mobile/ui/moduleinterface.cpp
new file mode 100644
index 0000000..4d898b4
--- /dev/null
+++ b/src/mobile/ui/moduleinterface.cpp
@@ -0,0 +1,187 @@
+
+#include "moduleinterface.h"
+
+#include "qtquick2applicationviewer.h"
+
+#include "backend/bookshelfmodel/btbookshelftreemodel.h"
+#include "backend/managers/cswordbackend.h"
+#include "mobile/util/findqmlobject.h"
+#include <cmath>
+#include <QQuickItem>
+#include <QQmlProperty>
+#include <QQmlContext>
+#include <QDebug>
+#include <QQmlProperty>
+#include <QCoreApplication>
+#include "btwindowinterface.h"
+#include "gridchooser.h"
+
+namespace btm {
+
+ModuleInterface::ModuleInterface() {
+}
+
+enum TextRoles {
+    TextRole = Qt::UserRole + 1
+};
+
+typedef BtBookshelfModel::ModuleRole MRole;
+static const MRole HR(BtBookshelfModel::ModuleHiddenRole);
+static const MRole PR(BtBookshelfModel::ModulePointerRole);
+static const MRole IR(BtBookshelfModel::ModuleHasIndexRole);
+static const MRole CR(BtBookshelfModel::ModuleCategoryRole);
+
+static void setupTextModel(const QSet<QString>& modelSet, RoleItemModel* model) {
+
+    QHash<int, QByteArray> roleNames;
+    roleNames[TextRole] =  "modelText";
+    model->setRoleNames(roleNames);
+
+    QStringList modelList = modelSet.toList();
+    modelList.sort();
+
+    model->clear();
+    for (int i=0; i< modelList.count(); ++i) {
+        QString source = modelList.at(i);
+        QStandardItem* item = new QStandardItem();
+        item->setData(source, TextRole);
+        model->appendRow(item);
+    }
+}
+
+static CSwordModuleInfo* getModule(BtBookshelfModel* bookshelfModel, const QModelIndex& index) {
+    QVariant var = bookshelfModel->data(index, PR);
+    CSwordModuleInfo* module = static_cast<CSwordModuleInfo*>(var.value<void*>());
+    return module;
+}
+
+void ModuleInterface::updateCategoryAndLanguageModels() {
+    QQuickItem* object = findQmlObject("moduleChooser");
+    if (object == 0)
+        return;
+
+    getCategoriesAndLanguages();
+    setupTextModel(m_categories, &m_categoryModel);
+    setupTextModel(m_languages, &m_languageModel);
+    object->setProperty("categoryModel", QVariant::fromValue(&m_categoryModel));
+    object->setProperty("languageModel", QVariant::fromValue(&m_languageModel));
+}
+
+void ModuleInterface::getCategoriesAndLanguages() {
+
+    m_categories.clear();
+    m_languages.clear();
+
+    QQuickItem* object = findQmlObject("moduleChooser");
+    if (object == 0)
+        return;
+
+    BtBookshelfModel* bookshelfModel = CSwordBackend::instance()->model();
+    if (bookshelfModel == 0)
+        return;
+    int count = bookshelfModel->rowCount();
+    for (int row=0; row<count; ++row) {
+        QModelIndex index = bookshelfModel->index(row);
+        CSwordModuleInfo* module = getModule(bookshelfModel, index);
+        CSwordModuleInfo::Category category = module->category();
+        QString categoryName = module->categoryName(category);
+        const CLanguageMgr::Language* language = module->language();
+        QString languageName = language->translatedName();
+        m_categories.insert(categoryName);
+        m_languages.insert(languageName);
+    }
+}
+
+void ModuleInterface::updateWorksModel() {
+    m_worksModel.clear();
+    m_modules.clear();
+
+    QString currentLang = currentLanguage();
+    QString currentCat = currentCategory();
+
+    QHash<int, QByteArray> roleNames;
+    roleNames[TextRole] =  "modelText";
+    m_worksModel.setRoleNames(roleNames);
+
+    BtBookshelfModel* bookshelfModel = CSwordBackend::instance()->model();
+    if (bookshelfModel == 0)
+        return;
+    int count = bookshelfModel->rowCount();
+    for (int row=0; row<count; ++row) {
+        QModelIndex index = bookshelfModel->index(row);
+        CSwordModuleInfo* module = getModule(bookshelfModel, index);
+        CSwordModuleInfo::Category category = module->category();
+        QString categoryName = module->categoryName(category);
+        const CLanguageMgr::Language* language = module->language();
+        QString languageName = language->translatedName();
+        if (languageName == currentLang &&
+                categoryName == currentCat) {
+            m_modules << module;
+            QString moduleName = module->name();
+            QStandardItem* item = new QStandardItem();
+            item->setData(moduleName, TextRole);
+            m_worksModel.appendRow(item);
+        }
+    }
+
+    QQuickItem* object = findQmlObject("moduleChooser");
+    if (object == 0)
+        return;
+    object->setProperty("worksModel", QVariant::fromValue(&m_worksModel));
+}
+
+QString ModuleInterface::currentLanguage() const {
+    QQuickItem* object = findQmlObject("moduleChooser");
+    if (object == 0)
+        return "";
+    int row = object->property("languageIndex").toInt();
+    QModelIndex modelIndex = m_languageModel.index(row,0);
+    QString language = modelIndex.data(TextRole).toString();
+    return language;
+
+}
+
+QString ModuleInterface::currentCategory() const {
+    QQuickItem* object = findQmlObject("moduleChooser");
+    if (object == 0)
+        return "";
+    int row = object->property("categoryIndex").toInt();
+    QModelIndex modelIndex = m_categoryModel.index(row,0);
+    QString category = modelIndex.data(TextRole).toString();
+    return category;
+}
+
+QString ModuleInterface::category(int index) {
+    if (index < 0 || index >= m_modules.count())
+        return "";
+    CSwordModuleInfo* module = m_modules.at(index);
+    if (module == 0)
+        return "";
+    CSwordModuleInfo::Category category = module->category();
+    if (category == 0)
+        return "";
+    return module->categoryName(category);
+}
+
+QString ModuleInterface::language(int index) {
+    if (index < 0 || index >= m_modules.count())
+        return "";
+    CSwordModuleInfo* module = m_modules.at(index);
+    if (module == 0)
+        return "";
+    const CLanguageMgr::Language* language = module->language();
+    if (language == 0)
+        return "";
+    return language->translatedName();
+}
+
+QString ModuleInterface::module(int index) {
+    if (index < 0 || index >= m_modules.count())
+        return "";
+    CSwordModuleInfo* module = m_modules.at(index);
+    if (module == 0)
+        return "";
+    return module->name();
+}
+
+} // end namespace
diff --git a/src/mobile/ui/moduleinterface.h b/src/mobile/ui/moduleinterface.h
new file mode 100644
index 0000000..165c30f
--- /dev/null
+++ b/src/mobile/ui/moduleinterface.h
@@ -0,0 +1,48 @@
+#ifndef MODULE_INTERFACE_H
+#define MODULE_INTERFACE_H
+
+#include "mobile/models/roleitemmodel.h"
+#include <QObject>
+#include <QList>
+#include <QSet>
+#include <QString>
+
+class QQuickItem;
+class QStringList;
+class CSwordModuleInfo;
+
+namespace btm {
+
+class GridChooser;
+
+class BtWindowInterface;
+
+class ModuleInterface : public QObject {
+    Q_OBJECT
+
+public:
+    ModuleInterface();
+    Q_INVOKABLE void updateCategoryAndLanguageModels();
+    Q_INVOKABLE void updateWorksModel();
+    Q_INVOKABLE QString category(int index);
+    Q_INVOKABLE QString language(int index);
+    Q_INVOKABLE QString module(int index);
+
+private:
+    void getCategoriesAndLanguages();
+    void setProperties(const QStringList& list);
+    QString currentLanguage() const;
+    QString currentCategory() const;
+
+    QSet<QString> m_categories;
+    QSet<QString> m_languages;
+    RoleItemModel m_categoryModel;
+    RoleItemModel m_languageModel;
+    RoleItemModel m_worksModel;
+    QList<CSwordModuleInfo*> m_modules;
+
+};
+
+} // end namespace
+
+#endif
diff --git a/src/mobile/ui/qtquick2applicationviewer.cpp b/src/mobile/ui/qtquick2applicationviewer.cpp
new file mode 100644
index 0000000..b6077d8
--- /dev/null
+++ b/src/mobile/ui/qtquick2applicationviewer.cpp
@@ -0,0 +1,63 @@
+// checksum 0x56a9 version 0x80001
+/*
+  This file was generated by the Qt Quick 2 Application wizard of Qt Creator.
+  QtQuick2ApplicationViewer is a convenience class containing mobile device specific
+  code such as screen orientation handling. Also QML paths and debugging are
+  handled here.
+  It is recommended not to modify this file, since newer versions of Qt Creator
+  may offer an updated version of it.
+*/
+
+#include "qtquick2applicationviewer.h"
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
+#include <QtQml/QQmlEngine>
+
+class QtQuick2ApplicationViewerPrivate {
+    QString mainQmlFile;
+    friend class QtQuick2ApplicationViewer;
+    static QString adjustPath(const QString &path);
+};
+
+QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString &path) {
+#if defined(Q_OS_MAC)
+    if (!QDir::isAbsolutePath(path))
+        return QString::fromLatin1("%1/../Resources/%2")
+                .arg(QCoreApplication::applicationDirPath(), path);
+#elif defined(Q_OS_UNIX)
+    const QString pathInInstallDir =
+            QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
+    if (QFileInfo(pathInInstallDir).exists())
+        return pathInInstallDir;
+#endif
+    return path;
+}
+
+QtQuick2ApplicationViewer::QtQuick2ApplicationViewer(QWindow *parent)
+    : QQuickView(parent)
+    , d(new QtQuick2ApplicationViewerPrivate()) {
+    connect(engine(), SIGNAL(quit()), SLOT(close()));
+    setResizeMode(QQuickView::SizeRootObjectToView);
+}
+
+QtQuick2ApplicationViewer::~QtQuick2ApplicationViewer() {
+    delete d;
+}
+
+void QtQuick2ApplicationViewer::setMainQmlFile(const QString &file) {
+    d->mainQmlFile = QtQuick2ApplicationViewerPrivate::adjustPath(file);
+    setSource(QUrl::fromLocalFile(d->mainQmlFile));
+}
+
+void QtQuick2ApplicationViewer::addImportPath(const QString &path) {
+    engine()->addImportPath(QtQuick2ApplicationViewerPrivate::adjustPath(path));
+}
+
+void QtQuick2ApplicationViewer::showExpanded() {
+#if defined(Q_WS_SIMULATOR)
+    showFullScreen();
+#else
+    show();
+#endif
+}
diff --git a/src/mobile/ui/qtquick2applicationviewer.h b/src/mobile/ui/qtquick2applicationviewer.h
new file mode 100644
index 0000000..a3db59d
--- /dev/null
+++ b/src/mobile/ui/qtquick2applicationviewer.h
@@ -0,0 +1,32 @@
+// checksum 0xfde6 version 0x80001
+/*
+  This file was generated by the Qt Quick 2 Application wizard of Qt Creator.
+  QtQuick2ApplicationViewer is a convenience class containing mobile device specific
+  code such as screen orientation handling. Also QML paths and debugging are
+  handled here.
+  It is recommended not to modify this file, since newer versions of Qt Creator
+  may offer an updated version of it.
+*/
+
+#ifndef QTQUICK2APPLICATIONVIEWER_H
+#define QTQUICK2APPLICATIONVIEWER_H
+
+#include <QtQuick/QQuickView>
+
+class QtQuick2ApplicationViewer : public QQuickView {
+    Q_OBJECT
+
+public:
+    explicit QtQuick2ApplicationViewer(QWindow *parent = 0);
+    virtual ~QtQuick2ApplicationViewer();
+
+    void setMainQmlFile(const QString &file);
+    void addImportPath(const QString &path);
+
+    void showExpanded();
+
+private:
+    class QtQuick2ApplicationViewerPrivate *d;
+};
+
+#endif // QTQUICK2APPLICATIONVIEWER_H
diff --git a/src/mobile/ui/treechoosermodel.cpp b/src/mobile/ui/treechoosermodel.cpp
new file mode 100644
index 0000000..cc5e2a7
--- /dev/null
+++ b/src/mobile/ui/treechoosermodel.cpp
@@ -0,0 +1,22 @@
+
+#include "treechoosermodel.h"
+
+
+TreeChooserModel::TreeChooserModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+}
+
+QHash<int, QByteArray>    TreeChooserModel::roleNames() const {
+    QHash<int, QByteArray> roles;
+    roles[NameRole] = "name";
+    roles[ChildCountRole] = "childCount";
+    return roles;
+}
+
+void TreeChooserModel::addEntry(const QString& name, int childCount) {
+    int count = rowCount();
+    beginInsertRows(count, count);
+    insertRow(count);
+    endInsertRows();
+}
diff --git a/src/mobile/ui/treechoosermodel.h b/src/mobile/ui/treechoosermodel.h
new file mode 100644
index 0000000..c1575ae
--- /dev/null
+++ b/src/mobile/ui/treechoosermodel.h
@@ -0,0 +1,20 @@
+#ifndef TREE_CHOOSER_MODEL_H
+#define TREE_CHOOSER_MODEL_H
+
+#include <QAbstractItemModel>
+
+class TreeChooserModel : public QAbstractListModel
+{
+    Q_OBJECT
+public:
+    enum TreeEntryRoles {
+        NameRole = Qt::UserRole + 1,
+        ChildCountRole
+    };
+
+    TreeChooserModel(QObject *parent = 0);
+    QHash<int, QByteArray>    TreeChooserModel::roleNames() const;
+
+};
+
+#endif
diff --git a/src/mobile/ui/viewmanager.cpp b/src/mobile/ui/viewmanager.cpp
new file mode 100644
index 0000000..041699a
--- /dev/null
+++ b/src/mobile/ui/viewmanager.cpp
@@ -0,0 +1,52 @@
+
+#include "viewmanager.h"
+
+#include "qtquick2applicationviewer.h"
+
+#include "btstyle.h"
+#include <cmath>
+#include <QGuiApplication>
+#include <QJsonValue>
+#include <QQuickItem>
+#include <QQmlProperty>
+#include <QQmlContext>
+#include <QUrl>
+#include <QDebug>
+
+namespace btm {
+
+static QString qmlFilePath(const QString& parentName, const QString& fileName) {
+    QString filePath = QCoreApplication::applicationDirPath() + "/../share/";
+    filePath += parentName + "/";
+    filePath += fileName;
+    return filePath;
+}
+
+ViewManager::ViewManager()
+    : viewer_(new QtQuick2ApplicationViewer()) {
+    BtStyle style;
+    style.setStyle(BtStyle::gnome);
+    initialize_string_list_chooser_model();
+    initialize_main_qml();
+}
+
+void ViewManager::initialize_string_list_chooser_model() {
+    QQmlContext* ctx = viewer_->rootContext();
+    QStringList list = QStringList();
+    ctx->setContextProperty("gridChooserModel",list);
+}
+
+void ViewManager::initialize_main_qml() {
+    QString mainQml = qmlFilePath("qml", "main.qml");
+    viewer_->setMainQmlFile(mainQml);
+}
+
+void ViewManager::show() {
+    viewer_->showExpanded();
+}
+
+QtQuick2ApplicationViewer* ViewManager::getViewer() const {
+    return viewer_;
+}
+
+} // end namespace
diff --git a/src/mobile/ui/viewmanager.h b/src/mobile/ui/viewmanager.h
new file mode 100644
index 0000000..7c50d35
--- /dev/null
+++ b/src/mobile/ui/viewmanager.h
@@ -0,0 +1,34 @@
+#ifndef VIEW_MANAGER_H
+#define VIEW_MANAGER_H
+
+#include <QObject>
+#include <QList>
+
+class QtQuick2ApplicationViewer;
+class QStringList;
+
+namespace btm {
+class BtWindowInterface;
+}
+
+namespace btm {
+
+class ViewManager : public QObject {
+    Q_OBJECT
+
+public:
+    ViewManager();
+
+    void show();
+    QtQuick2ApplicationViewer* getViewer() const;
+
+private:
+    void initialize_main_qml();
+    void initialize_string_list_chooser_model();
+
+    QtQuick2ApplicationViewer* viewer_;
+};
+
+} // end namespace
+
+#endif
diff --git a/src/mobile/util/findqmlobject.cpp b/src/mobile/util/findqmlobject.cpp
new file mode 100644
index 0000000..25a317c
--- /dev/null
+++ b/src/mobile/util/findqmlobject.cpp
@@ -0,0 +1,34 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#include "mobile/util/findqmlobject.h"
+#include <QQuickItem>
+#include "mobile/btmmain.h"
+#include "mobile/ui/qtquick2applicationviewer.h"
+#include "mobile/ui/viewmanager.h"
+
+namespace btm {
+
+QQuickItem* findQmlObject(const QString& objectName) {
+
+    QtQuick2ApplicationViewer* viewer = getViewManager()->getViewer();
+    QQuickItem * rootObject = 0;
+    if (viewer != 0)
+        rootObject = viewer->rootObject();
+    QQuickItem* object = 0;
+    if (rootObject != 0)
+        object = rootObject->findChild<QQuickItem*>(objectName);
+    Q_ASSERT(object != 0);
+    return object;
+}
+
+}
diff --git a/src/mobile/util/findqmlobject.h b/src/mobile/util/findqmlobject.h
new file mode 100644
index 0000000..bfbbcac
--- /dev/null
+++ b/src/mobile/util/findqmlobject.h
@@ -0,0 +1,28 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License
+* version 2.0.
+*
+**********/
+
+#ifndef FIND_QML_OBJECT
+#define FIND_QML_OBJECT
+
+#include <QString>
+
+class QQuickItem;
+
+namespace btm {
+
+// Finds the named QML object that is located at the
+// top level of the QML objects.
+QQuickItem* findQmlObject(const QString& objectName);
+
+}
+
+#endif
diff --git a/src/mobile/util/messagedialog.cpp b/src/mobile/util/messagedialog.cpp
new file mode 100644
index 0000000..a68857a
--- /dev/null
+++ b/src/mobile/util/messagedialog.cpp
@@ -0,0 +1,36 @@
+/*********
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#include "messagedialog.h"
+
+#include <QMessageBox>
+#include <QString>
+
+
+namespace message {
+
+int showWarning(QWidget * /*parent*/,
+                const QString & /*title*/,
+                const QString & /*text*/,
+                QMessageBox::StandardButtons /*buttons*/,
+                QMessageBox::StandardButton /*defaultButton*/) {
+    // TODO - implement showWarning
+    return 0;
+}
+
+int showQuestion(QWidget * /*parent*/,
+                const QString & /*title*/,
+                const QString & /*text*/,
+                QMessageBox::StandardButtons /*buttons*/,
+                QMessageBox::StandardButton /*defaultButton*/) {
+    // TODO - implement showQuestion
+    return 0;
+}
+
+} // namespace message
diff --git a/src/mobile/util/messagedialog.h b/src/mobile/util/messagedialog.h
new file mode 100644
index 0000000..d56b9ea
--- /dev/null
+++ b/src/mobile/util/messagedialog.h
@@ -0,0 +1,36 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#ifndef UTIL_DIALOG_UTIL_H
+#define UTIL_DIALOG_UTIL_H
+
+#include <QString>
+#include <QMessageBox>
+
+class QWidget;
+
+namespace message {
+
+int showWarning(QWidget * parent,
+                const QString & title,
+                const QString & text,
+                QMessageBox::StandardButtons buttons = QMessageBox::Ok,
+                QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
+
+int showQuestion(QWidget * parent,
+                const QString & title,
+                const QString & text,
+                QMessageBox::StandardButtons buttons = QMessageBox::Ok,
+                QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
+
+} // namespace message
+
+#endif
diff --git a/src/util/btmodules.cpp b/src/util/btmodules.cpp
index 784fd2a..7ba31c6 100644
--- a/src/util/btmodules.cpp
+++ b/src/util/btmodules.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/util/btmodules.h b/src/util/btmodules.h
index 2532e42..cb99d1c 100644
--- a/src/util/btmodules.h
+++ b/src/util/btmodules.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/util/btsignal.h b/src/util/btsignal.h
index 6f05226..a680311 100644
--- a/src/util/btsignal.h
+++ b/src/util/btsignal.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -23,23 +25,23 @@
 * have the signals work. Certain multiple inheritance classes which cannot
 * have QObject as the first derived class, cannot use Qt signals.
 */
-class BtSignal : public QObject {
-        Q_OBJECT
-
-    public:
-        inline BtSignal(QObject *parent = 0) : QObject(parent) {};
-
-        /**
-          Immediately emits the beforeChanged() signal.
-        */
-        inline void emitBeforeChanged() { emit beforeChanged(); }
-        /**
-          Immediately emits the changed() signal.
-        */
-        inline void emitChanged() { emit changed(); }
-
-    signals:
-        void beforeChanged();
-        void changed();
+class BtSignal: public QObject {
+
+    Q_OBJECT
+
+public:
+
+    inline BtSignal(QObject *parent = 0)
+        : QObject(parent) {}
+
+    /**
+      Immediately emits the beforeChanged() signal.
+    */
+    inline void emitSignal() { emit signal(); }
+
+signals:
+
+    void signal();
+
 };
 #endif
diff --git a/src/util/cresmgr.cpp b/src/util/cresmgr.cpp
index 908c5f3..a122039 100644
--- a/src/util/cresmgr.cpp
+++ b/src/util/cresmgr.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -221,6 +221,12 @@ const char* actionName    = "tipOfTheDay_action";
 }//mainMenu::help
 }  //end of mainMenu
 
+namespace findWidget {
+const QString close_icon = "stop.svg";
+const QString previous_icon = "back.svg";
+const QString next_icon = "forward.svg";
+}
+
 namespace searchdialog {
 const QString icon = "find.svg";
 const QString close_icon = "stop.svg";
diff --git a/src/util/cresmgr.h b/src/util/cresmgr.h
index 89bcfa5..b09c9fa 100644
--- a/src/util/cresmgr.h
+++ b/src/util/cresmgr.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -227,6 +229,12 @@ extern const char* actionName;
 }
 }  //end of main menu
 
+namespace findWidget {
+extern const QString close_icon;
+extern const QString previous_icon;
+extern const QString next_icon;
+}
+
 namespace searchdialog {
 extern const QString icon;
 extern const QString close_icon;
diff --git a/src/util/directory.cpp b/src/util/directory.cpp
index ddbbaaf..6ce80b4 100644
--- a/src/util/directory.cpp
+++ b/src/util/directory.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -23,46 +23,45 @@ namespace directory {
 
 namespace {
 
-QDir cachedIconDir;
-QDir cachedJavascriptDir;
-QDir cachedLicenseDir;
-QDir cachedPicsDir;
-QDir cachedLocaleDir;
-QDir cachedHandbookDir;
-QDir cachedHowtoDir;
-QDir cachedDisplayTemplatesDir;
-QDir cachedUserDisplayTemplatesDir;
-QDir cachedUserBaseDir;
-QDir cachedUserHomeDir;
-QDir cachedUserHomeSwordDir;
-QDir cachedUserHomeSwordModsDir;
-QDir cachedUserSessionsDir;
-QDir cachedUserCacheDir;
-QDir cachedUserIndexDir;
-QDir cachedSwordPathDir;
-#ifdef Q_WS_WIN
-QDir cachedApplicationSwordDir; // Only Windows installs the sword directory which contains locales.d
-QDir cachedSharedSwordDir;
+QScopedPointer<QDir> cachedIconDir;
+QScopedPointer<QDir> cachedJavascriptDir;
+QScopedPointer<QDir> cachedLicenseDir;
+QScopedPointer<QDir> cachedPicsDir;
+QScopedPointer<QDir> cachedLocaleDir;
+QScopedPointer<QDir> cachedHandbookDir;
+QScopedPointer<QDir> cachedHowtoDir;
+QScopedPointer<QDir> cachedDisplayTemplatesDir;
+QScopedPointer<QDir> cachedUserDisplayTemplatesDir;
+QScopedPointer<QDir> cachedUserBaseDir;
+QScopedPointer<QDir> cachedUserHomeDir;
+QScopedPointer<QDir> cachedUserHomeSwordDir;
+QScopedPointer<QDir> cachedUserHomeSwordModsDir;
+QScopedPointer<QDir> cachedUserSessionsDir;
+QScopedPointer<QDir> cachedUserCacheDir;
+QScopedPointer<QDir> cachedUserIndexDir;
+QScopedPointer<QDir> cachedSwordPathDir;
+#ifdef Q_OS_WIN
+QScopedPointer<QDir> cachedApplicationSwordDir; // Only Windows installs the sword directory which contains locales.d
+QScopedPointer<QDir> cachedSharedSwordDir;
 #endif
 
-#ifdef Q_WS_MAC
-QDir cachedSwordLocalesDir;
+#ifdef Q_OS_MAC
+QScopedPointer<QDir> cachedSwordLocalesDir;
 #endif
 
-#ifdef Q_WS_WIN
-static const char* BIBLETIME = "Bibletime";
-static const char* SWORD_DIR = "Sword";
+#ifdef Q_OS_WIN
+static const char BIBLETIME[] = "Bibletime";
+static const char SWORD_DIR[] = "Sword";
 #else
-#ifdef Q_WS_MAC
-static const char* BIBLETIME = "Library/Application Support/BibleTime";
-static const char* SWORD_DIR = "Library/Application Support/Sword";
+#ifdef Q_OS_MAC
+static const char BIBLETIME[] = "Library/Application Support/BibleTime";
+static const char SWORD_DIR[] = "Library/Application Support/Sword";
 #else
-static const char* BIBLETIME = ".bibletime";
-static const char* SWORD_DIR = ".sword";
+static const char BIBLETIME[] = ".bibletime";
+static const char SWORD_DIR[] = ".sword";
 #endif
 #endif
-static const char* SWORD_PATH = "SWORD_PATH";
-static const char* UNSET_SWORD_PATH = "SWORD_PATH=";
+static const char SWORD_PATH[] = "SWORD_PATH";
 } // anonymous namespace
 
 bool initDirectoryCache() {
@@ -74,155 +73,155 @@ bool initDirectoryCache() {
         return false;
     }
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 
-    cachedApplicationSwordDir = wDir; // application sword dir for Windows only
-    if (!cachedApplicationSwordDir.cd("share/sword") || !cachedApplicationSwordDir.isReadable()) {
+    cachedApplicationSwordDir.reset(new QDir(wDir)); // application sword dir for Windows only
+    if (!cachedApplicationSwordDir->cd("share/sword") || !cachedApplicationSwordDir->isReadable()) {
         qWarning() << "Cannot find sword directory relative to" << QCoreApplication::applicationDirPath();
         return false;
     }
 
-    cachedSharedSwordDir = QDir(getenv("ALLUSERSPROFILE")); // sword dir for Windows only
-    if (!cachedSharedSwordDir.cd("Application Data")) {
+    cachedSharedSwordDir.reset(new QDir(qgetenv("ALLUSERSPROFILE"))); // sword dir for Windows only
+    if (!cachedSharedSwordDir->cd("Application Data")) {
         qWarning() << "Cannot find ALLUSERSPROFILE\\Application Data";
         return false;
     }
-    if (!cachedSharedSwordDir.cd(SWORD_DIR)) {
-        if (!cachedSharedSwordDir.mkdir(SWORD_DIR) || !cachedSharedSwordDir.cd(SWORD_DIR)) {
+    if (!cachedSharedSwordDir->cd(SWORD_DIR)) {
+        if (!cachedSharedSwordDir->mkdir(SWORD_DIR) || !cachedSharedSwordDir->cd(SWORD_DIR)) {
             qWarning() << "Cannot find ALLUSERSPROFILE\\Application Data\\Sword";
             return false;
         }
     }
 #endif
 
-#ifdef Q_WS_MAC
-    cachedSwordLocalesDir = wDir; // application sword dir for Windows only
-    if (!cachedSwordLocalesDir.cd("share/sword/locales.d") || !cachedSwordLocalesDir.isReadable()) {
+#ifdef Q_OS_MAC
+    cachedSwordLocalesDir.reset(new QDir(wDir)); // application sword dir for Windows only
+    if (!cachedSwordLocalesDir->cd("share/sword/locales.d") || !cachedSwordLocalesDir->isReadable()) {
         qWarning() << "Cannot find sword locales directory relative to" << QCoreApplication::applicationDirPath();
         return false;
     }
 #endif
 
-    cachedSwordPathDir = QDir();
-    char* swordPath = getenv(SWORD_PATH);
+    cachedSwordPathDir.reset(new QDir(wDir));
+    char* swordPath = qgetenv(SWORD_PATH).data();
     if (swordPath != 0) {
-        cachedSwordPathDir = QDir(swordPath);
+        cachedSwordPathDir.reset(new QDir(swordPath));
         // We unset the SWORD_PATH so libsword finds paths correctly
-        putenv((char*)UNSET_SWORD_PATH);
+        qputenv(SWORD_PATH, "");
     }
 
-    cachedIconDir = wDir; // Icon dir
-    if (!cachedIconDir.cd("share/bibletime/icons") || !cachedIconDir.isReadable()) {
-        qWarning() << "Cannot find icon directory relative to" << QCoreApplication::applicationDirPath();
+    cachedIconDir.reset(new QDir(wDir)); // Icon dir
+    if (!cachedIconDir->cd("share/bibletime/icons") || !cachedIconDir->isReadable()) {
+        qWarning() << "Cannot find icon directory relative to" << wDir.absolutePath();
         return false;
     }
 
-    cachedJavascriptDir = wDir;
-    if (!cachedJavascriptDir.cd("share/bibletime/javascript") || !cachedJavascriptDir.isReadable()) {
-        qWarning() << "Cannot find javascript directory relative to" << QCoreApplication::applicationDirPath();
+    cachedJavascriptDir.reset(new QDir(wDir));
+    if (!cachedJavascriptDir->cd("share/bibletime/javascript") || !cachedJavascriptDir->isReadable()) {
+        qWarning() << "Cannot find javascript directory relative to" << wDir.absolutePath();
         return false;
     }
 
-    cachedLicenseDir = wDir;
-    if (!cachedLicenseDir.cd("share/bibletime/license") || !cachedLicenseDir.isReadable()) {
-        qWarning() << "Cannot find license directory relative to" << QCoreApplication::applicationDirPath();
+    cachedLicenseDir.reset(new QDir(wDir));
+    if (!cachedLicenseDir->cd("share/bibletime/license") || !cachedLicenseDir->isReadable()) {
+        qWarning() << "Cannot find license directory relative to" << wDir.absolutePath();
         return false;
     }
 
-    cachedPicsDir = wDir; //icon dir
-    if (!cachedPicsDir.cd("share/bibletime/pics") || !cachedPicsDir.isReadable()) {
-        qWarning() << "Cannot find icon directory relative to" << QCoreApplication::applicationDirPath();
+    cachedPicsDir.reset(new QDir(wDir));
+    if (!cachedPicsDir->cd("share/bibletime/pics") || !cachedPicsDir->isReadable()) {
+        qWarning() << "Cannot find pics directory relative to" << wDir.absolutePath();
         return false;
     }
 
-    cachedLocaleDir = wDir;
-    if (!cachedLocaleDir.cd("share/bibletime/locale")) {
-        qWarning() << "Cannot find locale directory relative to" << QCoreApplication::applicationDirPath();
+    cachedLocaleDir.reset(new QDir(wDir));
+    if (!cachedLocaleDir->cd("share/bibletime/locale")) {
+        qWarning() << "Cannot find locale directory relative to" << wDir.absolutePath();
         return false;
     }
 
     QString localeName(QLocale::system().name());
     QString langCode(localeName.section('_', 0, 0));
 
-    cachedHandbookDir = wDir;
-    if (!cachedHandbookDir.cd("share/bibletime/docs/handbook/" + localeName)) {
-        if (!cachedHandbookDir.cd("share/bibletime/docs/handbook/" + langCode)) {
-            if (!cachedHandbookDir.cd("share/bibletime/docs/handbook/en/")) {
-                qWarning() << "Cannot find handbook directory relative to" << QCoreApplication::applicationDirPath();
+    cachedHandbookDir.reset(new QDir(wDir));
+    if (!cachedHandbookDir->cd("share/bibletime/docs/handbook/" + localeName)) {
+        if (!cachedHandbookDir->cd("share/bibletime/docs/handbook/" + langCode)) {
+            if (!cachedHandbookDir->cd("share/bibletime/docs/handbook/en/")) {
+                qWarning() << "Cannot find handbook directory relative to" << wDir.absolutePath();
                 return false;
             }
         }
     }
 
-    cachedHowtoDir = wDir;
-    if (!cachedHowtoDir.cd("share/bibletime/docs/howto/" + localeName)) {
-        if (!cachedHowtoDir.cd("share/bibletime/docs/howto/" + langCode)) {
-            if (!cachedHowtoDir.cd("share/bibletime/docs/howto/en/")) {
-                qWarning() << "Cannot find handbook directory relative to" << QCoreApplication::applicationDirPath();
+    cachedHowtoDir.reset(new QDir(wDir));
+    if (!cachedHowtoDir->cd("share/bibletime/docs/howto/" + localeName)) {
+        if (!cachedHowtoDir->cd("share/bibletime/docs/howto/" + langCode)) {
+            if (!cachedHowtoDir->cd("share/bibletime/docs/howto/en/")) {
+                qWarning() << "Cannot find handbook directory relative to" << wDir.absolutePath();
                 return false;
             }
         }
     }
 
-    cachedDisplayTemplatesDir = wDir; //display templates dir
-    if (!cachedDisplayTemplatesDir.cd("share/bibletime/display-templates/")) {
-        qWarning() << "Cannot find display template directory relative to" << QCoreApplication::applicationDirPath();
+    cachedDisplayTemplatesDir.reset(new QDir(wDir)); //display templates dir
+    if (!cachedDisplayTemplatesDir->cd("share/bibletime/display-templates/")) {
+        qWarning() << "Cannot find display template directory relative to" << wDir.absolutePath();
         return false;
     }
 
-    cachedUserHomeDir = QDir(getenv("HOME"));
+    cachedUserHomeDir.reset(new QDir(qgetenv("HOME")));
 
-    cachedUserBaseDir = cachedUserHomeDir;
-    if (!cachedUserBaseDir.cd(BIBLETIME)) {
-        if (!cachedUserBaseDir.mkpath(BIBLETIME) || !cachedUserBaseDir.cd(BIBLETIME)) {
-            qWarning() << "Could not create user setting directory.";
+    cachedUserBaseDir.reset(new QDir(*cachedUserHomeDir));
+    if (!cachedUserBaseDir->cd(BIBLETIME)) {
+        if (!cachedUserBaseDir->mkpath(BIBLETIME) || !cachedUserBaseDir->cd(BIBLETIME)) {
+            qWarning() << "Could not create user settings directory relative to" << cachedUserHomeDir->absolutePath();
             return false;
         }
     }
 
-    cachedUserHomeSwordDir = cachedUserHomeDir;
-    if (!cachedUserHomeSwordDir.cd(SWORD_DIR)) {
-        if (!cachedUserHomeSwordDir.mkpath(SWORD_DIR) || !cachedUserHomeSwordDir.cd(SWORD_DIR)) {
+    cachedUserHomeSwordDir.reset(new QDir(*cachedUserHomeDir));
+    if (!cachedUserHomeSwordDir->cd(SWORD_DIR)) {
+        if (!cachedUserHomeSwordDir->mkpath(SWORD_DIR) || !cachedUserHomeSwordDir->cd(SWORD_DIR)) {
             qWarning() << "Could not create user home " << SWORD_DIR << " directory.";
             return false;
         }
     }
 
-    cachedUserHomeSwordModsDir = cachedUserHomeSwordDir;
-    if (!cachedUserHomeSwordModsDir.cd("mods.d")) {
-        if (!cachedUserHomeSwordModsDir.mkdir("mods.d") || !cachedUserHomeSwordModsDir.cd("mods.d")) {
+    cachedUserHomeSwordModsDir.reset(new QDir(*cachedUserHomeSwordDir));
+    if (!cachedUserHomeSwordModsDir->cd("mods.d")) {
+        if (!cachedUserHomeSwordModsDir->mkdir("mods.d") || !cachedUserHomeSwordModsDir->cd("mods.d")) {
             qWarning() << "Could not create user home " << SWORD_DIR << " mods.d directory.";
             return false;
         }
     }
 
-    cachedUserSessionsDir = cachedUserBaseDir;
-    if (!cachedUserSessionsDir.cd("sessions")) {
-        if (!cachedUserSessionsDir.mkdir("sessions") || !cachedUserSessionsDir.cd("sessions")) {
+    cachedUserSessionsDir.reset(new QDir(*cachedUserBaseDir));
+    if (!cachedUserSessionsDir->cd("sessions")) {
+        if (!cachedUserSessionsDir->mkdir("sessions") || !cachedUserSessionsDir->cd("sessions")) {
             qWarning() << "Could not create user sessions directory.";
             return false;
         }
     }
 
-    cachedUserCacheDir = cachedUserBaseDir;
-    if (!cachedUserCacheDir.cd("cache")) {
-        if (!cachedUserCacheDir.mkdir("cache") || !cachedUserCacheDir.cd("cache")) {
+    cachedUserCacheDir.reset(new QDir(*cachedUserBaseDir));
+    if (!cachedUserCacheDir->cd("cache")) {
+        if (!cachedUserCacheDir->mkdir("cache") || !cachedUserCacheDir->cd("cache")) {
             qWarning() << "Could not create user cache directory.";
             return false;
         }
     }
 
-    cachedUserIndexDir = cachedUserBaseDir;
-    if (!cachedUserIndexDir.cd("indices")) {
-        if (!cachedUserIndexDir.mkdir("indices") || !cachedUserIndexDir.cd("indices")) {
+    cachedUserIndexDir.reset(new QDir(*cachedUserBaseDir));
+    if (!cachedUserIndexDir->cd("indices")) {
+        if (!cachedUserIndexDir->mkdir("indices") || !cachedUserIndexDir->cd("indices")) {
             qWarning() << "Could not create user indices directory.";
             return false;
         }
     }
 
-    cachedUserDisplayTemplatesDir = cachedUserBaseDir;
-    if (!cachedUserDisplayTemplatesDir.cd("display-templates")) {
-        if (!cachedUserDisplayTemplatesDir.mkdir("display-templates") || !cachedUserDisplayTemplatesDir.cd("display-templates")) {
+    cachedUserDisplayTemplatesDir.reset(new QDir(*cachedUserBaseDir));
+    if (!cachedUserDisplayTemplatesDir->cd("display-templates")) {
+        if (!cachedUserDisplayTemplatesDir->mkdir("display-templates") || !cachedUserDisplayTemplatesDir->cd("display-templates")) {
             qWarning() << "Could not create user display templates directory.";
             return false;
         }
@@ -240,14 +239,14 @@ void removeRecursive(const QString &dir) {
     //remove all files in this dir
     d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks );
     const QFileInfoList fileList = d.entryInfoList();
-    for (QFileInfoList::const_iterator it_file = fileList.begin(); it_file != fileList.end(); it_file++) {
+    for (QFileInfoList::const_iterator it_file = fileList.begin(); it_file != fileList.end(); ++it_file) {
         d.remove( it_file->fileName() );
     }
 
     //remove all subdirs recursively
     d.setFilter( QDir::Dirs | QDir::NoSymLinks );
     const QFileInfoList dirList = d.entryInfoList();
-    for (QFileInfoList::const_iterator it_dir = dirList.begin(); it_dir != dirList.end(); it_dir++) {
+    for (QFileInfoList::const_iterator it_dir = dirList.begin(); it_dir != dirList.end(); ++it_dir) {
         if ( !it_dir->isDir() || it_dir->fileName() == "." || it_dir->fileName() == ".." ) {
             continue;
         }
@@ -268,14 +267,14 @@ unsigned long getDirSizeRecursive(const QString &dir) {
     //First get the size of all files int this folder
     d.setFilter(QDir::Files);
     const QFileInfoList infoList = d.entryInfoList();
-    for (QFileInfoList::const_iterator it = infoList.begin(); it != infoList.end(); it++) {
+    for (QFileInfoList::const_iterator it = infoList.begin(); it != infoList.end(); ++it) {
         size += it->size();
     }
 
     //Then add the sizes of all subdirectories
     d.setFilter(QDir::Dirs);
     const QFileInfoList dirInfoList = d.entryInfoList();
-    for (QFileInfoList::const_iterator it_dir = dirInfoList.begin(); it_dir != dirInfoList.end(); it_dir++) {
+    for (QFileInfoList::const_iterator it_dir = dirInfoList.begin(); it_dir != dirInfoList.end(); ++it_dir) {
         if ( !it_dir->isDir() || it_dir->fileName() == "." || it_dir->fileName() == ".." ) {
             continue;
         }
@@ -309,7 +308,7 @@ void copyRecursive(const QString &src, const QString &dest) {
 
 QString convertDirSeparators(const QString& path) {
     QString result = path;
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     result.replace("/", "\\");
 #else
     result.replace("\\", "/");
@@ -317,127 +316,89 @@ QString convertDirSeparators(const QString& path) {
     return result;
 }
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 const QDir &getApplicationSwordDir() {
-    return cachedApplicationSwordDir;
+    return *cachedApplicationSwordDir;
 }
 
 const QDir &getSharedSwordDir() {
-    return cachedSharedSwordDir;
+    return *cachedSharedSwordDir;
 }
 
 #endif
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 const QDir &getSwordLocalesDir() {
-    return cachedSwordLocalesDir;
+    return *cachedSwordLocalesDir;
 }
 #endif
 
 const QDir &getSwordPathDir() {
-    return cachedSwordPathDir;
+    return *cachedSwordPathDir;
 }
 
 const QDir &getIconDir() {
-    return cachedIconDir;
+    return *cachedIconDir;
 }
 
 const QDir &getJavascriptDir() {
-    return cachedJavascriptDir;
+    return *cachedJavascriptDir;
 }
 
 const QDir &getLicenseDir() {
-    return cachedLicenseDir;
-}
-
-const QIcon &getIcon(const QString &name) {
-    static QMap<QString, QIcon> iconCache;
-    static QIcon nullIcon;
-
-    QString plainName = name;
-    if (plainName.endsWith(".svg", Qt::CaseInsensitive)) {
-        plainName.chop(4);
-    }
-
-    QMap<QString, QIcon>::const_iterator i = iconCache.find(plainName);
-    if (i != iconCache.end()) {
-        return *i;
-    }
-
-    QString iconDir = getIconDir().canonicalPath();
-    QString iconFileName = iconDir + "/" + plainName + ".svg";
-    if (QFile(iconFileName).exists()) {
-        return *iconCache.insert(plainName, QIcon(iconFileName));
-    }
-    else {
-        iconFileName = iconDir + "/" + plainName + ".png";
-        if (QFile(iconFileName).exists()) {
-            return *iconCache.insert(plainName, QIcon(iconFileName));
-        }
-        else {
-            if (plainName != "default") {
-                qWarning() << "Cannot find icon file" << iconFileName
-                           << ", using default icon.";
-                return getIcon("default");
-            } else {
-                qWarning() << "Cannot find default icon" << iconFileName
-                           << ", using null icon.";
-                return nullIcon;
-            }
-        }
-    }
+    return *cachedLicenseDir;
 }
 
 const QDir &getPicsDir() {
-    return cachedPicsDir;
+    return *cachedPicsDir;
 }
 
 const QDir &getLocaleDir() {
-    return cachedLocaleDir;
+    return *cachedLocaleDir;
 }
 
 const QDir &getHandbookDir() {
-    return cachedHandbookDir;
+    return *cachedHandbookDir;
 }
 
 const QDir &getHowtoDir() {
-    return cachedHowtoDir;
+    return *cachedHowtoDir;
 }
 
 const QDir &getDisplayTemplatesDir() {
-    return cachedDisplayTemplatesDir;
+    return *cachedDisplayTemplatesDir;
 }
 
 const QDir &getUserBaseDir() {
-    return cachedUserBaseDir;
+    return *cachedUserBaseDir;
 }
 
 const QDir &getUserHomeDir() {
-    return cachedUserHomeDir;
+    return *cachedUserHomeDir;
 }
 
 const QDir &getUserHomeSwordDir() {
-    return cachedUserHomeSwordDir;
+    return *cachedUserHomeSwordDir;
 }
 
 const QDir &getUserHomeSwordModsDir() {
-    return cachedUserHomeSwordModsDir;
+    return *cachedUserHomeSwordModsDir;
 }
 
 const QDir &getUserSessionsDir() {
-    return cachedUserSessionsDir;
+    return *cachedUserSessionsDir;
 }
 
 const QDir &getUserCacheDir() {
-    return cachedUserCacheDir;
+    return *cachedUserCacheDir;
 }
 
 const QDir &getUserIndexDir() {
-    return cachedUserIndexDir;
+    return *cachedUserIndexDir;
 }
 
 const QDir &getUserDisplayTemplatesDir() {
-    return cachedUserDisplayTemplatesDir;
+    return *cachedUserDisplayTemplatesDir;
 }
 
 } // namespace directory
diff --git a/src/util/directory.h b/src/util/directory.h
index 6b64759..447cabf 100644
--- a/src/util/directory.h
+++ b/src/util/directory.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -60,7 +62,7 @@ void copyRecursive(const QString &src, const QString &dest);
  */
 QString convertDirSeparators(const QString& path);
 
-#ifdef Q_WS_WIN  // Windows only directories
+#ifdef Q_OS_WIN  // Windows only directories
 
 /** Return the path to the sword dir., Windows only
     C:\Program Files\BibleTime\share\sword
@@ -72,7 +74,7 @@ const QDir &getSharedSwordDir();
 
 #endif
 
-#ifdef Q_WS_MAC  // Mac only directories
+#ifdef Q_OS_MAC  // Mac only directories
 
 /**
  * Path to the Sword locales
@@ -93,9 +95,6 @@ const QDir &getJavascriptDir();
 /** Return the path to the license. */
 const QDir &getLicenseDir();
 
-/** Returns an icon with the given name */
-const QIcon &getIcon(const QString &name);
-
 /** Return the path to the pictures. */
 const QDir &getPicsDir();
 
diff --git a/src/util/exceptions.h b/src/util/exceptions.h
index d89ba06..3084ff8 100644
--- a/src/util/exceptions.h
+++ b/src/util/exceptions.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/util/geticon.cpp b/src/util/geticon.cpp
new file mode 100644
index 0000000..5658798
--- /dev/null
+++ b/src/util/geticon.cpp
@@ -0,0 +1,54 @@
+/*********
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#include "geticon.h"
+
+#include <QDebug>
+#include <QFile>
+#include <QMap>
+#include "util/directory.h"
+
+namespace util {
+
+static QMap<QString, QIcon> iconCache;
+static const QIcon nullIcon;
+
+const QIcon& getIcon(const QString & name) {
+    QString plainName(name);
+    if (plainName.endsWith(".svg", Qt::CaseInsensitive))
+        plainName.chop(4);
+
+    const QMap<QString, QIcon>::const_iterator i = iconCache.find(plainName);
+    if (i != iconCache.end())
+        return *i;
+
+    const QString iconDir = util::directory::getIconDir().canonicalPath();
+    QString iconFileName = iconDir + "/" + plainName + ".svg";
+    if (QFile(iconFileName).exists())
+        return *iconCache.insert(plainName, QIcon(iconFileName));
+
+    iconFileName = iconDir + "/" + plainName + ".png";
+    if (QFile(iconFileName).exists())
+        return *iconCache.insert(plainName, QIcon(iconFileName));
+
+    if (plainName != "default") {
+        qWarning() << "Cannot find icon file" << iconFileName
+                   << ", using default icon.";
+        return getIcon("default");
+    }
+
+    qWarning() << "Cannot find default icon" << iconFileName
+               << ", using null icon.";
+    return nullIcon;
+}
+
+void clearIconCache() {
+    iconCache.clear();
+}
+}
diff --git a/src/util/geticon.h b/src/util/geticon.h
new file mode 100644
index 0000000..97a8c84
--- /dev/null
+++ b/src/util/geticon.h
@@ -0,0 +1,30 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#ifndef GETICON_H
+#define GETICON_H
+
+#include <QIcon>
+#include <QString>
+
+namespace util {
+
+        /**
+           \param[in] name the name of the icon to return.
+           \returns a reference to the icon with the given name or to a NULL
+                    icon if no such icon is found.
+         */
+        const QIcon & getIcon(const QString & name);
+
+        void clearIconCache();
+}
+
+#endif
diff --git a/src/util/htmlescape.h b/src/util/htmlescape.h
new file mode 100644
index 0000000..875cfaa
--- /dev/null
+++ b/src/util/htmlescape.h
@@ -0,0 +1,33 @@
+/*********
+*
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2014 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
+
+#ifndef UTIL_HTMLESCAPE_H
+#define UTIL_HTMLESCAPE_H
+
+#include <QString>
+#if QT_VERSION < 0x050000
+#include <QTextDocument>
+#endif
+
+
+namespace util {
+
+inline QString htmlEscape(const QString & str) {
+#if QT_VERSION < 0x050000
+    return Qt::escape(str);
+#else
+    return str.toHtmlEscaped();
+#endif
+}
+
+} /* namespace util { */
+
+#endif /* UTIL_HTMLESCAPE_H */
diff --git a/src/util/macros.h b/src/util/macros.h
index aa451fd..853d5c7 100644
--- a/src/util/macros.h
+++ b/src/util/macros.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
diff --git a/src/util/tool.cpp b/src/util/tool.cpp
index b8ee486..ca8024a 100644
--- a/src/util/tool.cpp
+++ b/src/util/tool.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -18,25 +18,38 @@
 #include <QWidget>
 #include "backend/drivers/cswordmoduleinfo.h"
 #include "backend/managers/cswordbackend.h"
+#include "bibletimeapp.h"
+#include "frontend/messagedialog.h"
 #include "util/cresmgr.h"
 #include "util/directory.h"
-#include "util/dialogutil.h"
+#include "util/geticon.h"
+
+
+namespace util {
+namespace tool {
 
 
 /** Creates the file filename and put text into the file.
  */
-bool util::tool::savePlainFile( const QString& filename, const QString& text, const bool& forceOverwrite, QTextCodec* fileCodec) {
+bool savePlainFile(const QString & filename,
+                   const QString & text,
+                   const bool forceOverwrite,
+                   QTextCodec * const fileCodec)
+{
+    Q_ASSERT(fileCodec);
+    Q_ASSERT(!filename.isEmpty());
+
     QFile saveFile(filename);
-    bool ret;
 
     if (saveFile.exists()) {
-        if (!forceOverwrite && util::showQuestion(0, QObject::tr("Overwrite File?"),
+        if (!forceOverwrite
+            && message::showQuestion(0, QObject::tr("Overwrite File?"),
                 QString::fromLatin1("<qt><b>%1</b><br/>%2</qt>")
                 .arg( QObject::tr("The file already exists.") )
                 .arg( QObject::tr("Do you want to overwrite it?")),
                 QMessageBox::Yes | QMessageBox::No,
-                QMessageBox::No) == QMessageBox::No
-           ) {
+                QMessageBox::No) == QMessageBox::No)
+        {
             return false;
         }
         else { //either the user chose yes or forceOverwrite is set
@@ -44,37 +57,42 @@ bool util::tool::savePlainFile( const QString& filename, const QString& text, co
         }
     }
 
-    if ( saveFile.open(QIODevice::ReadWrite) ) {
-        QTextStream textstream( &saveFile );
+    if (saveFile.open(QIODevice::ReadWrite)) {
+        QTextStream textstream(&saveFile);
         textstream.setCodec(fileCodec);
         textstream << text;
+        textstream.flush();
         saveFile.close();
-        ret = true;
+        if (saveFile.error() == QFile::NoError)
+            return true;
+
+        QMessageBox::critical(0, QObject::tr("Error"),
+                              QString::fromLatin1("<qt>%1<br/><b>%2</b></qt>")
+                                  .arg(QObject::tr("Error while writing to file."))
+                                  .arg(QObject::tr("Please check that enough disk space is available.")));
     }
     else {
         QMessageBox::critical(0, QObject::tr("Error"),
                               QString::fromLatin1("<qt>%1<br/><b>%2</b></qt>")
-                              .arg( QObject::tr("The file couldn't be saved.") )
-                              .arg( QObject::tr("Please check permissions etc.")));
-        saveFile.close();
-        ret = false;
+                                  .arg(QObject::tr("The file couldn't be opened for saving."))
+                                  .arg(QObject::tr("Please check permissions etc.")));
     }
-    return ret;
+
+    return false;
 }
 
 
-QIcon util::tool::getIconForModule(const CSwordModuleInfo *module) {
-    namespace DU = util::directory;
-    return DU::getIcon(getIconNameForModule(module));
+QIcon getIconForModule(const CSwordModuleInfo * const module) {
+    return util::getIcon(getIconNameForModule(module));
 }
 
-QString util::tool::getIconNameForModule(const CSwordModuleInfo *module) {
+QString getIconNameForModule(const CSwordModuleInfo * const module) {
     //qDebug() << "util::tool::getIconNameForModule";
-    if (!module) return CResMgr::modules::book::icon_locked;
+    if (!module)
+        return CResMgr::modules::book::icon_locked;
 
-    if (module->category() == CSwordModuleInfo::Cult) {
+    if (module->category() == CSwordModuleInfo::Cult)
         return "stop.svg";
-    }
 
     switch (module->type()) {
         case CSwordModuleInfo::Bible:
@@ -116,13 +134,19 @@ QString util::tool::getIconNameForModule(const CSwordModuleInfo *module) {
     return CResMgr::modules::book::icon_unlocked;
 }
 
-QLabel* util::tool::explanationLabel(QWidget *parent, const QString &heading, const QString &text) {
-    QLabel *label = new QLabel(parent);
+QLabel * explanationLabel(QWidget * const parent,
+                          const QString & heading,
+                          const QString & text)
+{
+    QLabel * const label = new QLabel(parent);
     initExplanationLabel(label, heading, text);
     return label;
 }
 
-void util::tool::initExplanationLabel(QLabel *label, const QString &heading, const QString &text) {
+void initExplanationLabel(QLabel * const label,
+                          const QString & heading,
+                          const QString & text)
+{
     QString labelText;
     if (!heading.isEmpty()) {
         labelText += "<b>";
@@ -143,8 +167,7 @@ void util::tool::initExplanationLabel(QLabel *label, const QString &heading, con
     label->setFrameStyle(QFrame::Box | QFrame::Sunken);
 }
 
-/** No descriptions */
-bool util::tool::inHTMLTag(int pos, QString & text) {
+bool inHTMLTag(const int pos, const QString & text) {
     int i1 = text.lastIndexOf("<", pos);
     int i2 = text.lastIndexOf(">", pos);
     int i3 = text.indexOf(">", pos);
@@ -159,14 +182,11 @@ bool util::tool::inHTMLTag(int pos, QString & text) {
 
     //  qWarning("%d > %d && %d < %d",i1,i2,i3,i4);
 
-    if ( (i1 > i2) && (i3 < i4) )
-        return true; //yes, we're in a tag
-
-    return false;
+    return (i1 > i2) && (i3 < i4);
 }
 
-QString util::tool::remoteModuleToolTip(const CSwordModuleInfo &module,
-                                        const QString &localVer)
+QString remoteModuleToolTip(const CSwordModuleInfo & module,
+                            const QString & localVer)
 {
     QString text = "<p style='white-space:pre'><b>";
     text += module.name();
@@ -215,7 +235,13 @@ QString util::tool::remoteModuleToolTip(const CSwordModuleInfo &module,
 }
 
 
-int util::tool::mWidth(const QWidget* widget, int m) {
-    if (widget) return widget->fontMetrics().width(QString(m, 'M'));
-    return QApplication::fontMetrics().width(QString(m, 'M'));
+int mWidth(const QWidget * const widget, const int mCount) {
+    const QString mString(mCount, 'M');
+    if (widget)
+        return widget->fontMetrics().width(mString);
+    return QApplication::fontMetrics().width(mString);
 }
+
+
+} // namespace tool {
+} // namespace util {
diff --git a/src/util/tool.h b/src/util/tool.h
index 0d1981b..cb59495 100644
--- a/src/util/tool.h
+++ b/src/util/tool.h
@@ -1,8 +1,10 @@
 /*********
 *
+* In the name of the Father, and of the Son, and of the Holy Spirit.
+*
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -23,55 +25,89 @@ namespace util {
 namespace tool {
 
 /**
-* Creates the file filename and put the text of parameter "text" into the file.
-* @return True if saving was sucessful, otherwise false
+  Creates the file filename and save the given text into the file.
+
+  \param[in] filename the filename to save to.
+  \param[in] text the string data to save.
+  \param[in] forceOverwrite whether to force the overwrite.
+  \param[in] fileCodec the codec to use to save the given string data.
+  \note if the file exists, and forceOverwrite is false, a confirmation dialog
+        is shown to ask the user whether to overwrite the existing file.
+  \returns whether the file was properly saved.
 */
-bool savePlainFile( const QString& filename, const QString& text, const bool& forceOverwrite = false, QTextCodec* fileCodec = QTextCodec::codecForLocale());
+bool savePlainFile(const QString & filename,
+                   const QString & text,
+                   bool forceOverwrite = false,
+                   QTextCodec * fileCodec = QTextCodec::codecForLocale());
 
 /**
   \param[in] module the module whose icon to return.
   \returns the icon used for the a module.
 */
-QIcon getIconForModule(const CSwordModuleInfo *module);
+QIcon getIconForModule(const CSwordModuleInfo * module);
 
 /**
   \param[in] module the module whose icon name to return.
   \returns the icon name used for the a module.
 */
-QString getIconNameForModule(const CSwordModuleInfo *module);
+QString getIconNameForModule(const CSwordModuleInfo * module);
 
 /**
-  Returns a new QLabel initialized by initExplanationLabel().
+  Creates a new explanation label.
+
+  \param[in] parent the parent widget.
+  \param[in] heading the heading of the label.
+  \param[in] text the text of the label.
+  \returns a new QLabel initialized by initExplanationLabel().
 */
-QLabel *explanationLabel(QWidget *parent, const QString &heading, const QString &text);
+QLabel * explanationLabel(QWidget * parent,
+                          const QString & heading,
+                          const QString & text);
 
 /**
-  Initializes a QLabel to explain difficult things of dialogs. The label should be used to
-  explain difficult things of the GUI, e.g. in the options dialog pages.
+  \brief Initializes a QLabel to explain difficult things of dialogs.
+
+  The label should be used to explain difficult things of the GUI, e.g. in the
+  options dialog pages.
+
   \param[in] label The label to initialize
   \param[in] heading The heading for the label.
   \param[in] text The text for the label.
 */
-void initExplanationLabel(QLabel *label, const QString &heading, const QString &text);
+void initExplanationLabel(QLabel * label,
+                          const QString & heading,
+                          const QString & text);
 
 /**
-* Returns true if the character at position "pos" of text is inside an HTML tag. Returns false if it's not inside an HTML tag.
+  \returns whether the character at position "pos" of text is inside an HTML tag.
 */
-bool inHTMLTag(int pos, QString & text);
+bool inHTMLTag(int pos, const QString & text);
 
-/** Return the module's tooltip text for a remote module
-* @param module The module required for the tooltip
-* @return The tooltip text for the passed module
+/**
+  \param[in] module The module required for the tooltip
+  \returns the remote module's tooltip text.
 */
-QString remoteModuleToolTip(const CSwordModuleInfo &module,
-                            const QString &localVer);
+QString remoteModuleToolTip(const CSwordModuleInfo & module,
+                            const QString & localVer);
 
 /**
-* Returns the width in pixels for a string which has mCount 'M' letters, using the specified widget's font.
-* This can be used when setting the size for a widget. It may be better to roughly calculate the size based on some text width rather than use pixels directly.
+  \brief Calculates a maximum rendered text width for a widget and a string with
+         the a given length.
+
+  This function can be used for setting the size for a widget. It may be better
+  to roughly calculate the size based on some text width rather than use a hard-
+  coded value.
+
+  \param[in] widget the widget whose font metrics to use. If 0, then the font
+                    metrics of the application are used.
+  \param[in] mCount the length of the string of 'M' characters to use for
+                    calculating the width.
+
+  \returns the width in pixels.
 */
-int mWidth(const QWidget* widget, int mCount);
-}
-}
+int mWidth(const QWidget * widget, int mCount);
+
+} /* namespace tool { */
+} /* namespace util { */
 
 #endif